Merge pull request #4684 from alkem-io/master-to-develop-0.95

Master to develop 0.95
alkem-io · Nov 7, 2024 · 9f51e6d · 9f51e6d
2 parents a8e2e11 + 4f68501
commit 9f51e6d
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 3 deletions.
diff --git a/src/common/enums/authorization.privilege.ts b/src/common/enums/authorization.privilege.ts
@@ -30,6 +30,7 @@ export enum AuthorizationPrivilege {
   UPDATE_INNOVATION_FLOW = 'update-innovation-flow',
   COMMUNITY_JOIN = 'community-join',
   COMMUNITY_APPLY = 'community-apply',
+  COMMUNITY_APPLY_ACCEPT = 'community-apply-accept',
   COMMUNITY_INVITE = 'community-invite',
   COMMUNITY_INVITE_ACCEPT = 'community-invite-accept',
   COMMUNITY_ADD_MEMBER = 'community-add-member', // only for global admins

diff --git a/...strap/platform-template-definitions/space-tutorials/bootstrap.space.tutorials.callouts.ts b/...strap/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
@@ -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/...platform-template-definitions/subspace-knowledge/bootstrap.subspace.knowledge.callouts.ts b/...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
@@ -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:

diff --git a/src/domain/collaboration/callout/callout.resolver.mutations.ts b/src/domain/collaboration/callout/callout.resolver.mutations.ts
@@ -122,7 +122,7 @@ export class CalloutResolverMutations {
     const savedCallout =
       await this.calloutService.updateCalloutVisibility(calloutData);
 
-    if (savedCallout.visibility !== oldVisibility) {
+    if (!savedCallout.isTemplate && savedCallout.visibility !== oldVisibility) {
       if (savedCallout.visibility === CalloutVisibility.PUBLISHED) {
         // Save published info
         await this.calloutService.updateCalloutPublishInfo(

diff --git 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);