N21-1901 visualize ctl states (#5019)

* add isNotLicensed status and validation, remove remnants of toolVersion
hpi-schul-cloud · May 28, 2024 · 02b09d0 · 02b09d0
1 parent 5adb50c
commit 02b09d0
Show file tree

Hide file tree

Showing 19 changed files with 277 additions and 542 deletions.
diff --git a/...modules/tool/common/controller/dto/context-external-tool-configuration-status.response.ts b/...modules/tool/common/controller/dto/context-external-tool-configuration-status.response.ts
@@ -34,11 +34,18 @@ export class ContextExternalToolConfigurationStatusResponse {
 	})
 	isDeactivated: boolean;
 
+	@ApiProperty({
+		type: Boolean,
+		description: 'True if the tool is not licensed for user',
+	})
+	isNotLicensed: boolean;
+
 	constructor(props: ContextExternalToolConfigurationStatusResponse) {
 		this.isOutdatedOnScopeSchool = props.isOutdatedOnScopeSchool;
 		this.isOutdatedOnScopeContext = props.isOutdatedOnScopeContext;
 		this.isIncompleteOnScopeContext = props.isIncompleteOnScopeContext;
 		this.isIncompleteOperationalOnScopeContext = props.isIncompleteOperationalOnScopeContext;
 		this.isDeactivated = props.isDeactivated;
+		this.isNotLicensed = props.isNotLicensed;
 	}
 }
diff --git a/apps/server/src/modules/tool/common/domain/context-external-tool-configuration-status.ts b/apps/server/src/modules/tool/common/domain/context-external-tool-configuration-status.ts
@@ -7,6 +7,8 @@ export class ContextExternalToolConfigurationStatus {
 
 	isDeactivated: boolean;
 
+	isNotLicensed: boolean;
+
 	isIncompleteOperationalOnScopeContext: boolean;
 
 	constructor(props: ContextExternalToolConfigurationStatus) {
@@ -15,5 +17,6 @@ export class ContextExternalToolConfigurationStatus {
 		this.isIncompleteOnScopeContext = props.isIncompleteOnScopeContext;
 		this.isIncompleteOperationalOnScopeContext = props.isIncompleteOperationalOnScopeContext;
 		this.isDeactivated = props.isDeactivated;
+		this.isNotLicensed = props.isNotLicensed;
 	}
 }
diff --git a/apps/server/src/modules/tool/common/interface/index.ts b/apps/server/src/modules/tool/common/interface/index.ts
@@ -1,2 +1 @@
 export * from './external-tool-search-query';
-export * from './tool-version.interface';
diff --git a/apps/server/src/modules/tool/common/interface/tool-version.interface.ts b/apps/server/src/modules/tool/common/interface/tool-version.interface.ts
diff --git a/apps/server/src/modules/tool/common/mapper/tool-status-response.mapper.ts b/apps/server/src/modules/tool/common/mapper/tool-status-response.mapper.ts
@@ -10,6 +10,7 @@ export class ToolStatusResponseMapper {
 				isIncompleteOnScopeContext: status.isIncompleteOnScopeContext,
 				isIncompleteOperationalOnScopeContext: status.isIncompleteOperationalOnScopeContext,
 				isDeactivated: status.isDeactivated,
+				isNotLicensed: status.isNotLicensed,
 			});
 
 		return configurationStatus;

diff --git a/apps/server/src/modules/tool/context-external-tool/context-external-tool.module.ts b/apps/server/src/modules/tool/context-external-tool/context-external-tool.module.ts
@@ -1,4 +1,5 @@
-import { Module, forwardRef } from '@nestjs/common';
+import { UserLicenseModule } from '@modules/user-license';
+import { forwardRef, Module } from '@nestjs/common';
 import { LoggerModule } from '@src/core/logger';
 import { CommonToolModule } from '../common';
 import { ExternalToolModule } from '../external-tool';
@@ -15,6 +16,7 @@ import { ToolConfigurationStatusService } from './service/tool-configuration-sta
 		SchoolExternalToolModule,
 		LoggerModule,
 		ToolConfigModule,
+		UserLicenseModule,
 	],
 	providers: [
 		ContextExternalToolService,
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from './external-tool-search-query';
		export * from './tool-version.interface';