Skip to content

Commit 7c764cb

Browse files
luejohluejoh
authored
BC-9182-remove v-prefixes and vCustom-prefixes (#3992)
* vCustomDialog --> CustomDialog * vRoomAvatar --> RoomAvatar * removing v + vCustom prefixes, except for CustomDialog, as it otherwise collides with "Dialog" and will be touched and refactored in a related PR * vue router mock at proper position in package.lock
1 parent 0f9bbc8 commit 7c764cb

File tree

70 files changed

+295
-398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+295
-398
lines changed

‎package-lock.json‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/administration/ProvisioningOptionsPage.unit.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import ProvisioningOptionsPage from "./ProvisioningOptionsPage.vue";
2-
import VCustomDialog from "@/components/organisms/vCustomDialog.vue";
2+
import CustomDialog from "@/components/organisms/CustomDialog.vue";
33
import { ConfigResponse } from "@/serverApi/v3";
44
import { THEME_KEY } from "@/utils/inject";
55
import { createTestEnvStore, provisioningOptionsDataFactory } from "@@/tests/test-utils";
@@ -296,7 +296,7 @@ describe("ProvisioningOptionsPage", () => {
296296

297297
await saveButton.trigger("click");
298298

299-
const dialog = wrapper.findComponent(VCustomDialog);
299+
const dialog = wrapper.findComponent(CustomDialog);
300300

301301
expect(dialog.props("isOpen")).toEqual(true);
302302
});

‎src/components/administration/ProvisioningOptionsPage.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</v-btn>
9090
</v-row>
9191

92-
<v-custom-dialog
92+
<CustomDialog
9393
:is-open="isWarningDialogOpen"
9494
:has-buttons="true"
9595
:buttons="['cancel', 'confirm']"
@@ -118,13 +118,13 @@
118118
}}
119119
</v-alert>
120120
</template>
121-
</v-custom-dialog>
121+
</CustomDialog>
122122
</DefaultWireframe>
123123
</template>
124124

125125
<script setup lang="ts">
126126
import { Breadcrumb } from "../templates/default-wireframe.types";
127-
import VCustomDialog from "@/components/organisms/vCustomDialog.vue";
127+
import CustomDialog from "@/components/organisms/CustomDialog.vue";
128128
import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
129129
import { injectStrict, THEME_KEY } from "@/utils/inject";
130130
import { buildPageTitle } from "@/utils/pageTitle";

‎src/components/administration/SchoolYearChangeSection.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
{{ t("components.administration.schoolYearChangeSection.step.three.button") }}
121121
</VBtn>
122122
</div>
123-
<VCustomDialog
123+
<CustomDialog
124124
v-model:is-open="isStartDialogOpen"
125125
has-buttons
126126
:buttons="['cancel', 'confirm']"
@@ -133,8 +133,8 @@
133133
<template #content>
134134
{{ t("components.administration.schoolYearChangeSection.dialog.start.content") }}
135135
</template>
136-
</VCustomDialog>
137-
<VCustomDialog
136+
</CustomDialog>
137+
<CustomDialog
138138
v-model:is-open="isFinishDialogOpen"
139139
has-buttons
140140
:buttons="['cancel', 'confirm']"
@@ -147,13 +147,13 @@
147147
<template #content>
148148
{{ t("components.administration.schoolYearChangeSection.dialog.finish.content") }}
149149
</template>
150-
</VCustomDialog>
150+
</CustomDialog>
151151
</div>
152152
</div>
153153
</template>
154154

155155
<script setup lang="ts">
156-
import VCustomDialog from "@/components/organisms/vCustomDialog.vue";
156+
import CustomDialog from "@/components/organisms/CustomDialog.vue";
157157
import { useAppStoreRefs } from "@data-app";
158158
import { useEnvConfig } from "@data-env";
159159
import { SchoolYearModeEnum, useSharedSchoolYearChange } from "@data-school";

src/components/atoms/vCustomChipTimeRemaining.unit.ts renamed to src/components/atoms/ChipTimeRemaining.unit.ts

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import VCustomChipTimeRemaining from "./VCustomChipTimeRemaining.vue";
1+
import ChipTimeRemaining from "./ChipTimeRemaining.vue";
22
import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
33
import { mount } from "@vue/test-utils";
44

5-
describe("@/components/atoms/vCustomChipTimeRemaining", () => {
5+
describe("@/components/atoms/ChipTimeRemaining", () => {
66
const setup = (dueDate: Date, shortenUnit = false) => {
7-
const wrapper = mount(VCustomChipTimeRemaining, {
7+
const wrapper = mount(ChipTimeRemaining, {
88
global: {
99
plugins: [createTestingVuetify(), createTestingI18n()],
1010
},
@@ -31,8 +31,8 @@ describe("@/components/atoms/vCustomChipTimeRemaining", () => {
3131
const { wrapper } = setup(dueDate);
3232

3333
const expectedResult = `${wrapper.vm.$t(
34-
"components.atoms.VCustomChipTimeRemaining.hintDueTime"
35-
)}${HOURS_UNTIL_DUE} ${wrapper.vm.$t("components.atoms.VCustomChipTimeRemaining.hintHours", HOURS_UNTIL_DUE)}`;
34+
"components.atoms.ChipTimeRemaining.hintDueTime"
35+
)}${HOURS_UNTIL_DUE} ${wrapper.vm.$t("components.atoms.ChipTimeRemaining.hintHours", HOURS_UNTIL_DUE)}`;
3636

3737
expect(wrapper.element.textContent).toContain(expectedResult);
3838
});
@@ -41,8 +41,8 @@ describe("@/components/atoms/vCustomChipTimeRemaining", () => {
4141
const { wrapper } = setup(dueDate, true);
4242

4343
const expectedResult = `${wrapper.vm.$t(
44-
"components.atoms.VCustomChipTimeRemaining.hintDueTime"
45-
)}${HOURS_UNTIL_DUE} ${wrapper.vm.$t("components.atoms.VCustomChipTimeRemaining.hintHoursShort")}`;
44+
"components.atoms.ChipTimeRemaining.hintDueTime"
45+
)}${HOURS_UNTIL_DUE} ${wrapper.vm.$t("components.atoms.ChipTimeRemaining.hintHoursShort")}`;
4646
expect(wrapper.element.textContent).toContain(expectedResult);
4747
});
4848
});
@@ -60,11 +60,8 @@ describe("@/components/atoms/vCustomChipTimeRemaining", () => {
6060
const { wrapper } = setup(dueDate);
6161

6262
const expectedResult = `${wrapper.vm.$t(
63-
"components.atoms.VCustomChipTimeRemaining.hintDueTime"
64-
)}${MINUTES_UNTIL_DUE} ${wrapper.vm.$t(
65-
"components.atoms.VCustomChipTimeRemaining.hintMinutes",
66-
MINUTES_UNTIL_DUE
67-
)}`;
63+
"components.atoms.ChipTimeRemaining.hintDueTime"
64+
)}${MINUTES_UNTIL_DUE} ${wrapper.vm.$t("components.atoms.ChipTimeRemaining.hintMinutes", MINUTES_UNTIL_DUE)}`;
6865

6966
expect(wrapper.element.textContent).toContain(expectedResult);
7067
});
@@ -73,16 +70,16 @@ describe("@/components/atoms/vCustomChipTimeRemaining", () => {
7370
const { wrapper } = setup(dueDate, true);
7471

7572
const expectedResult = `${wrapper.vm.$t(
76-
"components.atoms.VCustomChipTimeRemaining.hintDueTime"
77-
)}${MINUTES_UNTIL_DUE} ${wrapper.vm.$t("components.atoms.VCustomChipTimeRemaining.hintMinShort")}`;
73+
"components.atoms.ChipTimeRemaining.hintDueTime"
74+
)}${MINUTES_UNTIL_DUE} ${wrapper.vm.$t("components.atoms.ChipTimeRemaining.hintMinShort")}`;
7875

7976
expect(wrapper.element.textContent).toContain(expectedResult);
8077
});
8178
});
8279

8380
it("accepts valid type props", () => {
8481
const validTypes = ["warning"];
85-
const { validator } = VCustomChipTimeRemaining.props.type;
82+
const { validator } = ChipTimeRemaining.props.type;
8683

8784
validTypes.forEach((type) => {
8885
expect(validator(type)).toBe(true);
@@ -93,7 +90,7 @@ describe("@/components/atoms/vCustomChipTimeRemaining", () => {
9390

9491
it("accepts valid dueDate props", () => {
9592
const validDueDates = ["2021-06-11T14:00:00.000Z", "2021-06-07T09:30:00.000Z"];
96-
const { validator } = VCustomChipTimeRemaining.props.dueDate;
93+
const { validator } = ChipTimeRemaining.props.dueDate;
9794

9895
validDueDates.forEach((dueDate) => {
9996
expect(validator(dueDate)).toBe(true);

src/components/atoms/VCustomChipTimeRemaining.vue renamed to src/components/atoms/ChipTimeRemaining.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ const hintDueDate = (dueDate: string, shorten = false) => {
4141
const diffMins = fromNowToFuture(dueDate, "minutes");
4242
4343
const label = shorten
44-
? t("components.atoms.VCustomChipTimeRemaining.hintMinShort")
45-
: t("components.atoms.VCustomChipTimeRemaining.hintMinutes", diffMins);
44+
? t("components.atoms.ChipTimeRemaining.hintMinShort")
45+
: t("components.atoms.ChipTimeRemaining.hintMinutes", diffMins);
4646
47-
return `${t("components.atoms.VCustomChipTimeRemaining.hintDueTime")}${diffMins} ${label}`;
47+
return `${t("components.atoms.ChipTimeRemaining.hintDueTime")}${diffMins} ${label}`;
4848
} else {
4949
const label = shorten
50-
? t("components.atoms.VCustomChipTimeRemaining.hintHoursShort")
51-
: t("components.atoms.VCustomChipTimeRemaining.hintHours", diffHrs);
52-
return `${t("components.atoms.VCustomChipTimeRemaining.hintDueTime")}${diffHrs} ${label}`;
50+
? t("components.atoms.ChipTimeRemaining.hintHoursShort")
51+
: t("components.atoms.ChipTimeRemaining.hintHours", diffHrs);
52+
return `${t("components.atoms.ChipTimeRemaining.hintDueTime")}${diffHrs} ${label}`;
5353
}
5454
};
5555
</script>

src/components/atoms/vRoomAvatar.unit.ts renamed to src/components/atoms/RoomAvatar.unit.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import vRoomAvatar from "./vRoomAvatar.vue";
1+
import RoomAvatar from "./RoomAvatar.vue";
22
import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
33
import { createMock } from "@golevelup/ts-vitest";
44
import { mdiSync } from "@icons/material";
@@ -22,9 +22,9 @@ const mockData = {
2222

2323
vi.mock("vue-router");
2424

25-
describe("vRoomAvatar", () => {
25+
describe("RoomAvatar", () => {
2626
const setup = (optionalProps: object = {}) => {
27-
const wrapper = mount(vRoomAvatar, {
27+
const wrapper = mount(RoomAvatar, {
2828
global: {
2929
plugins: [createTestingVuetify(), createTestingI18n()],
3030
},
@@ -172,7 +172,7 @@ describe("vRoomAvatar", () => {
172172
await avatarComponent.trigger("dragstart");
173173
const startDragEvent = wrapper.emitted("startDrag");
174174

175-
expect((wrapper.vm as unknown as typeof vRoomAvatar).isDragging).toBe(true);
175+
expect((wrapper.vm as unknown as typeof RoomAvatar).isDragging).toBe(true);
176176
expect(startDragEvent).toHaveLength(1);
177177
expect(startDragEvent && startDragEvent[0][0]).toStrictEqual(mockData);
178178
});
@@ -202,7 +202,7 @@ describe("vRoomAvatar", () => {
202202

203203
await avatarComponent.trigger("dragenter");
204204

205-
expect((wrapper.vm as unknown as typeof vRoomAvatar).isDragging).toBe(false);
205+
expect((wrapper.vm as unknown as typeof RoomAvatar).isDragging).toBe(false);
206206
});
207207

208208
it("should emit 'dragend' event when draging ended", async () => {
@@ -211,7 +211,7 @@ describe("vRoomAvatar", () => {
211211

212212
await avatarComponent.trigger("dragend");
213213

214-
expect((wrapper.vm as unknown as typeof vRoomAvatar).isDragging).toBe(false);
214+
expect((wrapper.vm as unknown as typeof RoomAvatar).isDragging).toBe(false);
215215
expect(wrapper.emitted()).toHaveProperty("dragend");
216216
});
217217
});

src/components/atoms/vRoomAvatar.vue renamed to src/components/atoms/RoomAvatar.vue

File renamed without changes.

src/components/atoms/vRoomEmptyAvatar.unit.ts renamed to src/components/atoms/RoomEmptyAvatar.unit.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import vRoomEmptyAvatar from "./vRoomEmptyAvatar.vue";
1+
import RoomEmptyAvatar from "./RoomEmptyAvatar.vue";
22
import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
33
import { mount } from "@vue/test-utils";
44
import { nextTick } from "vue";
55

6-
describe("vRoomEmptyAvatar", () => {
6+
describe("RoomEmptyAvatar", () => {
77
const setup = () => {
8-
const wrapper = mount(vRoomEmptyAvatar, {
8+
const wrapper = mount(RoomEmptyAvatar, {
99
global: {
1010
plugins: [createTestingVuetify(), createTestingI18n()],
1111
},

src/components/atoms/vRoomEmptyAvatar.vue renamed to src/components/atoms/RoomEmptyAvatar.vue

File renamed without changes.

0 commit comments

Comments
 (0)