Merge pull request #4692 from alkem-io/release/homepage

Release: Homepage & Fixes

alkemio.yml

@@ -43,16 +43,6 @@ hosting:
     port: ${WHITEBOARD_RT_PORT}:4001
 
   max_json_payload_size: ${HOSTING_MAX_JSON_PAYLOAD_SIZE}:64mb
-## bootstrap ##
-# Used to determine the the information that is used to to initialize a functional Alkemio instance.
-bootstrap:
-  # The bootstrap authorization file specifies the minimum set of users and their associated credentials that are always available
-  # in the Alkemio instance.
-  #
-  # Default: the default file that is picked up is: src/services/configuraiton/templates/authorization-bootstrap.json.
-  authorization:
-    enabled: ${BOOTSTRAP_AUTHORIZATION_ENABLED}:true
-    file: ${BOOTSTRAP_AUTHORIZATION_FILE}
 # Settings related to the authorization framework
 authorization:
   # amount of authorization policies saved in a single chunk
@@ -285,7 +275,7 @@ communications:
     enabled: ${COMMUNICATIONS_DISCUSSIONS_ENABLED}:true
 
 ## storage ##
-# Alkemio uses multiple types of persistent storage, including SQL database and IPFS.
+# Alkemio uses multiple types of persistent storage, including SQL database, postgres database, file storage, redis.
 storage:
   file:
     # 20MB

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alkemio-server",
-  "version": "0.95.2",
+  "version": "0.95.3",
   "description": "Alkemio server, responsible for managing the shared Alkemio platform",
   "author": "Alkemio Foundation",
   "private": false,

src/app.module.ts

@@ -66,7 +66,6 @@ import { ChatGuidanceModule } from '@services/api/chat-guidance/chat.guidance.mo
 import { LookupModule } from '@services/api/lookup';
 import { AuthResetSubscriberModule } from '@services/auth-reset/subscriber/auth-reset.subscriber.module';
 import { APP_ID_PROVIDER } from '@common/app.id.provider';
-import { IpfsLogModule } from '@services/api-rest/ipfs-log/ipfs.log.module';
 import { ContributionMoveModule } from '@domain/collaboration/callout-contribution/callout.contribution.move.module';
 import { TaskGraphqlModule } from '@domain/task/task.module';
 import { ActivityFeedModule } from '@domain/activity-feed';
@@ -279,7 +278,6 @@ import { AdminUsersModule } from '@platform/admin/users/admin.users.module';
     InnovationHubModule,
     SsiCredentialFlowModule,
     StorageAccessModule,
-    IpfsLogModule,
     MeModule,
     ExcalidrawServerModule,
     ChatGuidanceModule,

src/common/enums/alkemio.error.status.ts

@@ -24,9 +24,6 @@ export enum AlkemioErrorStatus {
   NOT_SUPPORTED = 'NOT_SUPPORTED',
   NOT_ENABLED = 'NOT_ENABLED',
   USER_NOT_REGISTERED = 'USER_NOT_REGISTERED',
-  IPFS_UPLOAD_FAILED = 'IPFS_UPLOAD_FAILED',
-  IPFS_DELETE_FAILED = 'IPFS_DELETE_FAILED',
-  IPFS_GARBAGE_COLLECTION_FAILED = 'IPFS_GARBAGE_COLLECTION_FAILED',
   LICENSE_NOT_FOUND = 'LICENSE_NOT_FOUND',
   MATRIX_ENTITY_NOT_FOUND_ERROR = 'MATRIX_ENTITY_NOT_FOUND_ERROR',
   BOOTSTRAP_FAILED = 'BOOTSTRAP_FAILED',
@@ -41,7 +38,6 @@ export enum AlkemioErrorStatus {
   STORAGE_BUCKET_NOT_FOUND = 'STORAGE_BUCKET_NOT_FOUND',
   TAGSET_NOT_FOUND = 'TAGSET_NOT_FOUND',
   MIME_TYPE_NOT_FOUND = 'MIME_TYPE_NOT_FOUND',
-  IPFS_FILE_NOT_FOUND = 'IPFS_FILE_NOT_FOUND',
   SUBSCRIPTION_USER_NOT_AUTHENTICATED = 'SUBSCRIPTION_USER_NOT_AUTHENTICATED',
   PAGINATION_INPUT_OUT_OF_BOUND = 'PAGINATION_INPUT_OUT_OF_BOUND',
   PAGINATION_NOT_FOUND = 'PAGINATION_NOT_FOUND',
@@ -62,7 +58,6 @@ export enum AlkemioErrorStatus {
   FORUM_DISCUSSION_CATEGORY = 'FORUM_DISCUSSION_CATEGORY',
   OPERATION_NOT_ALLOWED = 'OPERATION_NOT_ALLOWED',
   NOT_FOUND = 'NOT_FOUND',
-  IPFS_NOT_FOUND = 'IPFS_NOT_FOUND',
   EXCALIDRAW_AMQP_RESULT_ERROR = 'EXCALIDRAW_AMQP_RESULT_ERROR',
   EXCALIDRAW_REDIS_ADAPTER_INIT = 'EXCALIDRAW_REDIS_INIT',
   EXCALIDRAW_SERVER_INIT = 'EXCALIDRAW_SERVER_INIT',

src/common/enums/authorization.policy.type.ts

@@ -21,6 +21,7 @@ export enum AuthorizationPolicyType {
   COMMUNICATION = 'communication',
   ROOM = 'room',
   AI_PERSONA = 'ai-persona',
+  AI_SERVER = 'ai-server',
   APPLICATION = 'application',
   ROLE_SET = 'role-set',
   COMMUNITY = 'community',
@@ -50,8 +51,10 @@ export enum AuthorizationPolicyType {
   CALENDAR = 'calendar',
   CALENDAR_EVENT = 'calendar-event',
   TIMELINE = 'timeline',
+  LIBRARY = 'library',
   IN_MEMORY = 'in-memory',
   LICENSING = 'licensing',
+  LICENSE_POLICY = 'license-policy',
   UNKNOWN = 'unknown',
   AI_PERSONA_SERVICE = 'ai-persona-service',
 }

src/common/enums/authorization.privilege.ts

@@ -26,11 +26,9 @@ export enum AuthorizationPrivilege {
   CREATE_INNOVATION_HUB = 'create-innovation-hub',
   FILE_UPLOAD = 'file-upload',
   FILE_DELETE = 'file-delete',
-  UPDATE_WHITEBOARD = 'update-whiteboard',
   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
@@ -43,7 +41,6 @@ export enum AuthorizationPrivilege {
   MOVE_CONTRIBUTION = 'move-contribution',
   ACCESS_INTERACTIVE_GUIDANCE = 'access-interactive-guidance',
   ACCESS_VIRTUAL_CONTRIBUTOR = 'access-virtual-contributor',
-  ACCESS_DASHBOARD_REFRESH = 'access-dashboard-refresh',
   UPDATE_CONTENT = 'update-content',
   SAVE_AS_TEMPLATE = 'save-as-template',
   TRANSFER_RESOURCE = 'transfer-resource',

src/common/enums/logging.context.ts

@@ -26,7 +26,6 @@ export enum LogContext {
   SEARCH_EXTRACT = 'search-extract',
   SEARCH_RESULT = 'search-result',
   OPPORTUNITY = 'opportunity',
-  IPFS = 'ipfs',
   LIFECYCLE = 'lifecycle',
   UNSPECIFIED = 'not_specified',
   NOTIFICATIONS = 'notifications',

src/common/exceptions/http/index.ts

@@ -2,4 +2,3 @@ export * from './base.http.exception';
 
 export * from './forbidden.http.exception';
 export * from './not.found.http.exception';
-export * from './ipfs.not.found.http.exception';

src/common/utils/convert-to-entity/convert.to.entity.ts

@@ -0,0 +1,39 @@
+import { PrefixKeys } from '@src/types';
+
+/**
+ * Expects a raw entity as input and converts it to a full typeorm entity.
+ * The raw input is returned as a result from building typerom queries
+ * and returned the result as raw data.
+ * The entity usually is prefixed with the alias of the joined table.
+ *
+ * Example:
+ * await this.calendarRepository
+ *  .createQueryBuilder('calendar')
+ *  .where({ id: calendarId })
+ *  .leftJoinAndSelect(
+ *    'space',
+ *    'space',
+ *    'space.collaborationId = collaboration.id'
+ *  )
+ *  .getRawOne<PrefixKeys<Space, 'space_'>>();
+ *
+ *  const space = convertToEntity(rawSpace, 'space_');
+ *
+ * @param prefixedEntity
+ * @param prefix
+ */
+export const convertToEntity = <
+  T extends Record<string, any>,
+  P extends string,
+>(
+  prefixedEntity: PrefixKeys<T, P>,
+  prefix: P
+): T => {
+  return Object.keys(prefixedEntity).reduce((acc, key) => {
+    const newKey = key.replace(prefix, '') as keyof T;
+    acc[newKey] = prefixedEntity[
+      key as keyof PrefixKeys<T, P>
+    ] as unknown as T[keyof T];
+    return acc;
+  }, {} as T);
+};

src/common/utils/convert-to-entity/index.ts

@@ -0,0 +1 @@
+export * from './convert.to.entity';

src/common/utils/get-differences/get.diff.spec.ts

@@ -0,0 +1,46 @@
+import { getDiff } from './get.diff';
+
+describe('getDiff', () => {
+  it('returns null when objects are identical', () => {
+    const obj1 = { a: 1, b: 2 };
+    const obj2 = { a: 1, b: 2 };
+    const result = getDiff(obj1, obj2);
+    expect(result).toBeNull();
+  });
+
+  it('returns differences when objects have different values', () => {
+    const obj1 = { a: 1, b: 2 };
+    const obj2 = { a: 1, b: 3 };
+    const result = getDiff(obj1, obj2);
+    expect(result).toEqual({ b: 3 });
+  });
+
+  it('returns differences when objects have some different nested values', () => {
+    const obj1 = { a: 1, b: { c: 2, d: 3 } };
+    const obj2 = { a: 1, b: { c: 2, d: 4 } };
+    const result = getDiff(obj1, obj2);
+    expect(result).toEqual({ b: { d: 4 } });
+  });
+
+  it('returns differences when objects have all different nested values', () => {
+    const obj1 = { a: 1, b: { c: 2, d: 3 } };
+    const obj2 = { a: 1, b: { c: 4, d: 5 } };
+    const result = getDiff(obj1, obj2);
+    expect(result).toEqual({ b: { c: 4, d: 5 } });
+  });
+
+  it('returns null when nested objects are identical', () => {
+    const obj1 = { a: 1, b: { c: 2, d: 3 } };
+    const obj2 = { a: 1, b: { c: 2, d: 3 } };
+    const result = getDiff(obj1, obj2);
+    expect(result).toBeNull();
+  });
+
+  it('returns null when objects have different keys', () => {
+    type Type = { a: number; b?: number; c?: number };
+    const obj1: Type = { a: 1, b: 2 };
+    const obj2: Type = { a: 1, c: 3 };
+    const result = getDiff(obj1, obj2);
+    expect(result).toBeNull();
+  });
+});

src/common/utils/get-differences/get.diff.ts

@@ -0,0 +1,39 @@
+/**
+ * Compares the first object to the second and returns the differences.
+ * Comparison is done against the keys in obj1.
+ * Return __null__ if no differences are found.
+ *
+ * @template T - The type of the objects being compared.
+ * @param {T} obj1 - The first object to compare.
+ * @param {T} obj2 - The second object to compare.
+ * @returns {Partial<T> | null} - A partial object containing the differences, or null if no differences are found.
+ */
+export const getDiff = <T extends Record<string, any>>(
+  obj1: T,
+  obj2: T
+): Partial<T> | null => {
+  const result: Partial<T> = {};
+
+  for (const key in obj1) {
+    if (obj1.hasOwnProperty(key) && obj2.hasOwnProperty(key)) {
+      const value1 = obj1[key];
+      const value2 = obj2[key];
+
+      if (
+        typeof value1 === 'object' &&
+        typeof value2 === 'object' &&
+        value1 !== null &&
+        value2 !== null
+      ) {
+        const nestedDiff = getDiff(value1, value2);
+        if (nestedDiff !== null) {
+          result[key] = nestedDiff as T[Extract<keyof T, string>];
+        }
+      } else if (value1 !== value2) {
+        result[key] = value2;
+      }
+    }
+  }
+
+  return Object.keys(result).length ? result : null;
+};

src/common/utils/get-differences/index.ts

@@ -0,0 +1 @@
+export * from './get.diff';