Merge pull request #470 from meshery/expose-design-preferences

expose independent DesignPreferences struct

Author: aabidsofi19

models/v1beta1/pattern/design_conversion.go

@@ -1,7 +1,6 @@
 package pattern
 
 import (
-	"crypto/rand"
 	"math/big"
 	"reflect"
 	"strings"
@@ -164,27 +163,6 @@ func (p *PatternFile) convertFromTraits(cmp *component.ComponentDefinition, serv
 	cmp.Metadata = _compMetadata
 	cmp.Metadata.IsNamespaced = isNamespaced
 
-	// Handle position properties: traits.meshmap.position
-	randX, _ := rand.Int(rand.Reader, big.NewInt(100))
-
-	randY, _ := rand.Int(rand.Reader, big.NewInt(100))
-
-	positionX, _ := big.NewFloat(0).SetInt(randX).Float64()
-	positionY, _ := big.NewFloat(0).SetInt(randY).Float64()
-
-	cmp.Styles = &component.ComponentDefinition_Styles{
-		Position: &struct {
-			// X The x-coordinate of the node.
-			X float64 `json:"x" yaml:"x"`
-
-			// Y The y-coordinate of the node.
-			Y float64 `json:"y" yaml:"y"`
-		}{
-			X: positionX,
-			Y: positionY,
-		},
-	}
-
 	pos, err := utils.MarshalAndUnmarshal[interface{}, position](extensionsMetadata["position"])
 	if err == nil {
 		cmp.Styles.Position.X, _ = big.NewFloat(pos.X).Float64()
@@ -293,4 +271,4 @@ func (p *PatternFile) convertToSettings(service *v1alpha2.Service, component *co
 	component.Configuration["metadata"] = _configurationMetadata // is this reassignment needed, map are references, check once.
 	service.Settings = component.Configuration
 	return nil
-}
+}

schemas/constructs/v1beta1/design/design.json

@@ -20,7 +20,7 @@
     },
     "version": {
       "$ref": "../../core.json#/definitions/semverString",
-      "default":"v0.0.1",
+      "default": "v0.0.1",
       "x-order": 4,
       "description": "Revision of the design as expressed by an auto-incremented, SemVer-compliant version number. May be manually set by a user or third-party system, but will always be required to be of version number higher than the previously defined version number.",
       "minLength": 1,
@@ -58,16 +58,8 @@
       }
     },
     "preferences": {
-      "type": "object",
-      "description": "Design-level preferences",
-      "x-order": 7,
-      "properties": {
-        "layers": {
-          "type": "object",
-          "description": "List of available layers"
-        }
-      },
-      "required": ["layers"]
+      "$ref": "./openapi.yml#/components/schemas/DesignPreferences",
+      "x-go-type": "DesignPreferences"
     },
     "relationships": {
       "description": "List of relationships between components",
@@ -83,12 +75,5 @@
     }
   },
 
-  "required": [
-    "id",
-    "name",
-    "schemaVersion",
-    "version",
-    "components",
-    "relationships"
-  ]
+  "required": ["id", "name", "schemaVersion", "version", "components", "relationships"]
 }

schemas/constructs/v1beta1/design/openapi.yml

@@ -132,3 +132,14 @@ components:
           type: string
           format: uri
           description: "Provide the URL of the file you want to import. This should be a direct URL to a single file, for example: https://raw.github.com/your-design-file.yaml. Also, ensure that design is in a supported format: Kubernetes Manifest, Helm Chart, Docker Compose, or Meshery Design. See [Import Designs Documentation](https://docs.meshery.io/guides/configuration-management/importing-designs#import-designs-using-meshery-ui) for details"
+
+    DesignPreferences:
+      type: object
+      description: Design-level preferences
+      x-order: 7
+      properties:
+        layers:
+          type: object
+          description: Map of available layers, where keys are layer names.
+      required:
+        - layers