From d98d05a75dde01f0fda9d90f47a71a4374ddfe85 Mon Sep 17 00:00:00 2001 From: Mrika Llabani Date: Mon, 6 May 2024 16:40:32 +0200 Subject: [PATCH] N21-1679 review changes --- .../rooms/RoomExternalToolCard.unit.ts | 6 - src/components/rooms/RoomExternalToolCard.vue | 9 +- ...ernalToolConfigurationStatus.composable.ts | 2 - ...ToolConfigurationStatus.composable.unit.ts | 234 ------------------ .../ExternalToolElement.vue | 6 +- 5 files changed, 6 insertions(+), 251 deletions(-) diff --git a/src/components/rooms/RoomExternalToolCard.unit.ts b/src/components/rooms/RoomExternalToolCard.unit.ts index 2571577890..7b725ae3e4 100644 --- a/src/components/rooms/RoomExternalToolCard.unit.ts +++ b/src/components/rooms/RoomExternalToolCard.unit.ts @@ -43,12 +43,6 @@ describe("RoomExternalToolCard", () => { jest .mocked(useContextExternalToolConfigurationStatus) .mockReturnValue(useContextExternalToolConfigurationStatusMock); - - jest - .mocked( - useContextExternalToolConfigurationStatusMock.determineChipStatusTitle - ) - .mockReturnValue("pages.rooms.tools.outdated"); }); afterEach(() => { diff --git a/src/components/rooms/RoomExternalToolCard.vue b/src/components/rooms/RoomExternalToolCard.vue index 041e5b2255..c93de010cc 100644 --- a/src/components/rooms/RoomExternalToolCard.vue +++ b/src/components/rooms/RoomExternalToolCard.vue @@ -15,7 +15,7 @@ {{ $t("pages.rooms.tools.deactivated") }} {{ $t("pages.rooms.tools.outdated") }} @@ -77,8 +77,7 @@ export default defineComponent({ error: launchError, } = useExternalToolLaunchState(); - const { determineChipStatusTitle, isTeacher } = - useContextExternalToolConfigurationStatus(); + const { isTeacher } = useContextExternalToolConfigurationStatus(); const handleClick = async () => { if (!isToolLaunchable.value) { @@ -144,7 +143,6 @@ export default defineComponent({ ); }); - const loadLaunchRequest = async () => { if (!isToolLaunchable.value) { return; @@ -164,8 +162,7 @@ export default defineComponent({ isToolOutdated, isToolDeactivated, isToolIncomplete, - isToolIncompleteOperational, - toolChipTitle, + showAsIncompleteOperational, }; }, }); diff --git a/src/modules/data/external-tool/ContextExternalToolConfigurationStatus.composable.ts b/src/modules/data/external-tool/ContextExternalToolConfigurationStatus.composable.ts index 38627571e2..29d4ec400e 100644 --- a/src/modules/data/external-tool/ContextExternalToolConfigurationStatus.composable.ts +++ b/src/modules/data/external-tool/ContextExternalToolConfigurationStatus.composable.ts @@ -4,7 +4,6 @@ import { ContextExternalToolConfigurationStatus } from "./types"; export const useContextExternalToolConfigurationStatus = () => { const authModule = injectStrict(AUTH_MODULE_KEY); - const determineToolStatusTranslationKey = ( toolConfigStatus: ContextExternalToolConfigurationStatus ): string => { @@ -46,7 +45,6 @@ export const useContextExternalToolConfigurationStatus = () => { }; return { - determineChipStatusTitle, determineToolStatusTranslationKey, determineDeactivatedMessage, isTeacher, diff --git a/src/modules/data/external-tool/ContextExternalToolConfigurationStatus.composable.unit.ts b/src/modules/data/external-tool/ContextExternalToolConfigurationStatus.composable.unit.ts index 69af007427..ad81740483 100644 --- a/src/modules/data/external-tool/ContextExternalToolConfigurationStatus.composable.unit.ts +++ b/src/modules/data/external-tool/ContextExternalToolConfigurationStatus.composable.unit.ts @@ -322,240 +322,6 @@ describe("ToolConfigurationStatus.composable", () => { }); }); - describe("determineChipStatusTitle", () => { - describe("when user is student", () => { - describe("when tool is incomplete operational", () => { - const setup = () => { - const authModule = createModuleMocks(AuthModule, { - getUserRoles: ["student"], - }); - - const toolConfigurationStatus = - ContextExternalToolConfigurationStatusFactory.build({ - isIncompleteOperationalOnScopeContext: true, - }); - - const composable = mountComposable( - () => useContextExternalToolConfigurationStatus(), - { - global: { - provide: { - [AUTH_MODULE_KEY.valueOf()]: authModule, - }, - }, - } - ); - - return { - toolConfigurationStatus, - ...composable, - }; - }; - - it("should return undefined ", () => { - const { determineChipStatusTitle, toolConfigurationStatus } = setup(); - - const result = determineChipStatusTitle(toolConfigurationStatus); - - expect(result).toEqual("pages.rooms.tools.outdated"); - }); - }); - - describe("when user is teacher", () => { - describe("when tool is outdated on scope school and context", () => { - const setup = () => { - const authModule = createModuleMocks(AuthModule, { - getUserRoles: ["teacher"], - }); - - const toolConfigurationStatus = - ContextExternalToolConfigurationStatusFactory.build({ - isOutdatedOnScopeSchool: true, - isOutdatedOnScopeContext: true, - }); - - const composable = mountComposable( - () => useContextExternalToolConfigurationStatus(), - { - global: { - provide: { - [AUTH_MODULE_KEY.valueOf()]: authModule, - }, - }, - } - ); - - return { - toolConfigurationStatus, - ...composable, - }; - }; - - it("should return translationkey for outdated ", () => { - const { determineChipStatusTitle, toolConfigurationStatus } = - setup(); - - const result = determineChipStatusTitle(toolConfigurationStatus); - - expect(result).toEqual("pages.rooms.tools.outdated"); - }); - }); - - describe("when tool is outdated on scope school", () => { - const setup = () => { - const authModule = createModuleMocks(AuthModule, { - getUserRoles: ["teacher"], - }); - - const toolConfigurationStatus = - ContextExternalToolConfigurationStatusFactory.build({ - isOutdatedOnScopeSchool: true, - }); - - const composable = mountComposable( - () => useContextExternalToolConfigurationStatus(), - { - global: { - provide: { - [AUTH_MODULE_KEY.valueOf()]: authModule, - }, - }, - } - ); - - return { - toolConfigurationStatus, - ...composable, - }; - }; - - it("should return translationkey for outdated ", () => { - const { determineChipStatusTitle, toolConfigurationStatus } = - setup(); - - const result = determineChipStatusTitle(toolConfigurationStatus); - - expect(result).toEqual("pages.rooms.tools.outdated"); - }); - }); - - describe("when tool is outdated on scope context", () => { - const setup = () => { - const authModule = createModuleMocks(AuthModule, { - getUserRoles: ["teacher"], - }); - - const toolConfigurationStatus = - ContextExternalToolConfigurationStatusFactory.build({ - isOutdatedOnScopeContext: true, - }); - - const composable = mountComposable( - () => useContextExternalToolConfigurationStatus(), - { - global: { - provide: { - [AUTH_MODULE_KEY.valueOf()]: authModule, - }, - }, - } - ); - - return { - toolConfigurationStatus, - ...composable, - }; - }; - - it("should return translationkey for outdated ", () => { - const { determineChipStatusTitle, toolConfigurationStatus } = - setup(); - - const result = determineChipStatusTitle(toolConfigurationStatus); - - expect(result).toEqual("pages.rooms.tools.outdated"); - }); - }); - - describe("when tool is incomplete", () => { - const setup = () => { - const authModule = createModuleMocks(AuthModule, { - getUserRoles: ["teacher"], - }); - - const toolConfigurationStatus = - ContextExternalToolConfigurationStatusFactory.build({ - isIncompleteOnScopeContext: true, - }); - - const composable = mountComposable( - () => useContextExternalToolConfigurationStatus(), - { - global: { - provide: { - [AUTH_MODULE_KEY.valueOf()]: authModule, - }, - }, - } - ); - - return { - toolConfigurationStatus, - ...composable, - }; - }; - - it("should return translationkey for outdated ", () => { - const { determineChipStatusTitle, toolConfigurationStatus } = - setup(); - - const result = determineChipStatusTitle(toolConfigurationStatus); - - expect(result).toEqual("pages.rooms.tools.outdated"); - }); - }); - - describe("when tool is incomplete operational", () => { - const setup = () => { - const authModule = createModuleMocks(AuthModule, { - getUserRoles: ["teacher"], - }); - - const toolConfigurationStatus = - ContextExternalToolConfigurationStatusFactory.build({ - isIncompleteOperationalOnScopeContext: true, - }); - - const composable = mountComposable( - () => useContextExternalToolConfigurationStatus(), - { - global: { - provide: { - [AUTH_MODULE_KEY.valueOf()]: authModule, - }, - }, - } - ); - - return { - toolConfigurationStatus, - ...composable, - }; - }; - - it("should return translationkey for outdated ", () => { - const { determineChipStatusTitle, toolConfigurationStatus } = - setup(); - - const result = determineChipStatusTitle(toolConfigurationStatus); - - expect(result).toEqual("pages.rooms.tools.outdated"); - }); - }); - }); - }); - }); - describe("isTeacher", () => { describe("when user is teacher", () => { const setup = () => { diff --git a/src/modules/feature/board-external-tool-element/ExternalToolElement.vue b/src/modules/feature/board-external-tool-element/ExternalToolElement.vue index 4393f14b08..ce46d2b045 100644 --- a/src/modules/feature/board-external-tool-element/ExternalToolElement.vue +++ b/src/modules/feature/board-external-tool-element/ExternalToolElement.vue @@ -150,9 +150,9 @@ export default defineComponent({ const isToolLaunchable: ComputedRef = computed( () => - !displayData.value?.status.isOutdatedOnScopeSchool || - !displayData.value?.status.isOutdatedOnScopeContext || - !displayData.value?.status?.isIncompleteOnScopeContext + !displayData.value?.status.isOutdatedOnScopeSchool && + !displayData.value?.status.isOutdatedOnScopeContext && + !displayData.value?.status.isIncompleteOnScopeContext ); const toolConfigurationStatus: ComputedRef =