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.

Sign up for GitHub

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 22 updates #240

Merged
merged 3 commits into from
Jun 18, 2024
Merged

chore(deps): bump the kong-packages group with 22 updates #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2bd23a
chore(deps): bump the kong-packages group with 22 updates
dependabot[bot] Jun 13, 2024
af6499f
deps(*): upgrade kongponents
Leopoldthecoder Jun 18, 2024
a2bd276
test(*): fix test cases
Leopoldthecoder Jun 18, 2024
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
32 changes: 16 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@
"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.2.0",
"@kong-ui-public/entities-certificates": "^3.2.0",
"@kong-ui-public/entities-consumer-credentials": "^3.2.0",
"@kong-ui-public/entities-consumers": "^3.2.0",
"@kong-ui-public/entities-data-plane-nodes": "^0.2.0",
"@kong-ui-public/entities-gateway-services": "^3.3.0",
"@kong-ui-public/entities-key-sets": "^3.2.0",
"@kong-ui-public/entities-keys": "^3.2.0",
"@kong-ui-public/entities-plugins": "^5.1.0",
"@kong-ui-public/app-layout": "^4.2.5",
"@kong-ui-public/entities-certificates": "^3.2.7",
"@kong-ui-public/entities-consumer-credentials": "^3.2.7",
"@kong-ui-public/entities-consumers": "^3.2.7",
"@kong-ui-public/entities-data-plane-nodes": "^0.2.7",
"@kong-ui-public/entities-gateway-services": "^3.4.0",
"@kong-ui-public/entities-key-sets": "^3.2.7",
"@kong-ui-public/entities-keys": "^3.2.7",
"@kong-ui-public/entities-plugins": "^5.1.8",
"@kong-ui-public/entities-routes": "^3.2.0",
"@kong-ui-public/entities-shared": "^3.2.0",
"@kong-ui-public/entities-snis": "^3.2.0",
"@kong-ui-public/entities-upstreams-targets": "^3.2.0",
"@kong-ui-public/entities-vaults": "^3.3.0",
"@kong-ui-public/entities-snis": "^3.2.7",
"@kong-ui-public/entities-upstreams-targets": "^3.2.7",
"@kong-ui-public/entities-vaults": "^3.3.7",
"@kong-ui-public/forms": "^3.1.5",
"@kong-ui-public/i18n": "^2.2.0",
"@kong-ui-public/misc-widgets": "^2.1.0",
"@kong-ui-public/i18n": "^2.2.1",
"@kong-ui-public/misc-widgets": "^2.1.3",
"@kong/icons": "^1.12.0",
"@kong/kongponents": "^9.0.0-alpha.165",
"@kong/kongponents": "^9.0.0-alpha.178",
"@material-design-icons/font": "^0.14.9",
"axios": "^1.6.0",
"dayjs": "^1.11.10",
Expand All @@ -52,7 +52,7 @@
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong/design-tokens": "^1.12.12",
"@kong/design-tokens": "^1.13.2",
"@playwright/test": "^1.44.1",
"@types/lodash-es": "^4.17.12",
"@types/marked": "^5.0.1",
Expand Down
4 changes: 2 additions & 2 deletions src/components/MakeAWish.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ const mailToUrl = computed(() => `mailto:[email protected]?subject=${t('wish.subje
left: 0;
right: 0;

[role="button"] {
cursor: default;
:deep(.popover-trigger-wrapper) {
display: block !important;
}

a {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/data-plane-nodes/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
</template>

<template #actions="{ row }">
<KDropdown :kpop-attributes="{ placement: 'bottomEnd' }">
<KDropdown :kpop-attributes="{ placement: 'bottom-end' }">
<KButton
appearance="tertiary"
class="actions-trigger"
Expand Down
8 changes: 4 additions & 4 deletions tests/playwright/specs/consumers/03-ConsumerPlugins.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ test.describe('consumer plugins', () => {
page,
async () => await page.getByTestId('datadog-card').click()
)
await expect(page.locator('.autosuggest #consumer-id')).toBeVisible()
await expect(page.locator('.autosuggest #consumer-id')).toHaveValue(new RegExp(`${mockConsumerName}\\s*-\\s*${uuid}`))
await expect(page.locator('.autosuggest input#consumer-id')).toBeVisible()
await expect(page.locator('.autosuggest input#consumer-id')).toHaveValue(new RegExp(`${mockConsumerName}\\s*-\\s*${uuid}`))
await withNavigation(
page,
async () => await page.locator('[data-testid="form-actions"] .primary').click()
Expand Down Expand Up @@ -102,8 +102,8 @@ test.describe('consumer plugins', () => {
await withNavigation(page, () => clickEntityListAction(page, 'edit'))
await page.waitForSelector('.kong-ui-entities-plugin-form-container')
await page.click('.selection-group .Scoped-check')
await page.click('#consumer-id')
await page.fill('#consumer-id', mockConsumerName)
await page.click('input#consumer-id')
await page.fill('input#consumer-id', mockConsumerName)
await page.waitForTimeout(300)
await expect(page.locator('.select-item')).toContainText(mockConsumerName)
await page.click('.select-item')
Expand Down
12 changes: 6 additions & 6 deletions tests/playwright/specs/keys/01-Keys.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ test.describe('keys', () => {

await selectInput.fill('')
await selectInput.type('test')
await expect(selectRoot.locator('.k-popover.select-popover')).toBeVisible()
await expect(selectRoot.locator('.k-popover.select-popover')).toContainText(mockKeySetName)
await expect(selectRoot.locator('.popover.select-popover')).toBeVisible()
await expect(selectRoot.locator('.popover.select-popover')).toContainText(mockKeySetName)
})

test('keyset in form should be able to auto complete by inputting partial id', async ({ page }) => {
Expand All @@ -172,8 +172,8 @@ test.describe('keys', () => {

await selectInput.fill('')
await selectInput.type(testKeySet?.id ?? 'NULL_JUST_PLACEHOLDER')
await expect(selectRoot.locator('.k-popover.select-popover')).toBeVisible()
await expect(selectRoot.locator('.k-popover.select-popover')).toContainText(mockKeySetName)
await expect(selectRoot.locator('.popover.select-popover')).toBeVisible()
await expect(selectRoot.locator('.popover.select-popover')).toContainText(mockKeySetName)
})

test('keyset in form should not able to auto complete by inputting random characters', async ({ page }) => {
Expand All @@ -184,8 +184,8 @@ test.describe('keys', () => {

await selectInput.fill('')
await selectInput.type('foooooobarrrrrr')
await expect(selectRoot.locator('.k-popover.select-popover')).toBeVisible()
await expect(selectRoot.locator('.k-popover.select-popover')).not.toContainText(mockKeySetName)
await expect(selectRoot.locator('.popover.select-popover')).toBeVisible()
await expect(selectRoot.locator('.popover.select-popover')).not.toContainText(mockKeySetName)
})

test('edit should be cancelable', async ({ page }) => {
Expand Down
80 changes: 40 additions & 40 deletions tests/playwright/specs/plugins/01-Plugins.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ test.describe('plugins', () => {
async () => await page.getByTestId('basic-auth-card').click()
)

await expect(page.locator('.autosuggest #service-id')).toBeVisible()
await expect(page.locator('.autosuggest #service-id')).toHaveValue(new RegExp(`${mockServiceName}\\s*-\\s*${uuid}`))
await expect(page.locator('.autosuggest input#service-id')).toBeVisible()
await expect(page.locator('.autosuggest input#service-id')).toHaveValue(new RegExp(`${mockServiceName}\\s*-\\s*${uuid}`))

await expandAdvancedFields(page)
await page.locator('#config-anonymous').type('anon')
Expand Down Expand Up @@ -196,8 +196,8 @@ test.describe('plugins', () => {
async () => await page.getByTestId('basic-auth-card').click()
)

await expect(page.locator('.autosuggest #route-id')).toBeVisible()
await expect(page.locator('.autosuggest #route-id')).toHaveValue(new RegExp(`${mockRouteName}\\s*-\\s*${uuid}`))
await expect(page.locator('.autosuggest input#route-id')).toBeVisible()
await expect(page.locator('.autosuggest input#route-id')).toHaveValue(new RegExp(`${mockRouteName}\\s*-\\s*${uuid}`))

await withNavigation(
page,
Expand Down Expand Up @@ -226,8 +226,8 @@ test.describe('plugins', () => {
page,
async () => await page.getByTestId('datadog-card').click()
)
await expect(page.locator('.autosuggest #consumer-id')).toBeVisible()
await expect(page.locator('.autosuggest #consumer-id')).toHaveValue(new RegExp(`${mockConsumerName}\\s*-\\s*${uuid}`))
await expect(page.locator('.autosuggest input#consumer-id')).toBeVisible()
await expect(page.locator('.autosuggest input#consumer-id')).toHaveValue(new RegExp(`${mockConsumerName}\\s*-\\s*${uuid}`))
await withNavigation(
page,
async () => await page.locator('[data-testid="form-actions"] .primary').click()
Expand Down Expand Up @@ -258,10 +258,10 @@ test.describe('plugins', () => {
await pluginListPage.goto()
await withNavigation(page, async () => await clickEntityListAction(page, 'edit'))

await expect(page.locator('.autosuggest #consumer-id')).toBeVisible()
await page.locator('.autosuggest #consumer-id').click()
await page.locator('.autosuggest #consumer-id').fill('')
await page.locator('.autosuggest #consumer-id').type('another')
await expect(page.locator('.autosuggest input#consumer-id')).toBeVisible()
await page.locator('.autosuggest input#consumer-id').click()
await page.locator('.autosuggest input#consumer-id').fill('')
await page.locator('.autosuggest input#consumer-id').type('another')
await page.locator(`[data-testid="select-item-${res2?.data.id}"]`).click()

await withNavigation(page, async () =>
Expand Down Expand Up @@ -452,38 +452,38 @@ test.describe('plugins', () => {
await page.locator('[data-testid="IP Restriction"]').click()

await page.waitForSelector('.kong-ui-entities-plugin-form-container')
await expect(page.locator('#service-id')).not.toBeVisible()
await expect(page.locator('#route-id')).not.toBeVisible()
await expect(page.locator('#consumer-id')).not.toBeVisible()
await expect(page.locator('input#service-id')).not.toBeVisible()
await expect(page.locator('input#route-id')).not.toBeVisible()
await expect(page.locator('input#consumer-id')).not.toBeVisible()

await page.click('.selection-group .Scoped-check')

await page.click('#service-id')
await page.fill('#service-id', 'test_service')
await page.click('input#service-id')
await page.fill('input#service-id', 'test_service')
await page.waitForTimeout(300)
selectItem = page.locator('[data-testid="select-wrapper"]').nth(0).locator('.select-item')
selectItem = page.locator('.autosuggest .select-popover').nth(0).locator('.select-item')
await expect(selectItem).toContainText(`${service?.data.name}`)
await expect(selectItem).toContainText(`${service?.data.id}`)
await selectItem.click()
await expect(page.locator('#service-id')).toHaveValue(`${service?.data.name} - ${service?.data.id}`)
await expect(page.locator('input#service-id')).toHaveValue(`${service?.data.name} - ${service?.data.id}`)

await page.click('#route-id')
await page.fill('#route-id', 'test_route')
await page.click('input#route-id')
await page.fill('input#route-id', 'test_route')
await page.waitForTimeout(300)
selectItem = page.locator('[data-testid="select-wrapper"]').nth(1).locator('.select-item')
selectItem = page.locator('.autosuggest .select-popover').nth(1).locator('.select-item')
await expect(selectItem).toContainText(`${route?.data.name}`)
await expect(selectItem).toContainText(`${route?.data.id}`)
await selectItem.click()
await expect(page.locator('#route-id')).toHaveValue(`${route?.data.name} - ${route?.data.id}`)
await expect(page.locator('input#route-id')).toHaveValue(`${route?.data.name} - ${route?.data.id}`)

await page.click('#consumer-id')
await page.fill('#consumer-id', 'test_consumer')
await page.click('input#consumer-id')
await page.fill('input#consumer-id', 'test_consumer')
await page.waitForTimeout(300)
selectItem = page.locator('[data-testid="select-wrapper"]').nth(2).locator('.select-item')
selectItem = page.locator('.autosuggest .select-popover').nth(2).locator('.select-item')
await expect(selectItem).toContainText(`${consumer?.data.username}`)
await expect(selectItem).toContainText(`${consumer?.data.id}`)
await selectItem.click()
await expect(page.locator('#consumer-id')).toHaveValue(`${consumer?.data.username} - ${consumer?.data.id}`)
await expect(page.locator('input#consumer-id')).toHaveValue(`${consumer?.data.username} - ${consumer?.data.id}`)

await withNavigation(page, async () =>
await fillEntityForm({
Expand All @@ -496,13 +496,13 @@ test.describe('plugins', () => {
await clickEntityListAction(page, 'edit')
await page.waitForSelector('.kong-ui-entities-plugin-form-container')

await expect(page.locator('#service-id')).toBeVisible()
await expect(page.locator('#route-id')).toBeVisible()
await expect(page.locator('#consumer-id')).toBeVisible()
await expect(page.locator('input#service-id')).toBeVisible()
await expect(page.locator('input#route-id')).toBeVisible()
await expect(page.locator('input#consumer-id')).toBeVisible()

await expect(page.locator('#service-id')).toHaveValue(`${service?.data.name} - ${service?.data.id}`)
await expect(page.locator('#route-id')).toHaveValue(`${route?.data.name} - ${route?.data.id}`)
await expect(page.locator('#consumer-id')).toHaveValue(`${consumer?.data.username} - ${consumer?.data.id}`)
await expect(page.locator('input#service-id')).toHaveValue(`${service?.data.name} - ${service?.data.id}`)
await expect(page.locator('input#route-id')).toHaveValue(`${route?.data.name} - ${route?.data.id}`)
await expect(page.locator('input#consumer-id')).toHaveValue(`${consumer?.data.username} - ${consumer?.data.id}`)
})

test('the "Applied To" column should be able to click and navigate to the entity', async ({ page, pluginListPage }) => {
Expand All @@ -528,20 +528,20 @@ test.describe('plugins', () => {
await withNavigation(page, async () => await page.locator('.kong-ui-entities-plugins-list [data-testid="new-plugin"]').click())
await page.getByTestId('basic-auth-card').click()
await page.waitForSelector('.kong-ui-entities-plugin-form-container')
await expect(page.locator('#service-id')).not.toBeVisible()
await expect(page.locator('input#service-id')).not.toBeVisible()

// click scoped & select a service
await page.click('.selection-group .Scoped-check')
await page.click('#service-id')
await page.fill('#service-id', 'test_service')
await page.click('input#service-id')
await page.fill('input#service-id', 'test_service')
await page.waitForTimeout(300)
await expect(page.locator('.select-item')).toContainText('test_service')
await page.click('.select-item')
await expect(page.locator('#service-id')).toHaveValue(`test_service - ${service?.id}`)
await expect(page.locator('input#service-id')).toHaveValue(`test_service - ${service?.id}`)

// switch back to global
await page.click('.selection-group .Global-check')
await expect(page.locator('#service-id')).not.toBeVisible()
await expect(page.locator('input#service-id')).not.toBeVisible()

// submit form
await withNavigation(page, async () =>
Expand All @@ -555,9 +555,9 @@ test.describe('plugins', () => {
await expect(page.locator('.kong-ui-entities-plugins-list [data-testid="appliedTo"] .k-badge')).toContainText('Global')
await clickEntityListAction(page, 'edit')
await page.waitForSelector('.kong-ui-entities-plugin-form-container')
await expect(page.locator('#service-id')).not.toBeVisible()
await expect(page.locator('input#service-id')).not.toBeVisible()
await page.click('.selection-group .Scoped-check')
await expect(page.locator('#service-id')).toHaveValue('')
await expect(page.locator('input#service-id')).toHaveValue('')
})

test('can delete service id from a plugin', async ({ page, pluginListPage }) => {
Expand All @@ -576,8 +576,8 @@ test.describe('plugins', () => {
await page.getByTestId('basic-auth-card').click()
await page.waitForSelector('.kong-ui-entities-plugin-form-container')
await page.click('.selection-group .Scoped-check')
await page.click('#service-id')
await page.fill('#service-id', 'test_service')
await page.click('input#service-id')
await page.fill('input#service-id', 'test_service')
await page.waitForTimeout(300)
await expect(page.locator('.select-item')).toContainText('test_service')
await page.click('.select-item')
Expand Down
8 changes: 4 additions & 4 deletions tests/playwright/specs/routes/02-RoutesPlugins.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ test.describe('routes plugins', () => {
async () => await page.getByTestId('basic-auth-card').click()
)

await expect(page.locator('.autosuggest #route-id')).toBeVisible()
await expect(page.locator('.autosuggest #route-id')).toHaveValue(new RegExp(`${mockRouteName}\\s*-\\s*${uuid}`))
await expect(page.locator('.autosuggest input#route-id')).toBeVisible()
await expect(page.locator('.autosuggest input#route-id')).toHaveValue(new RegExp(`${mockRouteName}\\s*-\\s*${uuid}`))

await withNavigation(
page,
Expand Down Expand Up @@ -137,8 +137,8 @@ test.describe('routes plugins', () => {
await withNavigation(page, () => clickEntityListAction(page, 'edit'))
await page.waitForSelector('.kong-ui-entities-plugin-form-container')
await page.click('.selection-group .Scoped-check')
await page.click('#route-id')
await page.fill('#route-id', mockRouteName)
await page.click('input#route-id')
await page.fill('input#route-id', mockRouteName)
await page.waitForTimeout(300)
await expect(page.locator('.select-item')).toContainText(mockRouteName)
await page.click('.select-item')
Expand Down
6 changes: 3 additions & 3 deletions tests/playwright/specs/services/03-ServicePlugins.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ test.describe('service plugins', () => {
page.click('.kong-ui-entities-plugins-list [data-testid="new-plugin"]')
)
await page.getByTestId('hmac-auth-card').click()
await expect(page.locator('.autosuggest #service-id')).toHaveValue(new RegExp(`${testService?.name}\\s*-\\s*${testService?.id}`))
await expect(page.locator('.autosuggest input#service-id')).toHaveValue(new RegExp(`${testService?.name}\\s*-\\s*${testService?.id}`))
})

test('create an service-associated plugin via tab', async ({ page, serviceListPage }) => {
Expand Down Expand Up @@ -126,8 +126,8 @@ test.describe('service plugins', () => {
await withNavigation(page, () => clickEntityListAction(page, 'edit'))
await page.waitForSelector('.kong-ui-entities-plugin-form-container')
await page.click('.selection-group .Scoped-check')
await page.click('#service-id')
await page.fill('#service-id', 'test_service')
await page.click('input#service-id')
await page.fill('input#service-id', 'test_service')
await page.waitForTimeout(300)
await expect(page.locator('.select-item')).toContainText('test_service')
await page.click('.select-item')
Expand Down
Loading
Loading