Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

N21-1901 visualize ctl states #5019

Merged
merged 19 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8be9f5f
mediaSourceId check
IgorCapCoder May 16, 2024
832972d
set partOf from moin.schule to undefined when ''
IgorCapCoder May 16, 2024
ae02e17
Merge branch 'main' into N21-1975-extend-licensing-logic
IgorCapCoder May 21, 2024
9031b76
add media source Id and use it for license logic
IgorCapCoder May 21, 2024
8aaac92
fix tests
IgorCapCoder May 21, 2024
22e4f8d
Merge branch 'main' into N21-1976-add-media-source-id
IgorCapCoder May 21, 2024
e0e96ba
requested changes
IgorCapCoder May 22, 2024
0195d4d
- add isNotLicensed status and validation, remove remnants of toolVer…
IgorCapCoder May 22, 2024
1df1a64
Merge branch 'N21-1976-add-media-source-id' into N21-1901-visualize-c…
IgorCapCoder May 22, 2024
fb06b76
coverage up
IgorCapCoder May 22, 2024
9857a93
Merge branch 'N21-1976-add-media-source-id' into N21-1901-visualize-c…
IgorCapCoder May 22, 2024
6ef1160
import userLicenseModule in ContextExternalToolModule
IgorCapCoder May 22, 2024
dbd4ff5
hide licensed status check behind feature flag
IgorCapCoder May 22, 2024
593f384
Merge branch 'main' into N21-1901-visualize-ctl-states
IgorCapCoder May 23, 2024
094d9f3
Merge branch 'main' into N21-1901-visualize-ctl-states
IgorCapCoder May 27, 2024
4eeef46
requested changes
IgorCapCoder May 27, 2024
55d39ad
Merge remote-tracking branch 'origin/N21-1901-visualize-ctl-states' i…
IgorCapCoder May 27, 2024
7b37082
Merge branch 'main' into N21-1901-visualize-ctl-states
IgorCapCoder May 27, 2024
6523dbf
requested changes
IgorCapCoder May 28, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ export class ContextExternalToolConfigurationStatus {

isDeactivated: boolean;

isNotLicensed: boolean;

isIncompleteOperationalOnScopeContext: boolean;

constructor(props: ContextExternalToolConfigurationStatus) {
Expand All @@ -15,5 +17,6 @@ export class ContextExternalToolConfigurationStatus {
this.isIncompleteOnScopeContext = props.isIncompleteOnScopeContext;
this.isIncompleteOperationalOnScopeContext = props.isIncompleteOperationalOnScopeContext;
this.isDeactivated = props.isDeactivated;
this.isNotLicensed = props.isNotLicensed;
}
}
1 change: 0 additions & 1 deletion apps/server/src/modules/tool/common/interface/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * from './external-tool-search-query';
export * from './tool-version.interface';

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export class ToolStatusResponseMapper {
isIncompleteOnScopeContext: status.isIncompleteOnScopeContext,
isIncompleteOperationalOnScopeContext: status.isIncompleteOperationalOnScopeContext,
isDeactivated: status.isDeactivated,
isNotLicensed: status.isNotLicensed,
});

return configurationStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -15,6 +16,7 @@ import { ToolConfigurationStatusService } from './service/tool-configuration-sta
SchoolExternalToolModule,
LoggerModule,
ToolConfigModule,
UserLicenseModule,
],
providers: [
ContextExternalToolService,
Expand Down
Loading
Loading