From c579e84a7e83b8b571d302e0f7be7dff1806c55f Mon Sep 17 00:00:00 2001 From: Carlos Cano Date: Tue, 5 Nov 2024 16:20:45 +0100 Subject: [PATCH 1/3] 0.95.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21d8895a33..f6cfb36727 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "alkemio-server", - "version": "0.95.0", + "version": "0.95.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "alkemio-server", - "version": "0.95.0", + "version": "0.95.1", "license": "EUPL-1.2", "dependencies": { "@alkemio/matrix-adapter-lib": "^0.4.1", diff --git a/package.json b/package.json index 295f127b61..86e0c4df25 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "alkemio-server", - "version": "0.95.0", + "version": "0.95.1", "description": "Alkemio server, responsible for managing the shared Alkemio platform", "author": "Alkemio Foundation", "private": false, From 9a57cd0b84633f21ef269865562326b5f119b112 Mon Sep 17 00:00:00 2001 From: Carlos Cano Date: Tue, 5 Nov 2024 16:07:28 +0100 Subject: [PATCH 2/3] Fix visibility (all are DRAFT) of callouts on bootstrap --- .../bootstrap.space.tutorials.callouts.ts | 8 ++++++++ .../space/bootstrap.space.callouts.ts | 2 ++ .../bootstrap.subspace.knowledge.callouts.ts | 12 ++++++++++++ .../subspace/bootstrap.subspace.callouts.ts | 3 +++ 4 files changed, 25 insertions(+) diff --git a/src/core/bootstrap/platform-template-definitions/space-tutorials/bootstrap.space.tutorials.callouts.ts b/src/core/bootstrap/platform-template-definitions/space-tutorials/bootstrap.space.tutorials.callouts.ts index c6fb25777a..0d3fa82450 100644 --- a/src/core/bootstrap/platform-template-definitions/space-tutorials/bootstrap.space.tutorials.callouts.ts +++ b/src/core/bootstrap/platform-template-definitions/space-tutorials/bootstrap.space.tutorials.callouts.ts @@ -5,6 +5,7 @@ import { CalloutGroupName } from '@common/enums/callout.group.name'; import { TagsetReservedName } from '@common/enums/tagset.reserved.name'; import { FlowState } from './bootstrap.space.tutorials.innovation.flow.states'; import { CreateCalloutInput } from '@domain/collaboration/callout/dto/callout.dto.create'; +import { CalloutVisibility } from '@common/enums/callout.visibility'; export const bootstrapSpaceTutorialsCallouts: CreateCalloutInput[] = [ { @@ -15,6 +16,7 @@ export const bootstrapSpaceTutorialsCallouts: CreateCalloutInput[] = [ }, sortOrder: 1, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: '๐Ÿ‘‹ Welcome to your space!', @@ -37,6 +39,7 @@ export const bootstrapSpaceTutorialsCallouts: CreateCalloutInput[] = [ }, sortOrder: 2, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'โš™๏ธ Set it up your way!', @@ -59,6 +62,7 @@ export const bootstrapSpaceTutorialsCallouts: CreateCalloutInput[] = [ }, sortOrder: 3, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: '๐Ÿงฉ Collaboration tools', @@ -81,6 +85,7 @@ export const bootstrapSpaceTutorialsCallouts: CreateCalloutInput[] = [ }, sortOrder: 4, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: '๐Ÿงน Cleaning up', @@ -103,6 +108,7 @@ export const bootstrapSpaceTutorialsCallouts: CreateCalloutInput[] = [ }, sortOrder: 1, groupName: CalloutGroupName.COMMUNITY, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: '๐Ÿค Set up your Community', @@ -125,6 +131,7 @@ export const bootstrapSpaceTutorialsCallouts: CreateCalloutInput[] = [ }, sortOrder: 1, groupName: CalloutGroupName.SUBSPACES, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'โ†ช๏ธ Subspaces', @@ -147,6 +154,7 @@ export const bootstrapSpaceTutorialsCallouts: CreateCalloutInput[] = [ }, sortOrder: 1, groupName: CalloutGroupName.KNOWLEDGE, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: '๐Ÿ“š The Knowledge Base', diff --git a/src/core/bootstrap/platform-template-definitions/space/bootstrap.space.callouts.ts b/src/core/bootstrap/platform-template-definitions/space/bootstrap.space.callouts.ts index b607c9a6b1..2283938a81 100644 --- a/src/core/bootstrap/platform-template-definitions/space/bootstrap.space.callouts.ts +++ b/src/core/bootstrap/platform-template-definitions/space/bootstrap.space.callouts.ts @@ -5,6 +5,7 @@ import { CalloutGroupName } from '@common/enums/callout.group.name'; import { TagsetReservedName } from '@common/enums/tagset.reserved.name'; import { FlowState } from './bootstrap.space.innovation.flow'; import { CreateCalloutInput } from '@domain/collaboration/callout/dto/callout.dto.create'; +import { CalloutVisibility } from '@common/enums/callout.visibility'; export const bootstrapSpaceCallouts: CreateCalloutInput[] = [ { @@ -15,6 +16,7 @@ export const bootstrapSpaceCallouts: CreateCalloutInput[] = [ }, sortOrder: 1, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: '๐Ÿ‘‹ Welcome to your space!', diff --git a/src/core/bootstrap/platform-template-definitions/subspace-knowledge/bootstrap.subspace.knowledge.callouts.ts b/src/core/bootstrap/platform-template-definitions/subspace-knowledge/bootstrap.subspace.knowledge.callouts.ts index 3ca25dcdff..128f62690d 100644 --- a/src/core/bootstrap/platform-template-definitions/subspace-knowledge/bootstrap.subspace.knowledge.callouts.ts +++ b/src/core/bootstrap/platform-template-definitions/subspace-knowledge/bootstrap.subspace.knowledge.callouts.ts @@ -4,6 +4,7 @@ import { CalloutType } from '@common/enums/callout.type'; import { TagsetReservedName } from '@common/enums/tagset.reserved.name'; import { FlowState } from './bootstrap.subspace.knowledge.innovation.flow.states'; import { CreateCalloutInput } from '@domain/collaboration/callout/dto/callout.dto.create'; +import { CalloutVisibility } from '@common/enums/callout.visibility'; export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ { @@ -14,6 +15,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 1, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'No Time? A quick summary โฌ‡๏ธ', @@ -36,6 +38,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 2, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'The Virtual Contributor', @@ -58,6 +61,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 3, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'Interacting with a Virtual Contributor', @@ -80,6 +84,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 4, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'The Profile of your Virtual Contributor', @@ -102,6 +107,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 5, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'Types of Content', @@ -124,6 +130,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 6, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'Terms & Conditions', @@ -146,6 +153,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 7, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'Example 1: Background information', @@ -168,6 +176,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 8, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'Example 2: Random facts and figures', @@ -190,6 +199,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 9, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'Example 3: Links and Documents', @@ -212,6 +222,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 10, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'Where to find the Virtual Contributor Profile', @@ -234,6 +245,7 @@ export const bootstrapSubspaceKnowledgeCallouts: CreateCalloutInput[] = [ }, sortOrder: 11, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: 'Updating my Body of Knowledge', diff --git a/src/core/bootstrap/platform-template-definitions/subspace/bootstrap.subspace.callouts.ts b/src/core/bootstrap/platform-template-definitions/subspace/bootstrap.subspace.callouts.ts index e0de4e64a1..bacbf2b634 100644 --- a/src/core/bootstrap/platform-template-definitions/subspace/bootstrap.subspace.callouts.ts +++ b/src/core/bootstrap/platform-template-definitions/subspace/bootstrap.subspace.callouts.ts @@ -4,6 +4,7 @@ import { CalloutType } from '@common/enums/callout.type'; import { TagsetReservedName } from '@common/enums/tagset.reserved.name'; import { FlowState } from './bootstrap.subspace.innovation.flow.states'; import { CreateCalloutInput } from '@domain/collaboration/callout/dto/callout.dto.create'; +import { CalloutVisibility } from '@common/enums/callout.visibility'; export const bootstrapSubspaceCallouts: CreateCalloutInput[] = [ { @@ -14,6 +15,7 @@ export const bootstrapSubspaceCallouts: CreateCalloutInput[] = [ }, sortOrder: 1, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: '๐Ÿ‘‹ Welcome to your subpace!', @@ -37,6 +39,7 @@ export const bootstrapSubspaceCallouts: CreateCalloutInput[] = [ }, sortOrder: 2, groupName: CalloutGroupName.HOME, + visibility: CalloutVisibility.PUBLISHED, framing: { profile: { displayName: From aa4b31a587f2a3c021b36c3b1195689f1bc46557 Mon Sep 17 00:00:00 2001 From: Carlos Cano Date: Tue, 5 Nov 2024 16:13:56 +0100 Subject: [PATCH 3/3] Fix: Delete collaboration template not working --- .../collaboration/collaboration/collaboration.service.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/domain/collaboration/collaboration/collaboration.service.ts b/src/domain/collaboration/collaboration/collaboration.service.ts index 15dcd0fb4c..5eef75fa69 100644 --- a/src/domain/collaboration/collaboration/collaboration.service.ts +++ b/src/domain/collaboration/collaboration/collaboration.service.ts @@ -348,7 +348,6 @@ export class CollaborationService { if ( !collaboration.callouts || - !collaboration.timeline || !collaboration.innovationFlow || !collaboration.authorization ) @@ -361,7 +360,10 @@ export class CollaborationService { await this.calloutService.deleteCallout(callout.id); } - await this.timelineService.deleteTimeline(collaboration.timeline.id); + if (collaboration.timeline) { + // There's no timeline for collaboration templates + await this.timelineService.deleteTimeline(collaboration.timeline.id); + } await this.authorizationPolicyService.delete(collaboration.authorization);