Skip to content
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
8 changes: 4 additions & 4 deletions src/ui/src/builder/BuilderApplicationSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import {
PropType,
} from "vue";
import { useListResources } from "@/composables/useListResources";
import type { Option } from "./BuilderSelect.vue";
import type { Option } from "@/wds/WdsSelect.vue";
import BuilderAsyncLoader from "./BuilderAsyncLoader.vue";
import type { WriterApplication } from "@/writerTypes";
import WdsTextInput from "@/wds/WdsTextInput.vue";

const BuilderSelect = defineAsyncComponent({
loader: () => import("./BuilderSelect.vue"),
const WdsSelect = defineAsyncComponent({
loader: () => import("@/wds/WdsSelect.vue"),
loadingComponent: BuilderAsyncLoader,
});

Expand Down Expand Up @@ -86,7 +86,7 @@ defineExpose({ selectedData });

<template>
<div class="BuilderGraphSelect--text">
<BuilderSelect
<WdsSelect
v-if="graphs.length > 0 || isLoading"
v-model="currentValue"
:options="options"
Expand Down
10 changes: 5 additions & 5 deletions src/ui/src/builder/BuilderGraphSelect.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import BuilderGraphSelect from "./BuilderGraphSelect.vue";
import { flushPromises, shallowMount } from "@vue/test-utils";
import { buildMockCore } from "@/tests/mocks";
import injectionKeys from "@/injectionKeys";
import BuilderSelect from "./BuilderSelect.vue";
import WdsSelect from "@/wds/WdsSelect.vue";
import WdsTextInput from "@/wds/WdsTextInput.vue";

describe("BuilderGraphSelect", () => {
Expand All @@ -26,7 +26,7 @@ describe("BuilderGraphSelect", () => {
props: { modelValue: "1" },
global: {
stubs: {
BuilderSelect: true,
WdsSelect: true,
},
provide: {
[injectionKeys.core as symbol]: core,
Expand All @@ -35,7 +35,7 @@ describe("BuilderGraphSelect", () => {
});
await flushPromises();
expect(sendListResourcesRequest).toHaveBeenCalledOnce();
expect(wrapper.findComponent(BuilderSelect).exists()).toBe(true);
expect(wrapper.findComponent(WdsSelect).exists()).toBe(true);
});

it("should fallback to input", async () => {
Expand All @@ -47,7 +47,7 @@ describe("BuilderGraphSelect", () => {
props: { modelValue: "1" },
global: {
stubs: {
BuilderSelect: true,
WdsSelect: true,
},
provide: {
[injectionKeys.core as symbol]: core,
Expand All @@ -56,7 +56,7 @@ describe("BuilderGraphSelect", () => {
});
await flushPromises();
expect(sendListResourcesRequest).toHaveBeenCalledOnce();
expect(wrapper.findComponent(BuilderSelect).exists()).toBe(false);
expect(wrapper.findComponent(WdsSelect).exists()).toBe(false);
expect(wrapper.findComponent(WdsTextInput).exists()).toBe(true);
});
});
8 changes: 4 additions & 4 deletions src/ui/src/builder/BuilderGraphSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import {
PropType,
} from "vue";
import { useListResources } from "@/composables/useListResources";
import type { Option } from "./BuilderSelect.vue";
import type { Option } from "@/wds/WdsSelect.vue";
import BuilderAsyncLoader from "./BuilderAsyncLoader.vue";
import type { WriterGraph } from "@/writerTypes";
import WdsTextInput from "@/wds/WdsTextInput.vue";

const BuilderSelect = defineAsyncComponent({
loader: () => import("./BuilderSelect.vue"),
const WdsSelect = defineAsyncComponent({
loader: () => import("@/wds/WdsSelect.vue"),
loadingComponent: BuilderAsyncLoader,
});

Expand Down Expand Up @@ -73,7 +73,7 @@ defineExpose({ selectedData });

<template>
<div class="BuilderGraphSelect--text">
<BuilderSelect
<WdsSelect
v-if="graphs.length > 0 || isLoading"
v-model="currentValue"
:options="options"
Expand Down
6 changes: 3 additions & 3 deletions src/ui/src/builder/settings/BuilderFieldsAlign.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<div v-if="mode == 'pick' || mode == 'css'" class="main">
<div v-if="mode == 'pick'" class="pickerContainer">
<BuilderSelect
<WdsSelect
ref="pickerEl"
:model-value="subMode"
:options="selectOptions"
Expand Down Expand Up @@ -58,8 +58,8 @@ import {
} from "./constants/builderFieldsCssTabs";
import BuilderAsyncLoader from "../BuilderAsyncLoader.vue";

const BuilderSelect = defineAsyncComponent({
loader: () => import("../BuilderSelect.vue"),
const WdsSelect = defineAsyncComponent({
loader: () => import("@/wds/WdsSelect.vue"),
loadingComponent: BuilderAsyncLoader,
});

Expand Down
8 changes: 4 additions & 4 deletions src/ui/src/builder/settings/BuilderFieldsBlueprintKey.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { flushPromises, mount } from "@vue/test-utils";
import { buildMockCore, buildMockComponent, mockProvides } from "@/tests/mocks";
import injectionKeys from "@/injectionKeys";
import { generateBuilderManager } from "../builderManager";
import BuilderSelect from "../BuilderSelect.vue";
import WdsSelect from "@/wds/WdsSelect.vue";
import WdsButton from "@/wds/WdsButton.vue";
import type { generateCore } from "@/core";

Expand Down Expand Up @@ -57,7 +57,7 @@ describe("BuilderFieldsBlueprintKey", () => {

expect(wrapper.attributes("data-automation-key")).toBe(fieldKey);

const select = wrapper.getComponent(BuilderSelect);
const select = wrapper.getComponent(WdsSelect);

expect(select.props("modelValue")).toBe("");

Expand All @@ -74,7 +74,7 @@ describe("BuilderFieldsBlueprintKey", () => {
const wrapper = buildWrapper(componentWf2.id);
await flushPromises();

const select = wrapper.getComponent(BuilderSelect);
const select = wrapper.getComponent(WdsSelect);

select.vm.$emit("update:modelValue", componentWf1.content.key);

Expand Down Expand Up @@ -104,7 +104,7 @@ describe("BuilderFieldsBlueprintKey", () => {
const wrapper = buildWrapper(componentWf3.id);
await flushPromises();

const select = wrapper.getComponent(BuilderSelect);
const select = wrapper.getComponent(WdsSelect);

expect(select.props("modelValue")).toBe(unexstingBlueprintKey);

Expand Down
8 changes: 3 additions & 5 deletions src/ui/src/builder/settings/BuilderFieldsBlueprintKey.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class="BuilderFieldsBlueprintKey"
:data-automation-key="props.fieldKey"
>
<BuilderSelect v-model="selectedBlueprintKey" :options="options" />
<WdsSelect v-model="selectedBlueprintKey" :options="options" />
<WdsButton
v-if="selectedBlueprintComponentId"
variant="neutral"
Expand All @@ -21,11 +21,9 @@ import { toRefs, inject, computed, defineAsyncComponent } from "vue";
import { useComponentActions } from "../useComponentActions";
import injectionKeys from "@/injectionKeys";
import WdsButton from "@/wds/WdsButton.vue";
import { Option } from "../BuilderSelect.vue";
import { Option } from "@/wds/WdsSelect.vue";

const BuilderSelect = defineAsyncComponent(
() => import("../BuilderSelect.vue"),
);
const WdsSelect = defineAsyncComponent(() => import("@/wds/WdsSelect.vue"));

const wf = inject(injectionKeys.core);
const ssbm = inject(injectionKeys.builderManager);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class="BuilderFieldsComponentEventType"
:data-automation-key="props.fieldKey"
>
<BuilderSelect
<WdsSelect
v-if="options.length"
v-model="selected"
:options="options"
Expand All @@ -17,13 +17,11 @@
import { toRefs, inject, computed, defineAsyncComponent } from "vue";
import { useComponentActions } from "../useComponentActions";
import injectionKeys from "@/injectionKeys";
import type { Option } from "../BuilderSelect.vue";
import type { Option } from "@/wds/WdsSelect.vue";
import { FieldType } from "@/writerTypes";
import WdsTextInput from "@/wds/WdsTextInput.vue";

const BuilderSelect = defineAsyncComponent(
() => import("../BuilderSelect.vue"),
);
const WdsSelect = defineAsyncComponent(() => import("@/wds/WdsSelect.vue"));

const wf = inject(injectionKeys.core);
const ssbm = inject(injectionKeys.builderManager);
Expand Down
9 changes: 3 additions & 6 deletions src/ui/src/builder/settings/BuilderFieldsComponentId.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { flushPromises, mount } from "@vue/test-utils";
import { buildMockCore, buildMockComponent, mockProvides } from "@/tests/mocks";
import injectionKeys from "@/injectionKeys";
import { generateBuilderManager } from "../builderManager";
import BuilderSelect from "../BuilderSelect.vue";
import WdsSelect from "@/wds/WdsSelect.vue";
import WdsButton from "@/wds/WdsButton.vue";
import type { generateCore } from "@/core";

Expand Down Expand Up @@ -33,9 +33,6 @@ describe("BuilderFieldsComponentId", () => {
fieldKey,
},
global: {
stubs: {
BaseSelect: true,
},
provide: {
...mockProvides,
[injectionKeys.builderManager as symbol]: wfbm,
Expand All @@ -59,7 +56,7 @@ describe("BuilderFieldsComponentId", () => {

expect(wrapper.attributes("data-automation-key")).toBe(fieldKey);

const select = wrapper.getComponent(BuilderSelect);
const select = wrapper.getComponent(WdsSelect);

expect(select.props("modelValue")).toBe("");

Expand All @@ -80,7 +77,7 @@ describe("BuilderFieldsComponentId", () => {
const wrapper = buildWrapper(componentPage.id);
await flushPromises();

const select = wrapper.getComponent(BuilderSelect);
const select = wrapper.getComponent(WdsSelect);

select.vm.$emit("update:modelValue", componentButton.id);

Expand Down
8 changes: 3 additions & 5 deletions src/ui/src/builder/settings/BuilderFieldsComponentId.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="BuilderFieldsComponentId" :data-automation-key="props.fieldKey">
<BuilderSelect v-model="selected" :options="options" enable-search />
<WdsSelect v-model="selected" :options="options" enable-search />
<WdsButton
v-if="selected"
variant="neutral"
Expand All @@ -18,13 +18,11 @@
import { toRefs, inject, computed, defineAsyncComponent } from "vue";
import { useComponentActions } from "../useComponentActions";
import injectionKeys from "@/injectionKeys";
import type { Option } from "../BuilderSelect.vue";
import type { Option } from "@/wds/WdsSelect.vue";
import { useComponentDescription } from "../useComponentDescription";
import WdsButton from "@/wds/WdsButton.vue";

const BuilderSelect = defineAsyncComponent(
() => import("../BuilderSelect.vue"),
);
const WdsSelect = defineAsyncComponent(() => import("@/wds/WdsSelect.vue"));

const wf = inject(injectionKeys.core);
const ssbm = inject(injectionKeys.builderManager);
Expand Down
11 changes: 4 additions & 7 deletions src/ui/src/builder/settings/BuilderFieldsHandler.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { flushPromises, mount } from "@vue/test-utils";
import { buildMockCore, buildMockComponent, mockProvides } from "@/tests/mocks";
import injectionKeys from "@/injectionKeys";
import { generateBuilderManager } from "../builderManager";
import BuilderSelect from "../BuilderSelect.vue";
import WdsSelect from "@/wds/WdsSelect.vue";
import type { generateCore } from "@/core";

describe("BuilderFieldsHandler", () => {
Expand All @@ -25,9 +25,6 @@ describe("BuilderFieldsHandler", () => {
fieldKey,
},
global: {
stubs: {
BaseSelect: true,
},
provide: {
...mockProvides,
[injectionKeys.builderManager as symbol]: ssbm,
Expand Down Expand Up @@ -55,7 +52,7 @@ describe("BuilderFieldsHandler", () => {

expect(wrapper.attributes("data-automation-key")).toBe(fieldKey);

const select = wrapper.getComponent(BuilderSelect);
const select = wrapper.getComponent(WdsSelect);

expect(select.props("modelValue")).toBe("");

Expand All @@ -72,7 +69,7 @@ describe("BuilderFieldsHandler", () => {
const wrapper = buildWrapper(component1.id);
await flushPromises();

const select = wrapper.getComponent(BuilderSelect);
const select = wrapper.getComponent(WdsSelect);

select.vm.$emit("update:modelValue", "func1");

Expand All @@ -94,7 +91,7 @@ describe("BuilderFieldsHandler", () => {
const wrapper = buildWrapper(component2.id);
await flushPromises();

const select = wrapper.getComponent(BuilderSelect);
const select = wrapper.getComponent(WdsSelect);

expect(select.props("modelValue")).toBe(unexstingHandler);

Expand Down
8 changes: 3 additions & 5 deletions src/ui/src/builder/settings/BuilderFieldsHandler.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
<template>
<div class="BuilderFieldsHandler" :data-automation-key="props.fieldKey">
<BuilderSelect v-model="selectedHandler" :options="options" />
<WdsSelect v-model="selectedHandler" :options="options" />
</div>
</template>

<script setup lang="ts">
import { toRefs, inject, computed, defineAsyncComponent } from "vue";
import { useComponentActions } from "../useComponentActions";
import injectionKeys from "@/injectionKeys";
import { Option } from "../BuilderSelect.vue";
import { Option } from "@/wds/WdsSelect.vue";

const BuilderSelect = defineAsyncComponent(
() => import("../BuilderSelect.vue"),
);
const WdsSelect = defineAsyncComponent(() => import("@/wds/WdsSelect.vue"));

const wf = inject(injectionKeys.core);
const ssbm = inject(injectionKeys.builderManager);
Expand Down
6 changes: 3 additions & 3 deletions src/ui/src/builder/settings/BuilderFieldsPadding.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<div v-if="mode == 'pick' || mode == 'css'" class="main">
<div v-if="mode == 'pick'" class="pickerContainer">
<BuilderSelect
<WdsSelect
ref="pickerEl"
:model-value="subMode"
:options="selectOptions"
Expand Down Expand Up @@ -128,8 +128,8 @@ import {
} from "./constants/builderFieldsCssTabs";
import BuilderAsyncLoader from "../BuilderAsyncLoader.vue";

const BuilderSelect = defineAsyncComponent({
loader: () => import("../BuilderSelect.vue"),
const WdsSelect = defineAsyncComponent({
loader: () => import("@/wds/WdsSelect.vue"),
loadingComponent: BuilderAsyncLoader,
});

Expand Down
6 changes: 3 additions & 3 deletions src/ui/src/builder/settings/BuilderFieldsWidth.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<div v-if="mode == 'pick' || mode == 'css'" class="main">
<div v-if="mode == 'pick'" class="pickerContainer">
<BuilderSelect
<WdsSelect
ref="pickerEl"
:model-value="subMode"
:options="selectOptions"
Expand Down Expand Up @@ -67,8 +67,8 @@ import {
} from "./constants/builderFieldsCssTabs";
import BuilderAsyncLoader from "../BuilderAsyncLoader.vue";

const BuilderSelect = defineAsyncComponent({
loader: () => import("../BuilderSelect.vue"),
const WdsSelect = defineAsyncComponent({
loader: () => import("@/wds/WdsSelect.vue"),
loadingComponent: BuilderAsyncLoader,
});

Expand Down
Loading