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

fix(*): kongponents alpha phase 9 [KHCP-10951] #1209

Merged
merged 33 commits into from
Mar 12, 2024
Merged

fix(*): kongponents alpha phase 9 [KHCP-10951] #1209

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c98d569
chore(deps): bump kongponents to preview [KHCP-10951]
portikM Mar 5, 2024
3820c54
fix(kalert): update component usage
portikM Mar 5, 2024
70c7f7c
fix(kemptystate): update component usage
portikM Mar 5, 2024
bc5f233
test(*): update selectors
portikM Mar 5, 2024
ac849f0
chore(deps): bump kongponents
portikM Mar 5, 2024
80e6d47
fix(entitybasetable): update empty state props
portikM Mar 5, 2024
77a2095
test(*): fix component tests
portikM Mar 5, 2024
96fa0a3
Merge branch 'main' into fix/public-ui-kongponents-phase-9
portikM Mar 5, 2024
d127b94
chore(deps): bump kongponents
portikM Mar 5, 2024
986a3c9
fix: resolve conflicts
portikM Mar 6, 2024
023ba53
chore(deps): bump kongponents
portikM Mar 6, 2024
d0de1f8
fix(entitybasetable): empty state updates
portikM Mar 6, 2024
3cd19d5
fix(entitybasetable): fix selector
portikM Mar 6, 2024
e0af121
test(entitybasetable): fix component test
portikM Mar 6, 2024
0171587
fix(entitybasetable): minor fix
portikM Mar 6, 2024
d1655a7
Merge branch 'main' into fix/public-ui-kongponents-phase-9
portikM Mar 6, 2024
c3a7792
fix(entitybasetable): minor fix
portikM Mar 6, 2024
23d1733
chore(deps): bump kongponents
portikM Mar 6, 2024
1b1c3fe
fix(kemptystate): kong icon variant
portikM Mar 6, 2024
e4d529a
fix: minor fix
portikM Mar 6, 2024
e0d20b2
Merge branch 'main' into fix/public-ui-kongponents-phase-9
portikM Mar 6, 2024
d31ab32
fix: type errors
portikM Mar 6, 2024
e24c7e8
chore(deps): bump kongponents
portikM Mar 7, 2024
6210549
fix: resolve conflicts
portikM Mar 7, 2024
dc659cd
fix(entitybasetable): update ktable usage
portikM Mar 7, 2024
a5bbe92
fix(entitybasetable): minor fix
portikM Mar 7, 2024
1ada31d
chore(deps): bump kongponents
portikM Mar 7, 2024
fb53327
fix: resolve conflicts
portikM Mar 12, 2024
67db8ea
fix: resolve conflicts
portikM Mar 12, 2024
61c038e
fix: resolve conflicts
portikM Mar 12, 2024
8446e3e
chore(deps): bump kongponents
portikM Mar 12, 2024
35538b2
chore(analytics): add missing deps
portikM Mar 12, 2024
9873c76
chore(deps): bump kongponents
portikM Mar 12, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@digitalroute/cz-conventional-changelog-for-jira": "^8.0.1",
"@evilmartians/lefthook": "^1.6.1",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"@rushstack/eslint-patch": "^1.7.2",
"@types/flat": "^5.0.5",
"@types/js-yaml": "^4.0.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/analytics-chart/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@kong-ui-public/i18n": "workspace:^",
"@kong-ui-public/sandbox-layout": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"@types/uuid": "^9.0.8",
"file-saver": "^2.0.5",
"lodash.mapkeys": "^4.6.0",
Expand Down
6 changes: 2 additions & 4 deletions packages/analytics/analytics-chart/src/components/AnalyticsChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,14 @@
</div>
<KEmptyState
v-if="!hasValidChartData"
:action-button-visible="false"
class="chart-empty-state"
:cta-is-hidden="true"
data-testid="no-data-in-report"
icon="stateNoData"
icon-size="170"
>
<template #title>
{{ emptyStateTitle }}
</template>
<template #message>
<template #default>
{{ emptyStateDescription }}
</template>
</KEmptyState>
Expand Down
6 changes: 2 additions & 4 deletions packages/analytics/analytics-chart/src/components/CsvExportModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@
>
<template #empty-state>
<KEmptyState
cta-is-hidden
icon="stateNoData"
icon-size="96"
:action-button-visible="false"
>
<template #title>
<h5>{{ i18n.t('csvExport.noDataRange') }}</h5>
</template>
<template #message>
<template #default>
<p>{{ i18n.t('csvExport.noDataRetry') }}</p>
</template>
</KEmptyState>
Expand Down
4 changes: 1 addition & 3 deletions packages/analytics/analytics-chart/src/components/SimpleChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
<div class="simple-chart-shell">
<KEmptyState
v-if="!hasValidChartData"
:action-button-visible="true"
class="chart-empty-state"
:cta-is-hidden="true"
data-testid="no-data-in-report"
icon="stateNoData"
icon-size="80"
>
<template #title>
{{ emptyStateTitle }}
Expand Down
10 changes: 4 additions & 6 deletions packages/analytics/analytics-chart/src/components/TopNTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@

<KEmptyState
v-if="errorMessage"
cta-is-hidden
:action-button-visible="false"
data-testid="top-n-error-state"
is-error
icon-variant="error"
>
<template #title>
{{ i18n.t('topNTable.defaultErrorStateTitle') }}
</template>
<template #message>
<template #default>
{{ errorMessage }}
</template>
</KEmptyState>
Expand All @@ -47,10 +47,8 @@

<KEmptyState
v-else-if="!hasData"
cta-is-hidden
:action-button-visible="false"
data-testid="top-n-empty-state"
icon="stateNoData"
icon-size="80"
>
<template #title>
{{ emptyStateTitle || i18n.t('topNTable.defaultEmptyStateTitle') }}
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/analytics-metric-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
"devDependencies": {
"@kong-ui-public/analytics-utilities": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.107"
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0"
}
}
2 changes: 1 addition & 1 deletion packages/analytics/dashboard-renderer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@kong-ui-public/i18n": "workspace:^",
"@kong-ui-public/sandbox-layout": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"json-schema-to-ts": "^3.0.0",
"swrv": "^1.0.4",
"vue": "^3.4.19"
Expand Down
6 changes: 3 additions & 3 deletions packages/analytics/dashboard-renderer/src/components/QueryDataProvider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
/>
<KEmptyState
v-else-if="hasError"
cta-is-hidden
:action-button-visible="false"
data-testid="chart-empty-state"
is-error
icon-variant="error"
>
<template #message>
<template #default>
{{ errorMessage }}
</template>
</KEmptyState>
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/metric-cards/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"vue": "^3.4.19"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/app-layout/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"devDependencies": {
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"@types/lodash.clonedeep": "^4.5.9",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
7 changes: 3 additions & 4 deletions packages/core/app-layout/sandbox/pages/LayoutPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
>
<template #notification>
<KAlert
alert-message="I'm an alert from the host app"
v-if="showAlert"
appearance="warning"
dismiss-type="icon"
:is-showing="showAlert"
@closed="handleCloseAlert"
message="I'm an alert from the host app"
@dismiss="handleCloseAlert"
/>
</template>
<template #navbar-mobile-logo>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/app-layout/src/components/AppLayout.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ describe('<AppLayout />', () => {
cy.mount(AppLayout, {
slots: {
notification: [
'<KAlert data-testid="app-layout-notification-slot-content" appearance="danger" alert-message="Notification"></KAlert>',
'<KAlert data-testid="app-layout-notification-slot-content" appearance="danger" message="Notification"></KAlert>',
],
},
})
Expand Down
2 changes: 1 addition & 1 deletion packages/core/copy-uuid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"vue": "^3.4.19"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/documentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": ">= 3.3.13 < 4"
},
Expand Down
22 changes: 8 additions & 14 deletions packages/core/documentation/src/components/DocumentationPageEmptyState.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,23 @@
<KEmptyState
class="documentation-page-empty-state"
data-testid="documentation-page-empty-state"
icon="stateGruceo"
icon-size="96"
>
<template #icon>
<KongIcon />
portikM marked this conversation as resolved.
Show resolved Hide resolved
</template>
<template #title>
{{ i18n.t('documentation.show.empty_state.title') }}
</template>
<template #message>
<template #default>
{{ i18n.t('documentation.show.empty_state.message') }}
</template>
<template #cta>
<PermissionsWrapper
:auth-function="() => canEdit()"
>
<template #action>
<PermissionsWrapper :auth-function="() => canEdit()">
<KButton
appearance="primary"
data-testid="add-new-page-button"
@click="emit('create-documentation')"
>
<template #icon>
<AddIcon
size="22"
/>
</template>
<AddIcon />
{{ i18n.t('documentation.show.empty_state.ctaText') }}
</KButton>
</PermissionsWrapper>
Expand All @@ -35,7 +29,7 @@
<script setup lang="ts">
import composables from '../composables'
import { PermissionsWrapper } from '@kong-ui-public/entities-shared'
import { AddIcon } from '@kong/icons'
import { AddIcon, KongIcon } from '@kong/icons'
import type { PropType } from 'vue'

defineProps({
Expand Down
2 changes: 1 addition & 1 deletion packages/core/documentation/src/components/ProductDocumentModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<template #default>
<KAlert
v-if="errorMessage"
:alert-message="errorMessage"
appearance="danger"
class="bottom-spacing"
:message="errorMessage"
/>

<KFileUpload
Expand Down
2 changes: 1 addition & 1 deletion packages/core/forms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"@types/lodash": "^4.14.202",
"pug": "^3.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/misc-widgets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"vue": "^3.4.19"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/sandbox-layout/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"devDependencies": {
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-certificates/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-consumer-credentials/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@kong-ui-public/copy-uuid": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-consumer-groups/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-consumer-groups/src/components/AddToGroupModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
class="kong-ui-entity-add-to-groups-error"
>
<KAlert appearance="danger">
<template #alertMessage>
<template #default>
<p>{{ t('consumer_groups.errors.add') }}</p>
<ul v-if="errorArray.length">
<li
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-consumers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-consumers/src/components/AddConsumerModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
class="kong-ui-entity-add-consumers-error"
>
<KAlert appearance="danger">
<template #alertMessage>
<template #default>
<p>{{ t('consumers.errors.add') }}</p>
<ul v-if="errorArray.length">
<li
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-gateway-services/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-key-sets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"devDependencies": {
"@kong-ui-public/copy-uuid": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-keys/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@kong-ui-public/copy-uuid": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-plugins/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.10",
"@kong/kongponents": "9.0.0-alpha.107",
"@kong/kongponents": "9.0.0-pr.2043.9ae9fa59.0",
"axios": "^1.6.7",
"vue": "^3.4.19",
"vue-router": "^4.2.5"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-plugins/src/components/PluginConfigCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<KEmptyState
v-else-if="fetchSchemaError"
data-testid="plugin-config-card-schema-error"
is-error
icon-variant="error"
>
<template #message>
<template #default>
<h3>{{ fetchSchemaError }}</h3>
</template>
</KEmptyState>
Expand Down
6 changes: 3 additions & 3 deletions packages/entities/entities-plugins/src/components/PluginForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

<KEmptyState
v-else-if="fetchSchemaError"
cta-is-hidden
:action-button-visible="false"
data-testid="plugin-form-schema-error"
is-error
icon-variant="error"
>
<template #message>
<template #default>
<h3>
{{ t('errors.load_schema') }}
</h3>
Expand Down
Loading
Loading