Merge branch 'main' into fix/public-ui-kongponents-phase-15

Kong · Jun 6, 2024 · 140146b · 140146b
2 parents 203101c + cdf52e3
commit 140146b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/packages/entities/entities-plugins/CHANGELOG.md b/packages/entities/entities-plugins/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.2](https://github.com/Kong/public-ui-components/compare/@kong-ui-public/[email protected]...@kong-ui-public/[email protected]) (2024-06-06)
+
+
+### Bug Fixes
+
+* **entities-plugins:** nested array for custom schema ([#1434](https://github.com/Kong/public-ui-components/issues/1434)) ([4410fbd](https://github.com/Kong/public-ui-components/commit/4410fbda9486359177b0e471fa65447f2abfa474))
+
+
+
+
+
+## [5.0.1](https://github.com/Kong/public-ui-components/compare/@kong-ui-public/[email protected]...@kong-ui-public/[email protected]) (2024-06-06)
+
+
+### Bug Fixes
+
+* **entities-plugins:** hide ordering for consumer group plugins ([#1433](https://github.com/Kong/public-ui-components/issues/1433)) ([3f0d003](https://github.com/Kong/public-ui-components/commit/3f0d0031936e35a477e8ae2b5683621ab80d67a4))
+
+
+
+
+
 # [5.0.0](https://github.com/Kong/public-ui-components/compare/@kong-ui-public/[email protected]...@kong-ui-public/[email protected]) (2024-06-04)
 
 

diff --git a/packages/entities/entities-plugins/package.json b/packages/entities/entities-plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kong-ui-public/entities-plugins",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "type": "module",
   "main": "./dist/entities-plugins.umd.js",
   "module": "./dist/entities-plugins.es.js",

diff --git a/packages/entities/entities-plugins/src/components/PluginForm.vue b/packages/entities/entities-plugins/src/components/PluginForm.vue
@@ -606,9 +606,9 @@ const buildFormSchema = (parentKey: string, response: Record<string, any>, initi
     if (scheme.elements && scheme.type === 'array') {
       const elements = scheme.elements
       if (elements.type === 'string' && !elements.one_of) {
-        const { help, label, hint } = initialFormSchema[field]
+        const { id, help, label, hint } = initialFormSchema[field]
         const { help: helpOverride, ...overrides } = JSON.parse(JSON.stringify(ArrayStringFieldSchema))
-        initialFormSchema[field] = { help, label, hint, ...overrides }
+        initialFormSchema[field] = { id, help, label, hint, ...overrides }
         // Only replace the help text when it is not defined because ArrayStringFieldSchema is more generic
         if (initialFormSchema[field].help === undefined && typeof helpOverride === 'string') {
           initialFormSchema[field].help = marked.parse(helpOverride, { mangle: false, headerIds: false } as MarkedOptions)

diff --git a/packages/entities/entities-plugins/src/components/PluginList.vue b/packages/entities/entities-plugins/src/components/PluginList.vue
@@ -168,9 +168,9 @@
             :item="getEditDropdownItem(row)"
           />
         </PermissionsWrapper>
-        <!-- Dynamic Plugin Ordering not supported for consumer plugins -->
+        <!-- Dynamic Plugin Ordering not supported for consumer/consumer-group plugins -->
         <PermissionsWrapper
-          v-if="!isConsumerPage && isOrderingSupported"
+          v-if="!isConsumerPage && !isConsumerGroupPage && isOrderingSupported"
           :auth-function="() => canConfigureDynamicOrdering(row)"
         >
           <KDropdownItem
@@ -354,6 +354,7 @@ const router = useRouter()
 const { axiosInstance } = useAxios(props.config?.axiosRequestConfig)
 
 const isConsumerPage = computed((): boolean => props.config?.entityType === 'consumers')
+const isConsumerGroupPage = computed((): boolean => props.config?.entityType === 'consumer_groups')
 
 const isOrderingSupported = props.config.app === 'konnect' || useGatewayFeatureSupported({
   gatewayInfo: props.config.gatewayInfo,