Add required features support in layout (#383)

Signed-off-by: Tamal Saha <[email protected]>
kmodules · Nov 7, 2023 · dd2e529 · dd2e529
1 parent f83b3e9
commit dd2e529
Show file tree

Hide file tree

Showing 8 changed files with 174 additions and 8 deletions.
diff --git a/apis/meta/v1alpha1/openapi_generated.go b/apis/meta/v1alpha1/openapi_generated.go
diff --git a/apis/meta/v1alpha1/resourcelayout_types.go b/apis/meta/v1alpha1/resourcelayout_types.go
@@ -78,8 +78,12 @@ type PageBlockLayout struct {
 	Actions                 *ResourceActions    `json:"actions,omitempty"`
 
 	View *PageBlockTableDefinition `json:"view,omitempty"`
+
+	RequiredFeatureSets map[string]FeatureList `json:"requiredFeatureSets,omitempty"`
 }
 
+type FeatureList []string
+
 type PageBlockTableDefinition struct {
 	Columns []ResourceColumnDefinition `json:"columns,omitempty"`
 }

diff --git a/apis/meta/v1alpha1/resourceoutline_types.go b/apis/meta/v1alpha1/resourceoutline_types.go
@@ -88,6 +88,7 @@ type PageBlockOutline struct {
 	DisplayMode             ResourceDisplayMode         `json:"displayMode,omitempty"`
 	Actions                 *ResourceActions            `json:"actions,omitempty"`
 	View                    *ResourceTableDefinitionRef `json:"view,omitempty"`
+	RequiredFeatureSets     map[string]FeatureList      `json:"requiredFeatureSets,omitempty"`
 }
 
 type ResourceTableDefinitionRef struct {

diff --git a/apis/meta/v1alpha1/zz_generated.deepcopy.go b/apis/meta/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/meta.k8s.appscode.com_resourceblockdefinitions.yaml b/crds/meta.k8s.appscode.com_resourceblockdefinitions.yaml
@@ -133,6 +133,12 @@ spec:
                       - group
                       - kind
                       type: object
+                    requiredFeatureSets:
+                      additionalProperties:
+                        items:
+                          type: string
+                        type: array
+                      type: object
                     view:
                       properties:
                         columns:

diff --git a/crds/meta.k8s.appscode.com_resourcelayouts.yaml b/crds/meta.k8s.appscode.com_resourcelayouts.yaml
@@ -134,6 +134,12 @@ spec:
                     - group
                     - kind
                     type: object
+                  requiredFeatureSets:
+                    additionalProperties:
+                      items:
+                        type: string
+                      type: array
+                    type: object
                   view:
                     properties:
                       columns:
@@ -373,6 +379,12 @@ spec:
                                   - group
                                   - kind
                                   type: object
+                                requiredFeatureSets:
+                                  additionalProperties:
+                                    items:
+                                      type: string
+                                    type: array
+                                  type: object
                                 view:
                                   properties:
                                     columns:
@@ -637,6 +649,12 @@ spec:
                                 - group
                                 - kind
                                 type: object
+                              requiredFeatureSets:
+                                additionalProperties:
+                                  items:
+                                    type: string
+                                  type: array
+                                type: object
                               view:
                                 properties:
                                   columns:
@@ -874,6 +892,12 @@ spec:
                                 - group
                                 - kind
                                 type: object
+                              requiredFeatureSets:
+                                additionalProperties:
+                                  items:
+                                    type: string
+                                  type: array
+                                type: object
                               view:
                                 properties:
                                   columns:
@@ -1140,6 +1164,12 @@ spec:
                     - group
                     - kind
                     type: object
+                  requiredFeatureSets:
+                    additionalProperties:
+                      items:
+                        type: string
+                      type: array
+                    type: object
                   view:
                     properties:
                       columns:

diff --git a/crds/meta.k8s.appscode.com_resourceoutlines.yaml b/crds/meta.k8s.appscode.com_resourceoutlines.yaml
@@ -221,6 +221,12 @@ spec:
                     - group
                     - kind
                     type: object
+                  requiredFeatureSets:
+                    additionalProperties:
+                      items:
+                        type: string
+                      type: array
+                    type: object
                   view:
                     properties:
                       columns:
@@ -462,6 +468,12 @@ spec:
                                   - group
                                   - kind
                                   type: object
+                                requiredFeatureSets:
+                                  additionalProperties:
+                                    items:
+                                      type: string
+                                    type: array
+                                  type: object
                                 view:
                                   properties:
                                     columns:
@@ -728,6 +740,12 @@ spec:
                                 - group
                                 - kind
                                 type: object
+                              requiredFeatureSets:
+                                additionalProperties:
+                                  items:
+                                    type: string
+                                  type: array
+                                type: object
                               view:
                                 properties:
                                   columns:
@@ -967,6 +985,12 @@ spec:
                                 - group
                                 - kind
                                 type: object
+                              requiredFeatureSets:
+                                additionalProperties:
+                                  items:
+                                    type: string
+                                  type: array
+                                type: object
                               view:
                                 properties:
                                   columns:
@@ -1235,6 +1259,12 @@ spec:
                     - group
                     - kind
                     type: object
+                  requiredFeatureSets:
+                    additionalProperties:
+                      items:
+                        type: string
+                      type: array
+                    type: object
                   view:
                     properties:
                       columns:

diff --git a/pkg/layouts/lib.go b/pkg/layouts/lib.go
@@ -408,14 +408,15 @@ func Convert_PageBlockOutline_To_PageBlockLayout(
 	}
 
 	result := v1alpha1.PageBlockLayout{
-		Kind:            in.Kind,
-		Name:            in.Name,
-		Width:           in.Width,
-		Icons:           in.Icons,
-		FieldPath:       in.FieldPath,
-		ResourceLocator: in.ResourceLocator,
-		DisplayMode:     in.DisplayMode,
-		Actions:         in.Actions,
+		Kind:                in.Kind,
+		Name:                in.Name,
+		Width:               in.Width,
+		Icons:               in.Icons,
+		FieldPath:           in.FieldPath,
+		ResourceLocator:     in.ResourceLocator,
+		DisplayMode:         in.DisplayMode,
+		Actions:             in.Actions,
+		RequiredFeatureSets: in.RequiredFeatureSets,
 	}
 	if len(columns) > 0 {
 		result.View = &v1alpha1.PageBlockTableDefinition{