Add option to hide pages, sections and actions

Signed-off-by: Tamal Saha <[email protected]>
kmodules · Dec 25, 2024 · 25a2b11 · 25a2b11
1 parent b8557a2
commit 25a2b11
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 14 deletions.
diff --git a/apis/ui/v1alpha1/openapi_generated.go b/apis/ui/v1alpha1/openapi_generated.go
diff --git a/apis/ui/v1alpha1/resourceoutlinefilter_helpers.go b/apis/ui/v1alpha1/resourceoutlinefilter_helpers.go
@@ -24,6 +24,7 @@ func (a ResourceOutlineFilterSpec) GetPage(name string) ResourcePageOutlineFilte
 	}
 	return ResourcePageOutlineFilter{
 		Name:     name,
+		Show:     false,
 		Sections: nil,
 	}
 }
@@ -36,6 +37,7 @@ func (a ResourceOutlineFilterSpec) GetAction(name string) ActionTemplateGroupFil
 	}
 	return ActionTemplateGroupFilter{
 		Name:  name,
+		Show:  false,
 		Items: nil,
 	}
 }
@@ -48,6 +50,7 @@ func (a ResourcePageOutlineFilter) GetSection(name string) SectionOutlineFilter
 	}
 	return SectionOutlineFilter{
 		Name:   name,
+		Show:   false,
 		Blocks: nil,
 	}
 }
diff --git a/apis/ui/v1alpha1/resourceoutlinefilter_types.go b/apis/ui/v1alpha1/resourceoutlinefilter_types.go
@@ -54,15 +54,18 @@ type ResourceOutlineFilterSpec struct {
 type ResourcePageOutlineFilter struct {
 	Name     string                 `json:"name"`
 	Sections []SectionOutlineFilter `json:"sections,omitempty"`
+	Show     bool                   `json:"show"`
 }
 
 type ActionTemplateGroupFilter struct {
-	Name  string          `json:"name,omitempty"`
-	Items map[string]bool `json:"items"`
+	Name  string          `json:"name"`
+	Items map[string]bool `json:"items,omitempty"`
+	Show  bool            `json:"show"`
 }
 
 type SectionOutlineFilter struct {
-	Name    string          `json:"name,omitempty"`
+	Name    string          `json:"name"`
+	Show    bool            `json:"show"`
 	Info    bool            `json:"info"`
 	Insight bool            `json:"insight"`
 	Blocks  map[string]bool `json:"blocks,omitempty"`

diff --git a/crds/meta.k8s.appscode.com_resourceoutlinefilters.yaml b/crds/meta.k8s.appscode.com_resourceoutlinefilters.yaml
@@ -41,8 +41,11 @@ spec:
                       type: object
                     name:
                       type: string
+                    show:
+                      type: boolean
                   required:
-                  - items
+                  - name
+                  - show
                   type: object
                 type: array
               header:
@@ -65,13 +68,20 @@ spec:
                             type: boolean
                           name:
                             type: string
+                          show:
+                            type: boolean
                         required:
                         - info
                         - insight
+                        - name
+                        - show
                         type: object
                       type: array
+                    show:
+                      type: boolean
                   required:
                   - name
+                  - show
                   type: object
                 type: array
               resource:

diff --git a/crds/ui.k8s.appscode.com_resourceoutlinefilters.yaml b/crds/ui.k8s.appscode.com_resourceoutlinefilters.yaml
@@ -41,8 +41,11 @@ spec:
                       type: object
                     name:
                       type: string
+                    show:
+                      type: boolean
                   required:
-                  - items
+                  - name
+                  - show
                   type: object
                 type: array
               header:
@@ -65,13 +68,20 @@ spec:
                             type: boolean
                           name:
                             type: string
+                          show:
+                            type: boolean
                         required:
                         - info
                         - insight
+                        - name
+                        - show
                         type: object
                       type: array
+                    show:
+                      type: boolean
                   required:
                   - name
+                  - show
                   type: object
                 type: array
               resource:

diff --git a/hub/resourcedescriptors/meta.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml b/hub/resourcedescriptors/meta.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml
@@ -64,8 +64,11 @@ spec:
                     type: object
                   name:
                     type: string
+                  show:
+                    type: boolean
                 required:
-                - items
+                - name
+                - show
                 type: object
               type: array
             header:
@@ -88,13 +91,20 @@ spec:
                           type: boolean
                         name:
                           type: string
+                        show:
+                          type: boolean
                       required:
                       - info
                       - insight
+                      - name
+                      - show
                       type: object
                     type: array
+                  show:
+                    type: boolean
                 required:
                 - name
+                - show
                 type: object
               type: array
             resource:

diff --git a/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml b/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml
@@ -64,8 +64,11 @@ spec:
                     type: object
                   name:
                     type: string
+                  show:
+                    type: boolean
                 required:
-                - items
+                - name
+                - show
                 type: object
               type: array
             header:
@@ -88,13 +91,20 @@ spec:
                           type: boolean
                         name:
                           type: string
+                        show:
+                          type: boolean
                       required:
                       - info
                       - insight
+                      - name
+                      - show
                       type: object
                     type: array
+                  show:
+                    type: boolean
                 required:
                 - name
+                - show
                 type: object
               type: array
             resource:

diff --git a/pkg/layouts/filter.go b/pkg/layouts/filter.go
@@ -49,6 +49,7 @@ func GetDefaultResourceOutlineFilter(kc client.Client, outline *rsapi.ResourceOu
 				for _, ag := range ed.Spec.UI.Actions {
 					ag2 := uiapi.ActionTemplateGroupFilter{
 						Name:  ag.Name,
+						Show:  true,
 						Items: make(map[string]bool, len(ag.Items)),
 					}
 					for _, a := range ag.Items {
@@ -95,12 +96,14 @@ func GetDefaultResourceOutlineFilter(kc client.Client, outline *rsapi.ResourceOu
 	for _, pageOutline := range pages {
 		page := uiapi.ResourcePageOutlineFilter{
 			Name:     pageOutline.Name,
+			Show:     true,
 			Sections: make([]uiapi.SectionOutlineFilter, 0, len(pageOutline.Sections)),
 		}
 		for _, sectionOutline := range pageOutline.Sections {
 
 			section := uiapi.SectionOutlineFilter{
 				Name:    sectionOutline.Name,
+				Show:    true,
 				Info:    sectionOutline.Info != nil,
 				Insight: sectionOutline.Insight != nil,
 			}

diff --git a/pkg/layouts/lib.go b/pkg/layouts/lib.go
@@ -201,6 +201,9 @@ func GetResourceLayout(kc client.Client, outline *rsapi.ResourceOutline) (*rsapi
 				result.Spec.UI.Actions = make([]*shared.ActionTemplateGroup, 0, len(ed.Spec.UI.Actions))
 				for _, ag := range ed.Spec.UI.Actions {
 					agFilter := filter.Spec.GetAction(ag.Name)
+					if !agFilter.Show {
+						continue
+					}
 					ag2 := shared.ActionTemplateGroup{
 						ActionInfo: ag.ActionInfo,
 						Items:      make([]shared.ActionTemplate, 0, len(ag.Items)),
@@ -280,13 +283,19 @@ func GetResourceLayout(kc client.Client, outline *rsapi.ResourceOutline) (*rsapi
 
 	for _, pageOutline := range pages {
 		pageFilter := filter.Spec.GetPage(pageOutline.Name)
+		if !pageFilter.Show {
+			continue
+		}
 		page := rsapi.ResourcePageLayout{
 			Name:                pageOutline.Name,
 			RequiredFeatureSets: pageOutline.RequiredFeatureSets,
 			Sections:            make([]rsapi.SectionLayout, 0, len(pageOutline.Sections)),
 		}
 		for _, sectionOutline := range pageOutline.Sections {
 			sectionFilter := pageFilter.GetSection(sectionOutline.Name)
+			if !sectionFilter.Show {
+				continue
+			}
 
 			section := rsapi.SectionLayout{
 				Name:                sectionOutline.Name,