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.

Sign up for GitHub

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

Jump to bottom

N21-2052 ctl template adjustment #5094

Merged
merged 5 commits into from
Jul 11, 2024
Merged

N21-2052 ctl template adjustment #5094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dce76de
N21-2052 adds baseUrl to configuration template responses
arnegns Jul 3, 2024
a4292b7
removed default empty string for external tool id
GordonNicholasCap Jul 9, 2024
ca12fda
Merge branch 'refs/heads/main' into N21-2052-ctl-url-insertion
GordonNicholasCap Jul 9, 2024
cbf19e3
Merge branch 'main' into N21-2052-ctl-url-insertion
MarvinOehlerkingCap Jul 11, 2024
cde3a30
Merge branch 'main' into N21-2052-ctl-url-insertion
MarvinOehlerkingCap Jul 11, 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
10 changes: 8 additions & 2 deletions .../server/src/modules/tool/external-tool/controller/api-test/tool-configuration.api.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { Test, TestingModule } from '@nestjs/testing';
import { Course, LegacyBoard, SchoolEntity, User } from '@shared/domain/entity';
import { Permission } from '@shared/domain/interface';
import {
TestApiClient,
UserAndAccountTestFactory,
boardFactory,
courseFactory,
schoolEntityFactory,
TestApiClient,
UserAndAccountTestFactory,
userFactory,
} from '@shared/testing';
import { AccountEntity } from '@src/modules/account/domain/entity/account.entity';
Expand Down Expand Up @@ -197,6 +197,7 @@ describe('ToolConfigurationController (API)', () => {
externalToolId: externalTool.id,
schoolExternalToolId: schoolExternalTool.id,
name: externalTool.name,
baseUrl: externalTool.config.baseUrl,
logoUrl: externalTool.logoUrl,
parameters: [
{
Expand All @@ -217,6 +218,7 @@ describe('ToolConfigurationController (API)', () => {
{
externalToolId: externalToolWithoutContextRestriction.id,
name: externalToolWithoutContextRestriction.name,
baseUrl: externalToolWithoutContextRestriction.config.baseUrl,
parameters: [],
schoolExternalToolId: schoolExternalTool2.id,
},
Expand All @@ -234,6 +236,7 @@ describe('ToolConfigurationController (API)', () => {
{
externalToolId: externalToolWithoutContextRestriction.id,
name: externalToolWithoutContextRestriction.name,
baseUrl: externalToolWithoutContextRestriction.config.baseUrl,
parameters: [],
schoolExternalToolId: schoolExternalTool2.id,
},
Expand Down Expand Up @@ -353,6 +356,7 @@ describe('ToolConfigurationController (API)', () => {
{
externalToolId: externalTool.id,
name: externalTool.name,
baseUrl: externalTool.config.baseUrl,
logoUrl: externalTool.logoUrl,
parameters: [
{
Expand Down Expand Up @@ -480,6 +484,7 @@ describe('ToolConfigurationController (API)', () => {
expect(response.body).toEqual<SchoolExternalToolConfigurationTemplateResponse>({
externalToolId: externalTool.id,
name: externalTool.name,
baseUrl: externalTool.config.baseUrl,
logoUrl: externalTool.logoUrl,
parameters: [
{
Expand Down Expand Up @@ -635,6 +640,7 @@ describe('ToolConfigurationController (API)', () => {
externalToolId: externalTool.id,
schoolExternalToolId: schoolExternalTool.id,
name: externalTool.name,
baseUrl: externalTool.config.baseUrl,
logoUrl: externalTool.logoUrl,
parameters: [
{
Expand Down
4 changes: 4 additions & 0 deletions ...nal-tool/controller/dto/response/context-external-tool-configuration-template.response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ export class ContextExternalToolConfigurationTemplateResponse {
@ApiProperty()
name: string;

@ApiProperty()
baseUrl: string;

@ApiPropertyOptional()
logoUrl?: string;

Expand All @@ -22,6 +25,7 @@ export class ContextExternalToolConfigurationTemplateResponse {
this.externalToolId = configuration.externalToolId;
this.schoolExternalToolId = configuration.schoolExternalToolId;
this.name = configuration.name;
this.baseUrl = configuration.baseUrl;
this.logoUrl = configuration.logoUrl;
this.parameters = configuration.parameters;
}
Expand Down
4 changes: 4 additions & 0 deletions ...rnal-tool/controller/dto/response/school-external-tool-configuration-template.response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export class SchoolExternalToolConfigurationTemplateResponse {
@ApiProperty()
name: string;

@ApiProperty()
baseUrl: string;

@ApiPropertyOptional()
logoUrl?: string;

Expand All @@ -18,6 +21,7 @@ export class SchoolExternalToolConfigurationTemplateResponse {
constructor(configuration: SchoolExternalToolConfigurationTemplateResponse) {
this.externalToolId = configuration.externalToolId;
this.name = configuration.name;
this.baseUrl = configuration.baseUrl;
this.logoUrl = configuration.logoUrl;
this.parameters = configuration.parameters;
}
Expand Down
4 changes: 3 additions & 1 deletion apps/server/src/modules/tool/external-tool/mapper/tool-configuration.mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ export class ToolConfigurationMapper {
externalTool: ExternalTool
): SchoolExternalToolConfigurationTemplateResponse {
const mapped = new SchoolExternalToolConfigurationTemplateResponse({
externalToolId: externalTool.id ?? '',
externalToolId: externalTool.id,
name: externalTool.name,
baseUrl: externalTool.config.baseUrl,
logoUrl: externalTool.logoUrl,
parameters: externalTool.parameters
? ExternalToolResponseMapper.mapCustomParameterToResponse(externalTool.parameters)
Expand Down Expand Up @@ -48,6 +49,7 @@ export class ToolConfigurationMapper {
externalToolId: externalTool.id ?? '',
schoolExternalToolId: schoolExternalTool.id ?? '',
name: externalTool.name,
baseUrl: externalTool.config.baseUrl,
logoUrl: externalTool.logoUrl,
parameters: externalTool.parameters
? ExternalToolResponseMapper.mapCustomParameterToResponse(externalTool.parameters)
Expand Down
Loading