feat(breaking changes!) more info on card and column status

krateoplatformops · Jan 19, 2024 · 7230dd8 · 7230dd8
1 parent 1c1ffb3
commit 7230dd8
Show file tree

Hide file tree

Showing 15 changed files with 282 additions and 182 deletions.
diff --git a/apis/ui/cardtemplates/v1alpha1/types.go b/apis/ui/cardtemplates/v1alpha1/types.go
@@ -5,7 +5,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type CardInfo struct {
+type Card struct {
 	Title string `json:"title"`
 
 	Content string `json:"content"`
@@ -21,33 +21,29 @@ type CardInfo struct {
 
 	// +optional
 	Tags string `json:"tags,omitempty"`
-}
-
-type AppInfo struct {
-	CardInfo `json:",inline"`
 
 	// +optional
 	Actions []*core.API `json:"actions,omitempty"`
+
+	// +optional
+	AllowedActions []string `json:"allowedActions,omitempty"`
 }
 
 // CardTemplate is a template for a Krateo UI Card widget.
 type CardTemplateSpec struct {
 	// +optional
 	Iterator *string `json:"iterator,omitempty"`
 
-	// App is the card info
-	App AppInfo `json:"app"`
+	// CardTemplateInfo is the card template info
+	CardTemplateInfo Card `json:"app"`
 
 	// APIList list of api calls.
 	// +optional
 	APIList []*core.API `json:"api,omitempty"`
 }
 
 type CardTemplateStatus struct {
-	Cards []*CardInfo `json:"cards,omitempty"`
-
-	// +optional
-	AllowedActions []string `json:"allowedActions,omitempty"`
+	Cards []*Card `json:"cards,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/apis/ui/cardtemplates/v1alpha1/zz_generated.deepcopy.go b/apis/ui/cardtemplates/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/ui/columns/v1alpha1/types.go b/apis/ui/columns/v1alpha1/types.go
@@ -2,14 +2,10 @@ package v1alpha1
 
 import (
 	"github.com/krateoplatformops/krateo-bff/apis/core"
-	"github.com/krateoplatformops/krateo-bff/apis/ui/cardtemplates/v1alpha1"
+	cardtemplatesv1alpha1 "github.com/krateoplatformops/krateo-bff/apis/ui/cardtemplates/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type Content struct {
-	CardTemplateList []v1alpha1.CardTemplate `json:"cardTemplateList"`
-}
-
 type App struct {
 	// +optional
 	Props map[string]string `json:"props,omitempty"`
@@ -25,9 +21,8 @@ type ColumnSpec struct {
 }
 
 type ColumnStatus struct {
-	// Cards list of card templates.
 	// +optional
-	Cards []*v1alpha1.CardInfo `json:"cards,omitempty"`
+	Cards []*cardtemplatesv1alpha1.Card `json:"cards,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/apis/ui/columns/v1alpha1/zz_generated.deepcopy.go b/apis/ui/columns/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/layout.ui.krateo.io_columns.yaml b/crds/layout.ui.krateo.io_columns.yaml
@@ -66,9 +66,50 @@ spec:
           status:
             properties:
               cards:
-                description: Cards list of card templates.
                 items:
                   properties:
+                    actions:
+                      items:
+                        description: API contains external api call info.
+                        properties:
+                          dependOn:
+                            type: string
+                          endpointRef:
+                            description: A Reference to a named object.
+                            properties:
+                              name:
+                                description: Name of the referenced object.
+                                type: string
+                              namespace:
+                                description: Namespace of the referenced object.
+                                type: string
+                            required:
+                            - name
+                            - namespace
+                            type: object
+                          headers:
+                            items:
+                              type: string
+                            type: array
+                          krateoGateway:
+                            type: boolean
+                          name:
+                            type: string
+                          path:
+                            type: string
+                          payload:
+                            type: string
+                          verb:
+                            default: GET
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    allowedActions:
+                      items:
+                        type: string
+                      type: array
                     color:
                       type: string
                     content:

diff --git a/crds/widgets.ui.krateo.io_cardtemplates.yaml b/crds/widgets.ui.krateo.io_cardtemplates.yaml
@@ -78,7 +78,7 @@ spec:
                   type: object
                 type: array
               app:
-                description: App is the card info
+                description: CardTemplateInfo is the card template info
                 properties:
                   actions:
                     items:
@@ -118,6 +118,10 @@ spec:
                       - name
                       type: object
                     type: array
+                  allowedActions:
+                    items:
+                      type: string
+                    type: array
                   color:
                     type: string
                   content:
@@ -141,13 +145,51 @@ spec:
             type: object
           status:
             properties:
-              allowedActions:
-                items:
-                  type: string
-                type: array
               cards:
                 items:
                   properties:
+                    actions:
+                      items:
+                        description: API contains external api call info.
+                        properties:
+                          dependOn:
+                            type: string
+                          endpointRef:
+                            description: A Reference to a named object.
+                            properties:
+                              name:
+                                description: Name of the referenced object.
+                                type: string
+                              namespace:
+                                description: Namespace of the referenced object.
+                                type: string
+                            required:
+                            - name
+                            - namespace
+                            type: object
+                          headers:
+                            items:
+                              type: string
+                            type: array
+                          krateoGateway:
+                            type: boolean
+                          name:
+                            type: string
+                          path:
+                            type: string
+                          payload:
+                            type: string
+                          verb:
+                            default: GET
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    allowedActions:
+                      items:
+                        type: string
+                      type: array
                     color:
                       type: string
                     content: