Skip to content

Commit

Permalink
BC-5119 - Prevent creating new nexboards (#2947)
Browse files Browse the repository at this point in the history
* add new env FEATURE_NEXBOARD_COPY_ENABLED

* add nexboard copy text pointing that nexboard is replaced by tldraw
  • Loading branch information
davwas authored Dec 15, 2023
1 parent d92db8d commit 4a2117e
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 4 deletions.
5 changes: 3 additions & 2 deletions src/components/copy-result-modal/CopyResultModal.unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ describe("@/components/copy-result-modal/CopyResultModal", () => {
beforeEach(() => {
// Avoids console warnings "[Vuetify] Unable to locate target [data-app]"
document.body.setAttribute("data-app", "true");

setupStores({ envConfigModule: EnvConfigModule });
setupStores({
envConfigModule: EnvConfigModule,
});
});

describe("basic functions", () => {
Expand Down
7 changes: 6 additions & 1 deletion src/components/copy-result-modal/CopyResultModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export default {
},
{
isShow: this.hasNexboardElement,
text: this.$t("components.molecules.copyResult.nexboardCopy.info"),
text: this.nexboardInfoText,
title: this.$t("components.molecules.copyResult.label.nexboard"),
},
{
Expand Down Expand Up @@ -163,6 +163,11 @@ export default {
: "";
return `${courseFilesText} ${fileErrorText}`.trim();
},
nexboardInfoText() {
return envConfigModule.getEnv.FEATURE_NEXBOARD_COPY_ENABLED
? this.$t("components.molecules.copyResult.nexboardCopy.info")
: this.$t("components.molecules.copyResult.nexboardCopy.infoTldraw");
},
externalToolsInfoText() {
return this.$t("components.molecules.copyResult.ctlTools.info");
},
Expand Down
5 changes: 4 additions & 1 deletion src/components/share/ImportFlow.unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ describe("@components/share/ImportFlow", () => {
getCopyResult: copyResultResponse,
});
loadingStateModuleMock = createModuleMocks(LoadingStateModule);
setupStores({ rooms: RoomsModule });
setupStores({
rooms: RoomsModule,
envConfigModule: EnvConfigModule,
});
jest.spyOn(roomsModule, "fetchAllElements").mockImplementation();
});

Expand Down
1 change: 1 addition & 0 deletions src/components/templates/TasksDashboardMain.unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ describe("@/components/templates/TasksDashboardMain", () => {
setupStores({
copyModule: CopyModule,
authModule: AuthModule,
envConfigModule: EnvConfigModule,
});

authModule.setUser(mockAuthStoreDataTeacher as User);
Expand Down
1 change: 1 addition & 0 deletions src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@
"components.molecules.copyResult.etherpadCopy.info": "Inhalte werden aus Datenschutzgründen nicht kopiert und müssen neu hinzugefügt werden.",
"components.molecules.copyResult.geogebraCopy.info": "Material-IDs werden aus technischen Gründen nicht kopiert und müssen neu hinzugefügt werden.",
"components.molecules.copyResult.nexboardCopy.info": "Inhalte werden aus Datenschutzgründen nicht kopiert und müssen neu hinzugefügt werden.",
"components.molecules.copyResult.nexboardCopy.infoTldraw": "Der Inhalt wird nicht kopiert, da NeXboard durch Tldraw ersetzt wird. Sie können Tldraw im Spalten-Board hinzufügen, indem Sie ein neues Whiteboard-Element hinzufügen.",
"components.molecules.share.options.title": "Teilen-Einstellungen",
"components.molecules.share.options.schoolInternally": "Link nur schulintern gültig",
"components.molecules.share.options.expiresInDays": "Link läuft nach 21 Tagen ab",
Expand Down
1 change: 1 addition & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@
"components.molecules.copyResult.etherpadCopy.info": "Content is not copied for data protection reasons and must be added again.",
"components.molecules.copyResult.geogebraCopy.info": "Material IDs are not copied for technical reasons and must be added again.",
"components.molecules.copyResult.nexboardCopy.info": "Content is not copied for data protection reasons and must be added again.",
"components.molecules.copyResult.nexboardCopy.infoTldraw": "Content is not copied as NeXboard is being replaced by Tldraw. You can add Tldraw in the Column Board by adding a new Whiteboard element.",
"components.molecules.share.options.title": "Share settings",
"components.molecules.share.options.schoolInternally": "Link only valid within the school",
"components.molecules.share.options.expiresInDays": "Link expires after 21 days",
Expand Down
1 change: 1 addition & 0 deletions src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@
"components.molecules.copyResult.etherpadCopy.info": "El contenido no se copia por razones de protección de datos y debe agregarse nuevamente.",
"components.molecules.copyResult.geogebraCopy.info": "Los ID de material no se copian por razones técnicas y deben agregarse nuevamente.",
"components.molecules.copyResult.nexboardCopy.info": "El contenido no se copia por razones de protección de datos y debe agregarse nuevamente.",
"components.molecules.copyResult.nexboardCopy.infoTldraw": "El contenido no se copia ya que NeXboard está siendo reemplazado por Tldraw. Puede añadir Tldraw en el Tablero de columna añadiendo un nuevo elemento Whiteboard.",
"components.molecules.share.options.title": "Compartir la configuración",
"components.molecules.share.options.schoolInternally": "El enlace sólo es válido dentro de la escuela",
"components.molecules.share.options.expiresInDays": "El enlace caduca a los 21 días",
Expand Down
1 change: 1 addition & 0 deletions src/locales/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
"components.molecules.copyResult.etherpadCopy.info": "Вміст не копіюється з міркувань захисту даних і повинен бути доданий повторно.",
"components.molecules.copyResult.geogebraCopy.info": "Ідентифікатори матеріалів не копіюються з технічних причин і повинні бути додані знову.",
"components.molecules.copyResult.nexboardCopy.info": "Вміст не копіюється з міркувань захисту даних і повинен бути доданий повторно.",
"components.molecules.copyResult.nexboardCopy.infoTldraw": "Вміст не копіюється, оскільки NeXboard замінюється на Tldraw. Ви можете додати Tldraw до Колонна дошка для стовпчиків, додавши новий елемент Whiteboard.",
"components.molecules.share.options.title": "Налаштування спільного доступу",
"components.molecules.share.options.schoolInternally": "Посилання дійсне тільки в межах школи",
"components.molecules.share.options.expiresInDays": "Термін дії посилання закінчується через 21 днів",
Expand Down
1 change: 1 addition & 0 deletions src/store/types/env-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export type Envs = {
FEATURE_COLUMN_BOARD_LINK_ELEMENT_ENABLED?: boolean;
FEATURE_CONSENT_NECESSARY: boolean;
FEATURE_COPY_SERVICE_ENABLED?: boolean;
FEATURE_NEXBOARD_COPY_ENABLED?: boolean;
FEATURE_COURSE_SHARE_NEW?: boolean;
FEATURE_COURSE_SHARE?: boolean;
FEATURE_ES_COLLECTIONS_ENABLED?: boolean;
Expand Down

0 comments on commit 4a2117e

Please sign in to comment.