chore(deps): bump the kong-packages group with 17 updates (#199)

* chore(deps): bump the kong-packages group with 17 updates Bumps the kong-packages group with 17 updates: | Package | From | To | | --- | --- | --- | | [@kong-ui-public/app-layout](https://github.com/Kong/public-ui-components/tree/HEAD/packages/core/app-layout) | `4.0.15` | `4.0.16` | | [@kong-ui-public/entities-certificates](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-certificates) | `2.4.5` | `2.5.4` | | [@kong-ui-public/entities-consumer-credentials](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-consumer-credentials) | `2.1.74` | `2.1.79` | | [@kong-ui-public/entities-consumers](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-consumers) | `2.6.5` | `2.7.4` | | [@kong-ui-public/entities-gateway-services](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-gateway-services) | `2.6.5` | `2.7.4` | | [@kong-ui-public/entities-key-sets](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-key-sets) | `2.4.5` | `2.5.4` | | [@kong-ui-public/entities-keys](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-keys) | `2.4.5` | `2.5.4` | | [@kong-ui-public/entities-plugins](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-plugins) | `2.14.1` | `2.16.4` | | [@kong-ui-public/entities-routes](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-routes) | `2.5.5` | `2.6.4` | | [@kong-ui-public/entities-shared](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-shared) | `2.10.5` | `2.12.3` | | [@kong-ui-public/entities-snis](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-snis) | `2.4.5` | `2.5.4` | | [@kong-ui-public/entities-upstreams-targets](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-upstreams-targets) | `2.4.5` | `2.5.4` | | [@kong-ui-public/entities-vaults](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-vaults) | `2.5.5` | `2.6.4` | | [@kong-ui-public/forms](https://github.com/Kong/public-ui-components/tree/HEAD/packages/core/forms) | `2.2.0` | `2.2.2` | | [@kong-ui-public/i18n](https://github.com/Kong/public-ui-components/tree/HEAD/packages/core/i18n) | `2.1.3` | `2.1.4` | | [@kong-ui-public/misc-widgets](https://github.com/Kong/public-ui-components/tree/HEAD/packages/core/misc-widgets) | `2.0.29` | `2.0.31` | | [@kong-ui-public/entities-consumer-groups](https://github.com/Kong/public-ui-components/tree/HEAD/packages/entities/entities-consumer-groups) | `2.5.5` | `2.6.4` | Updates `@kong-ui-public/app-layout` from 4.0.15 to 4.0.16 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/core/app-layout/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/app-layout@4.0.16/packages/core/app-layout) Updates `@kong-ui-public/entities-certificates` from 2.4.5 to 2.5.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-certificates/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-certificates@2.5.4/packages/entities/entities-certificates) Updates `@kong-ui-public/entities-consumer-credentials` from 2.1.74 to 2.1.79 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-consumer-credentials/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-consumer-credentials@2.1.79/packages/entities/entities-consumer-credentials) Updates `@kong-ui-public/entities-consumers` from 2.6.5 to 2.7.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-consumers/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-consumers@2.7.4/packages/entities/entities-consumers) Updates `@kong-ui-public/entities-gateway-services` from 2.6.5 to 2.7.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-gateway-services/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-gateway-services@2.7.4/packages/entities/entities-gateway-services) Updates `@kong-ui-public/entities-key-sets` from 2.4.5 to 2.5.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-key-sets/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-key-sets@2.5.4/packages/entities/entities-key-sets) Updates `@kong-ui-public/entities-keys` from 2.4.5 to 2.5.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-keys/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-keys@2.5.4/packages/entities/entities-keys) Updates `@kong-ui-public/entities-plugins` from 2.14.1 to 2.16.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-plugins/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-plugins@2.16.4/packages/entities/entities-plugins) Updates `@kong-ui-public/entities-routes` from 2.5.5 to 2.6.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-routes/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-routes@2.6.4/packages/entities/entities-routes) Updates `@kong-ui-public/entities-shared` from 2.10.5 to 2.12.3 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-shared/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-shared@2.12.3/packages/entities/entities-shared) Updates `@kong-ui-public/entities-snis` from 2.4.5 to 2.5.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-snis/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-snis@2.5.4/packages/entities/entities-snis) Updates `@kong-ui-public/entities-upstreams-targets` from 2.4.5 to 2.5.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-upstreams-targets/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-upstreams-targets@2.5.4/packages/entities/entities-upstreams-targets) Updates `@kong-ui-public/entities-vaults` from 2.5.5 to 2.6.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-vaults/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-vaults@2.6.4/packages/entities/entities-vaults) Updates `@kong-ui-public/forms` from 2.2.0 to 2.2.2 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/core/forms/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/forms@2.2.2/packages/core/forms) Updates `@kong-ui-public/i18n` from 2.1.3 to 2.1.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/core/i18n/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/i18n@2.1.4/packages/core/i18n) Updates `@kong-ui-public/misc-widgets` from 2.0.29 to 2.0.31 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/core/misc-widgets/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/misc-widgets@2.0.31/packages/core/misc-widgets) Updates `@kong-ui-public/entities-consumer-groups` from 2.5.5 to 2.6.4 - [Release notes](https://github.com/Kong/public-ui-components/releases) - [Changelog](https://github.com/Kong/public-ui-components/blob/main/packages/entities/entities-consumer-groups/CHANGELOG.md) - [Commits](https://github.com/Kong/public-ui-components/commits/@kong-ui-public/entities-consumer-groups@2.6.4/packages/entities/entities-consumer-groups) --- updated-dependencies: - dependency-name: "@kong-ui-public/app-layout" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-certificates" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-consumer-credentials" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-consumers" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-gateway-services" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-key-sets" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-keys" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-plugins" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-routes" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-shared" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-snis" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-upstreams-targets" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-vaults" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kong-packages - dependency-name: "@kong-ui-public/forms" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kong-packages - dependency-name: "@kong-ui-public/i18n" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kong-packages - dependency-name: "@kong-ui-public/misc-widgets" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kong-packages - dependency-name: "@kong-ui-public/entities-consumer-groups" dependency-type: indirect update-type: version-update:semver-minor dependency-group: kong-packages ... Signed-off-by: dependabot[bot] <support@github.com> * tests(*): fix test cases --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Leopoldthecoder <leopoldthecuber@gmail.com>
Kong · Mar 22, 2024 · d93f9f9 · d93f9f9
1 parent 68eb26d
commit d93f9f9
Show file tree

Hide file tree

Showing 10 changed files with 136 additions and 130 deletions.
diff --git a/package.json b/package.json
@@ -23,24 +23,24 @@
     "src/**/*.{css,scss,sass,less,styl,vue}": "stylelint --allow-empty-input --fix 'src/**/*.{css,scss,sass,less,styl,vue}'"
   },
   "dependencies": {
-    "@kong-ui-public/app-layout": "^4.0.15",
-    "@kong-ui-public/entities-certificates": "^2.4.5",
-    "@kong-ui-public/entities-consumer-credentials": "^2.1.74",
-    "@kong-ui-public/entities-consumers": "^2.6.5",
-    "@kong-ui-public/entities-gateway-services": "^2.6.5",
-    "@kong-ui-public/entities-key-sets": "^2.4.5",
-    "@kong-ui-public/entities-keys": "^2.4.5",
-    "@kong-ui-public/entities-plugins": "^2.14.1",
+    "@kong-ui-public/app-layout": "^4.0.16",
+    "@kong-ui-public/entities-certificates": "^2.5.4",
+    "@kong-ui-public/entities-consumer-credentials": "^2.1.79",
+    "@kong-ui-public/entities-consumers": "^2.7.4",
+    "@kong-ui-public/entities-gateway-services": "^2.7.4",
+    "@kong-ui-public/entities-key-sets": "^2.5.4",
+    "@kong-ui-public/entities-keys": "^2.5.4",
+    "@kong-ui-public/entities-plugins": "^2.16.4",
     "@kong-ui-public/entities-routes": "^2.4.2",
     "@kong-ui-public/entities-shared": "^2.5.2",
-    "@kong-ui-public/entities-snis": "^2.4.5",
-    "@kong-ui-public/entities-upstreams-targets": "^2.4.5",
-    "@kong-ui-public/entities-vaults": "^2.5.5",
+    "@kong-ui-public/entities-snis": "^2.5.4",
+    "@kong-ui-public/entities-upstreams-targets": "^2.5.4",
+    "@kong-ui-public/entities-vaults": "^2.6.4",
     "@kong-ui-public/forms": "^2.1.28",
-    "@kong-ui-public/i18n": "^2.1.3",
-    "@kong-ui-public/misc-widgets": "^2.0.29",
+    "@kong-ui-public/i18n": "^2.1.4",
+    "@kong-ui-public/misc-widgets": "^2.0.31",
     "@kong/icons": "^1.8.8",
-    "@kong/kongponents": "^9.0.0-alpha.115",
+    "@kong/kongponents": "9.0.0-alpha.120",
     "@material-design-icons/font": "^0.14.9",
     "axios": "^1.6.0",
     "marked": "^5.1.0",

diff --git a/src/composables/useFormGeneralConfig.ts b/src/composables/useFormGeneralConfig.ts
@@ -5,6 +5,5 @@ import { useBaseGeneralConfig } from './useBaseGeneralConfig'
 export const useFormGeneralConfig = () => {
   return reactive({
     ...toRefs(useBaseGeneralConfig()),
-    jsonYamlFormsEnabled: true,
-  }) as Pick<KongManagerBaseFormConfig, 'app' | 'workspace' | 'gatewayInfo' | 'apiBaseUrl' | 'jsonYamlFormsEnabled'>
+  }) as Pick<KongManagerBaseFormConfig, 'app' | 'workspace' | 'gatewayInfo' | 'apiBaseUrl'>
 }
diff --git a/src/pages/plugins/Form.vue b/src/pages/plugins/Form.vue
@@ -78,6 +78,7 @@ const config = reactive({
   entityId: computed(() => entityScope.value?.id ?? ''),
   entityType: computed(() => entityScope.value?.typeLiteral),
   disableConsumerGroupScope: true,
+  groupFields: true,
 })
 
 const onFetchSchemaError = (err: AxiosError) => {

diff --git a/tests/playwright/commands/expandAdvancedFields.ts b/tests/playwright/commands/expandAdvancedFields.ts
@@ -0,0 +1,11 @@
+import type { Page } from '@playwright/test'
+
+// This command expands advanced fields in plugin form
+export const expandAdvancedFields = async (page: Page) => {
+  await page.waitForSelector('.entity-form .vue-form-generator')
+  const advancedFields = page.locator('.k-collapse').last()
+
+  if (await advancedFields.isVisible() && await advancedFields.locator('.k-collapse-hidden-content').isHidden()) {
+    await advancedFields.locator('.k-collapse-trigger-icon').click()
+  }
+}
diff --git a/tests/playwright/commands/expandPlugins.ts b/tests/playwright/commands/expandPlugins.ts
diff --git a/tests/playwright/commands/fillEntityForm.ts b/tests/playwright/commands/fillEntityForm.ts
@@ -1,5 +1,5 @@
 import type { Page } from '@playwright/test'
-
+import { expandAdvancedFields } from './expandAdvancedFields'
 import { selectOption } from './selectOption'
 
 interface Params {
@@ -31,6 +31,10 @@ export const fillEntityForm = async (params: Params) => {
     handleModal,
   } = params
 
+  if (await page.locator('.kong-ui-entities-plugin-form').isVisible()) {
+    await expandAdvancedFields(page)
+  }
+
   for (const [key, value] of Object.entries(formData)) {
     // for select
     if (await page.locator(`[data-testid="${key}"] .k-select`).isVisible()) {

diff --git a/tests/playwright/specs/consumers/03-ConsumerPlugins.spec.ts b/tests/playwright/specs/consumers/03-ConsumerPlugins.spec.ts
@@ -3,7 +3,7 @@ import baseTest from '@pw/base-test'
 import { clearKongResources } from '@pw/commands/clearKongResources'
 import { clickEntityListAction } from '@pw/commands/clickEntityListAction'
 import { createKongResource } from '@pw/commands/createKongResource'
-import { expandPlugins } from '@pw/commands/expandPlugins'
+import { expandAdvancedFields } from '@pw/commands/expandAdvancedFields'
 import { switchDetailTab } from '@pw/commands/switchDetailTab'
 import { withNavigation } from '@pw/commands/withNavigation'
 import { ConsumerListPage } from '@pw/pages/consumers'
@@ -41,7 +41,6 @@ test.describe('consumer plugins', () => {
       page,
       async () => await page.locator('.empty-state-action .primary').click()
     )
-    await expandPlugins(page)
     await withNavigation(
       page,
       async () => await page.getByTestId('datadog-card').click()
@@ -89,6 +88,7 @@ test.describe('consumer plugins', () => {
     await withNavigation(page, async () => await page.locator('.kong-ui-entities-plugins-list [data-testid="new-plugin"]').click())
     await page.locator('[data-testid="Rate Limiting"]').click()
     await page.waitForSelector('.kong-ui-entities-plugin-form-container')
+    await expandAdvancedFields(page)
     await page.locator('#config-second').fill('30')
     await withNavigation(
       page,

diff --git a/tests/playwright/specs/plugins/01-Plugins.spec.ts b/tests/playwright/specs/plugins/01-Plugins.spec.ts
@@ -4,7 +4,7 @@ import { autocompleteDeleteModal } from '@pw/commands/autocompleteDeleteModal'
 import { clearKongResources } from '@pw/commands/clearKongResources'
 import { clickEntityListAction } from '@pw/commands/clickEntityListAction'
 import { createKongResource } from '@pw/commands/createKongResource'
-import { expandPlugins } from '@pw/commands/expandPlugins'
+import { expandAdvancedFields } from '@pw/commands/expandAdvancedFields'
 import { fillEntityForm } from '@pw/commands/fillEntityForm'
 import { switchDetailTab } from '@pw/commands/switchDetailTab'
 import { waitAndDismissToasts } from '@pw/commands/waitAndDismissToast'
@@ -77,7 +77,6 @@ test.describe('plugins', () => {
       async () => await page.click('.kong-ui-entities-plugins-list [data-testid="new-plugin"]')
     )
 
-    await expandPlugins(page)
     await withNavigation(
       page,
       async () => await page.getByTestId('basic-auth-card').click()
@@ -86,6 +85,7 @@ test.describe('plugins', () => {
     await expect(page.locator('.autosuggest #service-id')).toBeVisible()
     await expect(page.locator('.autosuggest #service-id')).toHaveValue(new RegExp(`${mockServiceName}\\s*-\\s*${uuid}`))
 
+    await expandAdvancedFields(page)
     await page.locator('#config-anonymous').type('anon')
     await page.locator('#config-hide_credentials').check()
 

diff --git a/tests/playwright/specs/services/03-ServicePlugins.spec.ts b/tests/playwright/specs/services/03-ServicePlugins.spec.ts
@@ -4,7 +4,6 @@ import { autocompleteDeleteModal } from '@pw/commands/autocompleteDeleteModal'
 import { clearKongResources } from '@pw/commands/clearKongResources'
 import { clickEntityListAction } from '@pw/commands/clickEntityListAction'
 import { createKongResource } from '@pw/commands/createKongResource'
-import { expandPlugins } from '@pw/commands/expandPlugins'
 import { fillEntityForm } from '@pw/commands/fillEntityForm'
 import { switchDetailTab } from '@pw/commands/switchDetailTab'
 import { waitAndDismissToasts } from '@pw/commands/waitAndDismissToast'
@@ -45,7 +44,6 @@ test.describe('service plugins', () => {
     await withNavigation(page, () =>
       page.click('.kong-ui-entities-plugins-list [data-testid="new-plugin"]')
     )
-    await expandPlugins(page)
     await page.getByTestId('hmac-auth-card').click()
     await expect(page.locator('.autosuggest #service-id')).toHaveValue(new RegExp(`${testService?.name}\\s*-\\s*${testService?.id}`))
   })
@@ -119,7 +117,6 @@ test.describe('service plugins', () => {
     // create a global plugin
     await pluginListPage.goto()
     await withNavigation(page, async () => await page.locator('.kong-ui-entities-plugins-list [data-testid="new-plugin"]').click())
-    await expandPlugins(page)
     await page.getByTestId('key-auth-card').click()
     await page.waitForSelector('.kong-ui-entities-plugin-form-container')
     await withNavigation(page, async () => await page.click(serviceListPage.$.submitButton))