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

Jump to bottom

fix(*): kongponents alpha phase 4 [KHCP-10182] #1069

Merged
merged 25 commits into from
Jan 17, 2024
Merged

fix(*): kongponents alpha phase 4 [KHCP-10182] #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
983231b
chore(deps): bump kongponents to preview [KHCP-10182]
portikM Jan 11, 2024
d6c2927
fix(kselect): fix component usage
portikM Jan 11, 2024
05c48e1
fix(kmultiselect): fix component usage
portikM Jan 11, 2024
d3559b4
fix(ktabs): fix component usage
portikM Jan 11, 2024
d8b749c
fix: typecheck
portikM Jan 11, 2024
dc409e9
fix: typecheck
portikM Jan 11, 2024
84ba777
test(*): fix selectors
portikM Jan 11, 2024
be83e7e
test(*): fix component tests
portikM Jan 11, 2024
0da6dde
test(*): fix component tests
portikM Jan 11, 2024
c38d2bc
fix(*): fix select custom item styling
portikM Jan 12, 2024
3fae542
fix(*): minor fix
portikM Jan 12, 2024
f346092
fix(*): minor styling fix
portikM Jan 12, 2024
ec448c7
test(pluginsform): fix component test
portikM Jan 12, 2024
04f274b
fix: resolve conflicts
portikM Jan 12, 2024
9d9ec51
Merge branch 'main' into fix/public-ui-kongponents-phase-4
portikM Jan 12, 2024
588c7d8
fix: typecheck
portikM Jan 12, 2024
9fcd6ba
fix: resolve conflicts
portikM Jan 15, 2024
c137336
fix(*): misc fixes
portikM Jan 16, 2024
547650c
chore: resolve conflicts
portikM Jan 16, 2024
253a256
chore(deps): bump kongponents preview
portikM Jan 16, 2024
0e7bcc0
fix(vfg): fix kselect and kmultiselect styles
portikM Jan 16, 2024
e67525b
chore(deps): bump kongponents alpha
portikM Jan 17, 2024
8b4792b
Merge branch 'main' into fix/public-ui-kongponents-phase-4
portikM Jan 17, 2024
ceedeee
fix: typecheck
portikM Jan 17, 2024
0e2a2ff
chore(deps): bump @kongponents
portikM Jan 17, 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.5.5",
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"@rushstack/eslint-patch": "^1.6.1",
"@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
Open in desktop
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.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": ">= 3.3.13 < 4"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong-ui-public/sandbox-layout": "workspace:^",
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"@types/uuid": "^9.0.7",
"file-saver": "^2.0.5",
"lodash.mapkeys": "^4.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/analytics-chart/src/components/chart-plugins/ChartTooltip.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ function handleMouseDown(e: MouseEvent) {
if (tooltipEl.value) {
dragging.value = true
// Get computed style and extract transform values
const style = window.getComputedStyle(tooltipEl.value)
const style = window.getComputedStyle(tooltipEl.value as HTMLElement)
// @ts-ignore mozTransform is not in the types
const transform = style.transform || style.webkitTransform || style.mozTransform

Expand Down
6 changes: 3 additions & 3 deletions packages/analytics/analytics-chart/src/components/chart-types/StackedBarChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,13 @@ onMounted(() => {
}

if (chartContainerRef.value) {
resizeObserver.observe(chartContainerRef.value)
resizeObserver.observe(chartContainerRef.value as HTMLDivElement)
}
})

onUnmounted(() => {
if (chartContainerRef.value) {
resizeObserver.unobserve(chartContainerRef.value)
resizeObserver.unobserve(chartContainerRef.value as HTMLDivElement)
}
})

Expand Down Expand Up @@ -414,7 +414,7 @@ const options = computed<ChartOptions>(() => {

const chartInstance = composables.useChartJSCommon(
'bar',
canvas,
canvas as Ref<HTMLCanvasElement | null>,
toRef(props, 'chartData') as Ref<BarChartData>,
plugins,
options,
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/analytics-chart/src/components/chart-types/TimeSeriesChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
:id="legendID"
:chart-instance="chartInstance"
data-testid="legend"
:items="legendItems"
:items="(legendItems as LegendItem[])"
/>
</div>
</template>
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 @@ -61,6 +61,6 @@
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.73"
"@kong/kongponents": "9.0.0-alpha.86"
}
}
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 @@ -43,7 +43,7 @@
"@kong-ui-public/i18n": "workspace:^",
"@kong-ui-public/sandbox-layout": "workspace:^",
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"json-schema-to-ts": "^3.0.0",
"vue": "^3.4.3"
},
Expand Down
1 change: 1 addition & 0 deletions packages/analytics/dashboard-renderer/src/components/BarChartRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
:chart-options="options"
legend-position="bottom"
:show-annotations="chartOptions.showAnnotations"
tooltip-title=""
portikM marked this conversation as resolved.
Show resolved Hide resolved
/>
</div>
</QueryDataProvider>
Expand Down
1 change: 1 addition & 0 deletions packages/analytics/dashboard-renderer/src/components/TimeseriesChartRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
:chart-data="data"
:chart-options="options"
legend-position="bottom"
tooltip-title=""
portikM marked this conversation as resolved.
Show resolved Hide resolved
/>
</div>
</QueryDataProvider>
Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/metric-cards/package.json
View file
Open in desktop
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.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": ">= 3.3.13 < 4"
},
"devDependencies": {
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": "^3.4.3"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/app-layout/package.json
View file
Open in desktop
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.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.2.5"
},
Expand All @@ -51,7 +51,7 @@
},
"devDependencies": {
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"@types/lodash.clonedeep": "^4.5.9",
"vue": "^3.4.3",
"vue-router": "^4.2.5"
Expand Down
3 changes: 1 addition & 2 deletions packages/core/app-layout/sandbox/pages/KongManagerLayoutExample.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@
<div class="sidebar-top-slot-content">
<div>
<KSelect
appearance="select"
:enable-filtering="true"
enable-filtering
:items="workspaceItems"
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/core/copy-uuid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
},
"peerDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": ">= 3.3.13 < 4"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": "^3.4.3"
},
"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.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"axios": "^1.6.3",
"vue": ">= 3.3.13 < 4"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/core/documentation/src/components/DocumentationContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
class="document-tree-list"
:items="documentList"
:max-depth="2"
@change="(data) => emit('parent-change', data)"
@child-change="(data) => emit('child-change', data)"
@selected="(data) => emit('document-selection', data)"
@change="(data: ChangeEvent) => emit('parent-change', data)"
@child-change="(data: ChildChangeEvent) => emit('child-change', data)"
@selected="(data: TreeListItem) => emit('document-selection', data)"
/>
<DocumentationDisplay
v-if="selectedDocument"
Expand Down
1 change: 0 additions & 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 @@ -85,7 +85,6 @@

<KSelect
v-model="formData.parent"
appearance="select"
class="document-parent-select"
data-testid="documentation-parent"
enable-filtering
Expand Down
4 changes: 2 additions & 2 deletions packages/core/forms/package.json
View file
Open in desktop
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.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": "^3.4.3"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"@types/lodash": "^4.14.202",
"pug": "^3.0.2"
},
Expand Down
1 change: 0 additions & 1 deletion packages/core/forms/src/forms/ACMEForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<hr>

<KSelect
appearance="select"
class="issuer-select"
:items="items"
label="Issuer"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/forms/src/generator/FormGenerator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ export default {
white-space: nowrap;
}

button,
button:not(.multiselect-item button):not(.select-item button),
input[type="submit"] {
background-color: #fff;
border: 1px solid #ccc;
Expand Down
3 changes: 1 addition & 2 deletions packages/core/forms/src/generator/fields/advanced/FieldAutoSuggest.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
:id="schema.model"
ref="suggestion"
v-model="idValue"
appearance="select"
autosuggest
clearable
enable-filtering
:filter-function="() => true"
:items="items"
:loading="loading"
:placeholder="schema.placeholder"
Expand Down
1 change: 0 additions & 1 deletion packages/core/forms/src/generator/fields/advanced/FieldMultiselect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<template>
<KMultiselect
collapsed-context
data-testid="field-multiselect"
:items="schema.values"
:label-attributes="{ info: schema.help }"
Expand Down
4 changes: 2 additions & 2 deletions packages/core/misc-widgets/package.json
View file
Open in desktop
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.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": ">= 3.3.13 < 4"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": "^3.4.3"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions 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.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": "^3.4.3",
"vue-router": "^4.2.5"
},
Expand All @@ -62,7 +62,7 @@
"errorLimit": "200KB"
},
"peerDependencies": {
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"vue": ">= 3.3.13 < 4"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-certificates/package.json
View file
Open in desktop
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.73",
"@kong/kongponents": "9.0.0-alpha.86",
"axios": "^1.6.3",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.2.5"
},
"devDependencies": {
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"axios": "^1.6.3",
"vue": "^3.4.3",
"vue-router": "^4.2.5"
Expand Down
8 changes: 4 additions & 4 deletions packages/entities/entities-certificates/src/components/CACertificateList.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ describe('<CACertificateList />', () => {
cy.get(`${l} ${p} [data-testid="page-size-dropdown"]`).click()
cy.get(
`${l} ${p} [data-testid="page-size-dropdown"] [value="15"]`,
).click()
).last().click()

cy.wait('@getCaCertificateMultiPage')

Expand Down Expand Up @@ -430,7 +430,7 @@ describe('<CACertificateList />', () => {
cy.get(`${l} ${p} [data-testid="page-size-dropdown"]`).click()
cy.get(
`${l} ${p} [data-testid="page-size-dropdown"] [value="50"]`,
).click()
).last().click()

cy.wait('@getCaCertificateMultiPage')

Expand Down Expand Up @@ -702,7 +702,7 @@ describe('<CACertificateList />', () => {
cy.get(`${l} ${p} [data-testid="page-size-dropdown"]`).click()
cy.get(
`${l} ${p} [data-testid="page-size-dropdown"] [value="15"]`,
).click()
).last().click()

cy.wait('@getCaCertificateMultiPage')

Expand Down Expand Up @@ -740,7 +740,7 @@ describe('<CACertificateList />', () => {
cy.get(`${l} ${p} [data-testid="page-size-dropdown"]`).click()
cy.get(
`${l} ${p} [data-testid="page-size-dropdown"] [value="50"]`,
).click()
).last().click()

cy.wait('@getCaCertificateMultiPage')

Expand Down
8 changes: 4 additions & 4 deletions packages/entities/entities-certificates/src/components/CertificateList.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ describe('<CertificateList />', () => {
cy.get(`${l} ${p} [data-testid="page-size-dropdown"]`).click()
cy.get(
`${l} ${p} [data-testid="page-size-dropdown"] [value="15"]`,
).click()
).last().click()

cy.wait('@getCertificateMultiPage')

Expand Down Expand Up @@ -470,7 +470,7 @@ describe('<CertificateList />', () => {
cy.get(`${l} ${p} [data-testid="page-size-dropdown"]`).click()
cy.get(
`${l} ${p} [data-testid="page-size-dropdown"] [value="50"]`,
).click()
).last().click()

cy.wait('@getCertificateMultiPage')

Expand Down Expand Up @@ -749,7 +749,7 @@ describe('<CertificateList />', () => {
cy.get(`${l} ${p} [data-testid="page-size-dropdown"]`).click()
cy.get(
`${l} ${p} [data-testid="page-size-dropdown"] [value="15"]`,
).click()
).last().click()

cy.wait('@getCertificateMultiPage')

Expand Down Expand Up @@ -787,7 +787,7 @@ describe('<CertificateList />', () => {
cy.get(`${l} ${p} [data-testid="page-size-dropdown"]`).click()
cy.get(
`${l} ${p} [data-testid="page-size-dropdown"] [value="50"]`,
).click()
).last().click()

cy.wait('@getCertificateMultiPage')

Expand Down
4 changes: 2 additions & 2 deletions packages/entities/entities-consumer-credentials/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"peerDependencies": {
"@kong-ui-public/copy-uuid": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"axios": "^1.6.3",
"vue": ">= 3.3.13 < 4",
"vue-router": "^4.2.5"
Expand All @@ -32,7 +32,7 @@
"@kong-ui-public/copy-uuid": "workspace:^",
"@kong-ui-public/i18n": "workspace:^",
"@kong/design-tokens": "1.12.4",
"@kong/kongponents": "9.0.0-alpha.73",
"@kong/kongponents": "9.0.0-alpha.86",
"axios": "^1.6.3",
"vue": "^3.4.3",
"vue-router": "^4.2.5"
Expand Down
Loading
Loading