Skip to content

Commit

Permalink
fix(entitybasetable): ktable props and events [KHCP-11890] (#1412)
Browse files Browse the repository at this point in the history 
* fix(entitybasetable): ktable props and events [KHCP-11890]

* chore(deps): bump @kong/kongponents

* fix(entitybasetable): fix initial params object [KHCP-11890]

* chore(deps): bump @kong/kongponents
  • Loading branch information
@portikM
portikM authored May 22, 2024
1 parent bf679bb commit de27221
Show file tree
Hide file tree
Showing 30 changed files with 119 additions and 116 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
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.10",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"@rushstack/eslint-patch": "^1.7.2",
"@types/flat": "^5.0.5",
"@types/js-yaml": "^4.0.9",
Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/analytics-chart/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"vue": ">= 3.3.13 < 4"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong-ui-public/sandbox-layout": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"@types/uuid": "^9.0.8",
"file-saver": "^2.0.5",
"lodash.mapkeys": "^4.6.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/analytics-metric-provider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@
"@kong-ui-public/analytics-config-store": "workspace:^",
"@kong-ui-public/analytics-utilities": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156"
"@kong/kongponents": "^9.0.0-alpha.158"
},
"devDependencies": {
"@kong-ui-public/analytics-config-store": "workspace:^",
"@kong-ui-public/analytics-utilities": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"pinia": ">= 2.1.7 < 3"
}
}
4 changes: 2 additions & 2 deletions packages/analytics/dashboard-renderer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@kong-ui-public/i18n": "workspace:^",
"@kong-ui-public/sandbox-layout": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"json-schema-to-ts": "^3.0.1",
"pinia": ">= 2.1.7 < 3",
"swrv": "^1.0.4",
Expand Down Expand Up @@ -75,7 +75,7 @@
"@kong-ui-public/analytics-metric-provider": "workspace:^",
"@kong-ui-public/analytics-utilities": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"swrv": "^1.0.4",
"vue": ">= 3.3.13 < 4"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/metric-cards/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"test:unit:open": "cross-env FORCE_COLOR=1 vitest --ui"
},
"peerDependencies": {
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"vue": ">= 3.3.13 < 4"
},
"devDependencies": {
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"vue": "^3.4.26"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/app-layout/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"test:unit:open": "cross-env FORCE_COLOR=1 vitest --ui"
},
"peerDependencies": {
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
Expand All @@ -51,7 +51,7 @@
},
"devDependencies": {
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"@types/lodash.clonedeep": "^4.5.9",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/core/documentation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"vue": "^3.4.26"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/core/expressions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"devDependencies": {
"@kong/atc-router": "1.6.0-rc.1",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"monaco-editor": "0.21.3",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-top-level-await": "^1.4.1",
Expand All @@ -65,7 +65,7 @@
},
"peerDependencies": {
"@kong/atc-router": "^1.6.0-rc.1",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"monaco-editor": "0.21.3",
"vue": "^3.4.26"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/core/forms/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"vue": "^3.4.26"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"@types/lodash-es": "^4.17.12",
"pug": "^3.0.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/core/misc-widgets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"vue": ">= 3.3.13 < 4"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"vue": "^3.4.26"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/sandbox-layout/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"devDependencies": {
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
},
Expand All @@ -62,7 +62,7 @@
"errorLimit": "200KB"
},
"peerDependencies": {
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"vue": ">= 3.3.13 < 4"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-certificates/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-consumer-credentials/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-consumer-groups/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-consumers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/entities/entities-data-plane-nodes/package.json
View file
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.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-gateway-services/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-key-sets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-keys/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-plugins/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-routes/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"@types/lodash.isequal": "^4.5.8",
"axios": "^1.6.8",
"vite-plugin-monaco-editor": "^1.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-shared/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "^9.0.0-alpha.156",
"@kong/kongponents": "^9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.12",
"@kong/kongponents": "9.0.0-alpha.156",
"@kong/kongponents": "9.0.0-alpha.158",
"axios": "^1.6.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
Expand Down
1 change: 1 addition & 0 deletions packages/entities/entities-shared/sandbox/pages/EntityBaseTablePage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:fetcher="fetcher"
:fetcher-cache-key="fetchCacheKey"
:is-loading="isLoading"
preferences-storage-key="entity-base-table-preferences"
:query="query"
:table-headers="headers"
title="Title"
Expand Down
3 changes: 0 additions & 3 deletions packages/entities/entities-shared/src/components/entity-base-table/EntityBaseTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
:sortable="!disableSorting"
:table-preferences="tablePreferences"
@empty-state-action-click="handleEmptyStateCtaClicked"
@ktable-empty-state-cta-clicked="handleEmptyStateCtaClicked"
@row:click="handleRowClick"
@sort="(params: any) => handleSortChanged(params)"
@update:table-preferences="handleUpdateTablePreferences"
Expand Down Expand Up @@ -363,9 +362,7 @@ const tablePreferences = ref<TablePreferences>(getTablePreferences(cacheId.value
const combinedInitialFetcherParams = computed((): Partial<FetcherParams> => {
// Pass the preferencesStorageKey regardless; if no entry is found, it will return the default
const userTablePreferences = getTablePreferences(cacheId.value)
// Return the props.initialFetcherParams, appending any stored user preferences
return {
...props.initialFetcherParams,
...userTablePreferences,
Expand Down
Loading

0 comments on commit de27221

Please sign in to comment.