Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump the kong-packages group with 18 updates #195

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +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.11",
"@kong-ui-public/copy-uuid": "^2.0.42",
"@kong-ui-public/entities-certificates": "^2.3.32",
"@kong-ui-public/entities-consumer-credentials": "^2.1.66",
"@kong-ui-public/entities-consumers": "^2.5.32",
"@kong-ui-public/entities-gateway-services": "^2.5.2",
"@kong-ui-public/entities-key-sets": "^2.3.32",
"@kong-ui-public/entities-keys": "^2.3.32",
"@kong-ui-public/entities-plugins": "^2.12.19",
"@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/entities-routes": "^2.4.2",
"@kong-ui-public/entities-shared": "^2.5.2",
"@kong-ui-public/entities-snis": "^2.3.32",
"@kong-ui-public/entities-upstreams-targets": "^2.3.32",
"@kong-ui-public/entities-vaults": "^2.4.21",
"@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/forms": "^2.1.28",
"@kong-ui-public/i18n": "^2.1.3",
"@kong-ui-public/misc-widgets": "^2.0.25",
"@kong-ui-public/misc-widgets": "^2.0.29",
"@kong/icons": "^1.8.8",
"@kong/kongponents": "^9.0.0-alpha.108",
"@kong/kongponents": "^9.0.0-alpha.115",
"@material-design-icons/font": "^0.14.9",
"axios": "^1.6.0",
"marked": "^5.1.0",
Expand Down
6 changes: 3 additions & 3 deletions src/pages/consumers/ConsumerCredentials.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
/>
<KEmptyState
v-if="enabledPluginsFetched && !hasEnabledPlugins"
:handle-click="navigateToPluginSelection"
:cta-text="t('entities.consumer-credential.empty.button')"
:action-button-text="t('entities.consumer-credential.empty.button')"
@click-action="navigateToPluginSelection"
>
<template #title>
{{ t('entities.consumer-credential.empty.title') }}
</template>
<template #message>
<template #default>
{{ t('entities.consumer-credential.empty.message', {
plugins: credentialPlugins.map(p => p.title).join(', '),
}) }}
Expand Down
2 changes: 0 additions & 2 deletions src/registerGlobalComponents.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { App } from 'vue'
import Kongponents from '@kong/kongponents'
import CopyUuid from '@kong-ui-public/copy-uuid'
import { FORMS_API_KEY, VueFormGenerator } from '@kong-ui-public/forms'
import PageHeader from '@/components/PageHeader.vue'
import HeaderBackButton from '@/components/HeaderBackButton.vue'
Expand All @@ -10,7 +9,6 @@ import { apiService } from './services/apiService'

export const registerGlobalComponents = (app: App) => {
app.use(Kongponents)
app.use(CopyUuid)
app.component('VueFormGenerator', VueFormGenerator)
app.provide(FORMS_API_KEY, {
getOne: (entity: string, id: string) => {
Expand Down
1 change: 0 additions & 1 deletion src/styles/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import '@material-design-icons/font'
import '@kong-ui-public/app-layout/dist/style.css'
import '@kong-ui-public/copy-uuid/dist/style.css'
import '@kong-ui-public/entities-certificates/dist/style.css'
import '@kong-ui-public/entities-consumer-credentials/dist/style.css'
import '@kong-ui-public/entities-consumers/dist/style.css'
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/commands/expectEmptyEntityList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import { expect } from '@playwright/test'

export const expectEmptyEntityList = async (page: Page, entity: string, description: string) => {
await expect(page.locator(`.kong-ui-entities-${entity}-list .k-table-empty-state .primary`)).toBeVisible()
await expect(page.locator(`.kong-ui-entities-${entity}-list .k-table-empty-state .k-empty-state-title-header`)).toHaveText(description)
await expect(page.locator(`.kong-ui-entities-${entity}-list .k-table-empty-state .empty-state-title`)).toHaveText(description)
}
7 changes: 3 additions & 4 deletions tests/playwright/specs/consumers/01-Consumers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ test.describe('consumers', () => {
})

test('consumer list - empty', async ({ page }) => {
await expect(page.locator('.empty-state-wrapper')).toContainText('Configure a New Consumer')
await expect(page.locator('.k-empty-state')).toContainText('Configure a New Consumer')
})

test('consumer create from - entrance and exit', async ({ page }) => {
Expand Down Expand Up @@ -187,7 +187,7 @@ test.describe('consumers', () => {
await withNavigation(page, () => clickEntityListAction(page, 'view'))
await page.waitForSelector('.kong-ui-consumer-entity-config-card')
await switchDetailTab(page, 'credentials')
await withNavigation(page, () => page.locator('.empty-state-wrapper button').click())
await withNavigation(page, () => page.locator('.k-empty-state button').click())
await withNavigation(page, () => page.locator('[data-testid="Key Authentication"]').click())
await page.waitForSelector('#config-key_names')
await page.click(consumerListPage.$.submitButton)
Expand All @@ -210,8 +210,7 @@ test.describe('consumers', () => {
await page.fill('#key', 'my-second-api-key')
await page.click(consumerListPage.$.submitButton)
await page.waitForSelector(consumerListPage.$.success)
await expect(keyAuthLocator.locator('[data-testid="copy-id"][title="my-api-key"]')).toBeVisible()
await expect(keyAuthLocator.locator('[data-testid="copy-id"][title="my-second-api-key"]')).toBeVisible()
expect(await keyAuthLocator.locator('table tbody tr').count()).toBe(2)
})

test('consumer create - success2', async ({ page }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ test.describe('consumer credentials', () => {
await page.locator('.modal-footer .footer-actions .danger').click()
const basicAuthLocator = page.locator('.credential-list-wrapper').filter({ hasText: 'Basic Authentication' })

await expect(basicAuthLocator.locator('.empty-state-content .primary')).toContainText('New Basic Auth Credential')
await expect(basicAuthLocator.locator('.empty-state-action .primary')).toContainText('New Basic Auth Credential')
})
})
4 changes: 2 additions & 2 deletions tests/playwright/specs/consumers/03-ConsumerPlugins.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ test.describe('consumer plugins', () => {

test('install a plugin from the Plugins tab', async ({ page }) => {
await withNavigation(page, async () => await clickEntityListAction(page, 'view'))
const uuid = await page.locator('.uuid-container').innerText()
const uuid = await page.locator('.copy-container').innerText()

await switchDetailTab(page, 'plugins')
await withNavigation(
page,
async () => await page.locator('.empty-state-content .primary').click()
async () => await page.locator('.empty-state-action .primary').click()
)
await expandPlugins(page)
await withNavigation(
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/specs/key-sets/02-Keys.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ test.describe('key-set keys tab', () => {
test(`create key "${mockJwName}" from the Keys tab `, async ({ page }) => {
await withNavigation(page, () => clickEntityListAction(page, 'view'))
await switchDetailTab(page, 'keys')
await withNavigation(page, () => page.locator('.k-empty-state-cta [data-testid="new-key"]').click())
await withNavigation(page, () => page.locator('.empty-state-action [data-testid="new-key"]').click())

withNavigation(page, () => fillEntityForm({
page,
Expand Down
4 changes: 2 additions & 2 deletions tests/playwright/specs/keys/01-Keys.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ test.describe('keys', () => {
method: 'fill',
withAction: 'submit',
})
await expect(page.locator('[data-testid="form-error"] .k-alert-msg-text'))
await expect(page.locator('[data-testid="form-error"] .alert-content'))
.toHaveText('schema violation (kid in jwk.kid must be equal to keys.kid)')
})

Expand All @@ -263,7 +263,7 @@ test.describe('keys', () => {
method: 'fill',
withAction: 'submit',
})
await expect(page.locator('[data-testid="form-error"] .k-alert-msg-text'))
await expect(page.locator('[data-testid="form-error"] .alert-content'))
.toHaveText(`UNIQUE violation detected on '{name="pem-key"}'`)
})
})
4 changes: 2 additions & 2 deletions tests/playwright/specs/misc/02-NotFound.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ test.describe('not found', () => {

const expectConfigCardNotFound = async (page: Page, url: string, expectedMessage = 'Not found') => {
await page.goto(url)
await expect(page.locator('.empty-state-wrapper.is-error')).toBeVisible()
await expect(page.locator('.empty-state-wrapper.is-error').locator('.empty-state-content'))
await expect(page.locator('.k-empty-state.error')).toBeVisible()
await expect(page.locator('.k-empty-state.error').locator('.empty-state-content'))
.toContainText(expectedMessage, { ignoreCase: true })
}

Expand Down
14 changes: 7 additions & 7 deletions tests/playwright/specs/plugins/01-Plugins.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ test.describe('plugins', () => {
})

test('plugin list should be empty now', async ({ page }) => {
const emptyState = page.locator('.kong-ui-entities-plugins-list .empty-state-wrapper')
const emptyState = page.locator('.kong-ui-entities-plugins-list .k-empty-state')

await expect(emptyState).toBeVisible()
await expect(emptyState).toContainText('Configure a New Plugin')
Expand All @@ -68,7 +68,7 @@ test.describe('plugins', () => {

await serviceListPage.goto()
await withNavigation(page, async () => await clickEntityListAction(page, 'view'))
const uuid = await page.locator('.uuid-container').innerText()
const uuid = await page.locator('.copy-container').innerText()

await switchDetailTab(page, 'plugins')

Expand Down Expand Up @@ -182,7 +182,7 @@ test.describe('plugins', () => {

await routeListPage.goto()
await withNavigation(page, async () => await clickEntityListAction(page, 'view'))
const uuid = await page.locator('.uuid-container').innerText()
const uuid = await page.locator('.copy-container').innerText()

await switchDetailTab(page, 'plugins')

Expand Down Expand Up @@ -215,12 +215,12 @@ test.describe('plugins', () => {
await consumerListPage.goto()

await withNavigation(page, async () => await clickEntityListAction(page, 'view'))
const uuid = await page.locator('.uuid-container').innerText()
const uuid = await page.locator('.copy-container').innerText()

await switchDetailTab(page, 'plugins')
await withNavigation(
page,
async () => await page.locator('.empty-state-content .primary').click()
async () => await page.locator('.empty-state-action .primary').click()
)
await withNavigation(
page,
Expand Down Expand Up @@ -294,7 +294,7 @@ test.describe('plugins', () => {

await withNavigation(
page,
async () => await page.locator('.empty-state-content .primary').click()
async () => await page.locator('.empty-state-action .primary').click()
)
await withNavigation(
page,
Expand Down Expand Up @@ -411,7 +411,7 @@ test.describe('plugins', () => {
await filterInput.fill('sad')
await expect(page.getByTestId('plugins-empty-state')).toBeVisible()
await expect(page.getByTestId('k-collapse-title')).not.toBeVisible()
await expect(page.locator('[data-testid="plugins-empty-state"] .k-empty-state-message')).toContainText('No results found')
await expect(page.locator('[data-testid="plugins-empty-state"] .empty-state-message')).toContainText('No results found')
})

test('for plugin "key-auth", the default array field should have value', async ({ page, pluginListPage }) => {
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/specs/plugins/02-PluginFilter.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ test.describe('plugins filter', () => {
test('displays error if no results for plugin', async ({ page }) => {
await expect(page.locator('.kong-ui-entity-filter-input')).toBeVisible()
await page.fill('[data-testid="search-input"]', 'foo')
await expect(page.locator('.empty-state-title .k-empty-state-title-header')).toHaveText('No results found')
await expect(page.locator('.empty-state-title')).toHaveText('No results found')
// clear the filter
await page.locator('[data-testid="clear"]').click()
await expect(page.locator('.kong-ui-entities-plugins-list tr[data-testid="basic-auth"]')).toBeVisible()
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/specs/routes/01-Routes.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ test.describe('routes', () => {
withAction: 'submit',
})
await expect(page.locator('[data-testid="form-error"]')).toBeVisible()
await expect(page.locator('[data-testid="form-error"] .k-alert-msg')).toHaveText(`schema violation (paths.1: should start with: / (fixed path) or ~/ (regex path))`)
await expect(page.locator('[data-testid="form-error"] .alert-message')).toHaveText(`schema violation (paths.1: should start with: / (fixed path) or ~/ (regex path))`)
})

test('route create - can open/close advanced fields', async ({ page }) => {
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/specs/routes/02-RoutesPlugins.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ test.describe('routes plugins', () => {
test(`install a plugin for the route "${mockRouteName} from the plugins tab"`, async ({ page }) => {
await withNavigation(page, async () => await clickEntityListAction(page, 'view'))

const uuid = await page.locator('.uuid-container').innerText()
const uuid = await page.locator('.copy-container').innerText()

await switchDetailTab(page, 'plugins')

Expand Down
6 changes: 3 additions & 3 deletions tests/playwright/specs/services/01-Service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ test.describe('services', () => {
await clickEntityListAction(page, 'view')
const serviceId = (await page
.locator('[data-testid="id-property-value"]')
.locator('.uuid-container')
.locator('.copy-container')
.textContent() ?? '').trim()

await waitAndDismissToasts(page)
Expand Down Expand Up @@ -257,7 +257,7 @@ test.describe('services', () => {
await clickEntityListAction(page, 'view')
const serviceId = (await page
.locator('[data-testid="id-property-value"]')
.locator('.uuid-container')
.locator('.copy-container')
.textContent() ?? '').trim()

await waitAndDismissToasts(page)
Expand Down Expand Up @@ -345,7 +345,7 @@ test.describe('services', () => {
await clickEntityListAction(page, 'view')
const serviceId = (await page
.locator('[data-testid="id-property-value"]')
.locator('.uuid-container')
.locator('.copy-container')
.textContent() ?? '').trim()

await waitAndDismissToasts(page)
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/specs/services/03-ServicePlugins.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ test.describe('service plugins', () => {
await serviceListPage.goto()
await withNavigation(page, () => clickEntityListAction(page, 'view'))
await switchDetailTab(page, 'plugins')
await page.waitForSelector('.kong-ui-entities-plugins-list .empty-state-wrapper')
await page.waitForSelector('.kong-ui-entities-plugins-list .k-empty-state')
await withNavigation(page, () =>
page.click('.kong-ui-entities-plugins-list [data-testid="new-plugin"]')
)
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/specs/services/04-Filtering.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ test.describe('Filtering', () => {
await inputWrapper.click()
await inputWrapper.locator('input').type('foo')

await expect(page.locator('.empty-state-title .k-empty-state-title-header')).toHaveText('No results found')
await expect(page.locator('.empty-state-title')).toHaveText('No results found')
})
})
2 changes: 1 addition & 1 deletion tests/playwright/specs/snis/02-SNIsFilter.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ test.describe('snis filter', () => {
test('displays error if no results for upstream', async ({ page }) => {
await expect(page.locator('.kong-ui-entity-filter-input')).toBeVisible()
await page.fill('[data-testid="search-input"]', 'foo')
await expect(page.locator('.empty-state-title .k-empty-state-title-header')).toHaveText('No results found')
await expect(page.locator('.empty-state-title')).toHaveText('No results found')
// clear the filter
await page.locator('[data-testid="clear"]').click()
await expect(page.locator('.kong-ui-entities-snis-list tr [data-testid="snisa"]')).toBeVisible()
Expand Down
12 changes: 6 additions & 6 deletions tests/playwright/specs/upstreams/01-Upstreams.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ test.describe('upstreams', () => {
withAction: 'submit',
})

await expect(page.locator('.k-alert-msg-text')).toBeVisible()
await expect(page.locator('.k-alert-msg-text')).toHaveText(`UNIQUE violation detected on '{name="${upstream_host1}"}'`)
await expect(page.locator('.alert-content')).toBeVisible()
await expect(page.locator('.alert-content')).toHaveText(`UNIQUE violation detected on '{name="${upstream_host1}"}'`)
})

test('view upstream detail page', async ({ page }) => {
Expand All @@ -123,7 +123,7 @@ test.describe('upstreams', () => {
// switch targets tab
await switchDetailTab(page, 'targets')
await expect(page.locator('.kong-ui-entities-targets-list .k-table-empty-state .primary')).toBeVisible()
await expect(page.locator('.kong-ui-entities-targets-list .k-table-empty-state .k-empty-state-title-header')).toHaveText('Configure a New Target')
await expect(page.locator('.kong-ui-entities-targets-list .k-table-empty-state .empty-state-title')).toHaveText('Configure a New Target')
})

test('submit/cancel upstream editing', async ({ page }) => {
Expand Down Expand Up @@ -430,14 +430,14 @@ test.describe('upstreams', () => {
},
{},
async () => {
await expect(page.locator('.k-alert-msg-text')).toBeVisible()
await expect(page.locator('.alert-content')).toBeVisible()

if (fallback.fill) {
await expect(page.locator('.k-alert-msg-text')).toHaveText(`schema violation (values of these fields must be distinct: 'hash_on_${fallback.type}', 'hash_fallback_${fallback.type}')`)
await expect(page.locator('.alert-content')).toHaveText(`schema violation (values of these fields must be distinct: 'hash_on_${fallback.type}', 'hash_fallback_${fallback.type}')`)
} else {
const expect_hashs = full_hashs[fallback.type]

await expect(page.locator('.k-alert-msg-text')).toHaveText(`2 schema violations (failed conditional validation given value of field 'hash_on'; hash_fallback: expected one of: ${expect_hashs.join(', ')})`)
await expect(page.locator('.alert-content')).toHaveText(`2 schema violations (failed conditional validation given value of field 'hash_on'; hash_fallback: expected one of: ${expect_hashs.join(', ')})`)
}
},
false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ test.describe('upstreams', () => {
test('create a target successful', async ({ page }) => {
await withNavigation(page, async () => await clickEntityListAction(page, 'view'))
await switchDetailTab(page, 'targets')
await page.locator('.empty-state-content .primary').click()
await page.locator('.empty-state-action .primary').click()
await page.waitForSelector('.kong-ui-entities-target-form')
await page.locator('[data-testid="target-form-target"]').type(mockTarget)
await page.locator('.k-prompt [data-testid="modal-action-button"]').click()
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/specs/upstreams/03-UpstreamFilter.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ test.describe('upstreams filter', () => {
test('displays error if no results for upstream', async ({ page }) => {
await expect(page.locator('.kong-ui-entity-filter-input')).toBeVisible()
await page.fill('[data-testid="search-input"]', 'foo')
await expect(page.locator('.empty-state-title .k-empty-state-title-header')).toHaveText('No results found')
await expect(page.locator('.empty-state-title')).toHaveText('No results found')
// clear the filter
await page.locator('[data-testid="clear"]').click()
await expect(page.locator('.kong-ui-entities-upstreams-list tr [data-testid="upstreamA"]')).toBeVisible()
Expand Down
4 changes: 2 additions & 2 deletions tests/playwright/specs/vaults/01-Vaults.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ test.describe('vaults', () => {
},
withAction: 'submit',
})
await expect(page.locator('[data-testid="form-error"] .k-alert-msg')).toBeVisible()
await expect(page.locator('[data-testid="form-error"] .k-alert-msg')).toContainText('schema violation (prefix: must not be one of: env)')
await expect(page.locator('[data-testid="form-error"] .alert-message')).toBeVisible()
await expect(page.locator('[data-testid="form-error"] .alert-message')).toContainText('schema violation (prefix: must not be one of: env)')
})
})
Loading
Loading