(chore) bring UI parity for existing cloud manager items (#336)

kyma-project · Jul 12, 2024 · 76d9719 · 76d9719
1 parent ee2db67
commit 76d9719
Show file tree

Hide file tree

Showing 19 changed files with 317 additions and 37 deletions.
diff --git a/...ig/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml b/...ig/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml
@@ -19,7 +19,7 @@ data:
         widget: Panel
         source: spec.ipRange
         children:
-          - name: name
+          - name: formName
             source: name
             widget: Labels
           - name: namespace
@@ -29,7 +29,7 @@ data:
         source: spec.volume
         widget: Panel
         children:
-          - name: name
+          - name: formName
             source: name
             widget: Labels
           - name: labels
@@ -65,25 +65,28 @@ data:
       simple: true
       name: spec.ipRange
       widget: FormGroup
+      required: false
       children:
         - path: name
-          name: name
+          name: formName
           simple: true
           required: true
           widget: Text
+          inputInfo: Leave blank for auto IP Range
         - path: namespace
           name: namespace
           simple: true
           required: true
           widget: Text
+          inputInfo: Leave blank for auto IP Range
     - path: spec.volume
       simple: true
       name: spec.volume
       widget: FormGroup
       children:
         - path: name
           simple: true
-          name: name
+          name: formName
           required: true
           widget: Text
         - path: labels
@@ -132,7 +135,7 @@ data:
       status.state: State
       placeholders.dropdown: Type or choose an option
       ipRange: IP Range
-      name: Name
+      formName: Name
       namespace: Namespace
       spec.volume: Volume
       labels: Labels

diff --git a/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_ipranges_ui.yaml b/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_ipranges_ui.yaml
@@ -24,7 +24,8 @@ data:
       name: spec.cidr
       widget: Text
       simple: true
-      required: true
+      required: false
+      inputInfo: Leave blank for Auto-CIDR
   general: |
     resource:
         kind: IpRange
@@ -41,9 +42,6 @@ data:
     - source: status.cidr
       name: status.cidr
       sort: true
-    - source: metadata.namespace
-      name: metadata.namespace
-      sort: true
     - source: status.state
       name: status.state
       sort: true

diff --git a/...t/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml b/...t/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml
@@ -23,6 +23,9 @@ data:
             - widget: Labels
               source: state
               name: status.state
+            - widget: Labels
+              source: opIdentifier
+              name: status.opIdentifier
   form: |-
     - path: spec.location
       simple: true
@@ -71,11 +74,12 @@ data:
     en:
       spec.location: Location
       spec.source.volume: Volume
-      spec.source.volume.name: Name
+      spec.source.volume.name: Volume Name
       spec.source.volume.namespace: Namespace
       status.state: State
       configuration: Configuration
       status: Status
+      status.opIdentifier: Operation Identifier
 kind: ConfigMap
 metadata:
   labels:

diff --git a/...ig/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml b/...ig/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml
@@ -18,6 +18,39 @@ data:
             - name: spec.tier
               source: tier
               widget: Labels
+        - name: spec.ipRange
+          widget: Panel
+          source: spec
+          children:
+            - name: spec.ipRange.name
+              source: ipRange.name
+              widget: Labels
+        - name: spec.volume
+          widget: Panel
+          source: spec
+          children:
+            - source: volume.name
+              name: spec.volume.name
+              widget: Labels
+            - source: volume.labels
+              name: spec.volume.labels
+              widget: Labels
+            - source: volume.annotations
+              name: spec.volume.annotations
+              widget: Labels
+        - name: spec.volumeClaim
+          widget: Panel
+          source: spec
+          children:
+            - source: volumeClaim.name
+              name: spec.volumeClaim.name
+              widget: Labels
+            - source: volumeClaim.labels
+              name: spec.volumeClaim.labels
+              widget: Labels
+            - source: volumeClaim.annotations
+              name: spec.volumeClaim.annotations
+              widget: Labels
         - name: status
           widget: Panel
           source: status
@@ -42,6 +75,53 @@ data:
       simple: true
       name: spec.tier
       required: true
+
+    - path: spec.ipRange
+      simple: false
+      name: spec.ipRange
+      widget: FormGroup
+      required: false
+      children:
+        - path: name
+          name: spec.ipRange.name
+          widget: Text
+          required: true
+    - path: spec.volume
+      simple: false
+      name: spec.volume
+      widget: FormGroup
+      required: false
+      children:
+        - path: name
+          name: spec.volume.name
+          widget: Text
+          required: true
+        - path: labels
+          name: spec.volume.labels
+          required: false
+          widget: KeyValuePair
+        - path: annotations
+          name: spec.volume.annotations
+          required: false
+          widget: KeyValuePair
+    - path: spec.volumeClaim
+      simple: false
+      name: spec.volumeClaim
+      widget: FormGroup
+      required: false
+      children:
+        - path: name
+          name: spec.volumeClaim.name
+          widget: Text
+          required: true
+        - path: labels
+          name: spec.volumeClaim.labels
+          required: false
+          widget: KeyValuePair
+        - path: annotations
+          name: spec.volumeClaim.annotations
+          required: false
+          widget: KeyValuePair
   general: |+
     resource:
         kind: GcpNfsVolume
@@ -77,9 +157,18 @@ data:
       spec.fileShareName: File Share Name
       spec.capacityGb: Capacity (Gb)
       spec.ipRange: IP Range
+      spec.ipRange.name: Name
       configuration: Configuration
       status.state: State
       status: Status
+      spec.volume: Volume
+      spec.volume.name: Name
+      spec.volume.labels: Labels
+      spec.volume.annotations: Annotations
+      spec.volumeClaim: Volume Claim
+      spec.volumeClaim.name: Name
+      spec.volumeClaim.labels: Labels
+      spec.volumeClaim.annotations: Annotations
 kind: ConfigMap
 metadata:
   labels:

diff --git a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_ipranges_ui.yaml b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_ipranges_ui.yaml
@@ -24,7 +24,8 @@ data:
       name: spec.cidr
       widget: Text
       simple: true
-      required: true
+      required: false
+      inputInfo: Leave blank for Auto-CIDR
   general: |
     resource:
         kind: IpRange
@@ -41,9 +42,6 @@ data:
     - source: status.cidr
       name: status.cidr
       sort: true
-    - source: metadata.namespace
-      name: metadata.namespace
-      sort: true
     - source: status.state
       name: status.state
       sort: true

diff --git a/config/ui-extensions/awsnfsvolumes/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml b/config/ui-extensions/awsnfsvolumes/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml
@@ -19,7 +19,7 @@ data:
         widget: Panel
         source: spec.ipRange
         children:
-          - name: name
+          - name: formName
             source: name
             widget: Labels
           - name: namespace
@@ -29,7 +29,7 @@ data:
         source: spec.volume
         widget: Panel
         children:
-          - name: name
+          - name: formName
             source: name
             widget: Labels
           - name: labels
@@ -65,25 +65,28 @@ data:
       simple: true
       name: spec.ipRange
       widget: FormGroup
+      required: false
       children:
         - path: name
-          name: name
+          name: formName
           simple: true
           required: true
           widget: Text
+          inputInfo: Leave blank for auto IP Range
         - path: namespace
           name: namespace
           simple: true
           required: true
           widget: Text
+          inputInfo: Leave blank for auto IP Range
     - path: spec.volume
       simple: true
       name: spec.volume
       widget: FormGroup
       children:
         - path: name
           simple: true
-          name: name
+          name: formName
           required: true
           widget: Text
         - path: labels
@@ -132,7 +135,7 @@ data:
       status.state: State
       placeholders.dropdown: Type or choose an option
       ipRange: IP Range
-      name: Name
+      formName: Name
       namespace: Namespace
       spec.volume: Volume
       labels: Labels

diff --git a/config/ui-extensions/awsnfsvolumes/details b/config/ui-extensions/awsnfsvolumes/details
@@ -16,7 +16,7 @@ body:
     widget: Panel
     source: spec.ipRange
     children:
-      - name: name
+      - name: formName
         source: name
         widget: Labels
       - name: namespace
@@ -26,7 +26,7 @@ body:
     source: spec.volume
     widget: Panel
     children:
-      - name: name
+      - name: formName
         source: name
         widget: Labels
       - name: labels

diff --git a/config/ui-extensions/awsnfsvolumes/form b/config/ui-extensions/awsnfsvolumes/form
@@ -17,25 +17,28 @@
   simple: true
   name: spec.ipRange
   widget: FormGroup
+  required: false
   children:
     - path: name
-      name: name
+      name: formName
       simple: true
       required: true
       widget: Text
+      inputInfo: Leave blank for auto IP Range
     - path: namespace
       name: namespace
       simple: true
       required: true
       widget: Text
+      inputInfo: Leave blank for auto IP Range
 - path: spec.volume
   simple: true
   name: spec.volume
   widget: FormGroup
   children:
     - path: name
       simple: true
-      name: name
+      name: formName
       required: true
       widget: Text
     - path: labels

diff --git a/config/ui-extensions/awsnfsvolumes/translations b/config/ui-extensions/awsnfsvolumes/translations
@@ -8,7 +8,7 @@ en:
   status.state: State
   placeholders.dropdown: Type or choose an option
   ipRange: IP Range
-  name: Name
+  formName: Name
   namespace: Namespace
   spec.volume: Volume
   labels: Labels

diff --git a/...xtensions/gcpnfsvolumebackups/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml b/...xtensions/gcpnfsvolumebackups/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml
@@ -23,6 +23,9 @@ data:
             - widget: Labels
               source: state
               name: status.state
+            - widget: Labels
+              source: opIdentifier
+              name: status.opIdentifier
   form: |-
     - path: spec.location
       simple: true
@@ -71,11 +74,12 @@ data:
     en:
       spec.location: Location
       spec.source.volume: Volume
-      spec.source.volume.name: Name
+      spec.source.volume.name: Volume Name
       spec.source.volume.namespace: Namespace
       status.state: State
       configuration: Configuration
       status: Status
+      status.opIdentifier: Operation Identifier
 kind: ConfigMap
 metadata:
   labels:

diff --git a/config/ui-extensions/gcpnfsvolumebackups/details b/config/ui-extensions/gcpnfsvolumebackups/details
@@ -20,3 +20,6 @@ body:
         - widget: Labels
           source: state
           name: status.state
+        - widget: Labels
+          source: opIdentifier
+          name: status.opIdentifier
diff --git a/config/ui-extensions/gcpnfsvolumebackups/translations b/config/ui-extensions/gcpnfsvolumebackups/translations
@@ -1,8 +1,9 @@
 en:
   spec.location: Location
   spec.source.volume: Volume
-  spec.source.volume.name: Name
+  spec.source.volume.name: Volume Name
   spec.source.volume.namespace: Namespace
   status.state: State
   configuration: Configuration
-  status: Status
+  status: Status
+  status.opIdentifier: Operation Identifier