Merge pull request #2092 from romanesko/fix-1950-workspace-logo

🛠 fix getting config for console
linagora · Apr 15, 2022 · 7bba622 · 7bba622
2 parents 8a16cfa + ec713cd
commit 7bba622
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/twake/backend/node/src/services/workspaces/web/controllers/workspaces.ts b/twake/backend/node/src/services/workspaces/web/controllers/workspaces.ts
@@ -22,6 +22,7 @@ import { getWorkspaceRooms } from "../../realtime";
 import { CrudException } from "../../../../core/platform/framework/api/crud-service";
 import CompanyUser from "../../../user/entities/company_user";
 import gr from "../../../global-resolver";
+import { getLogger, TwakeLogger } from "../../../../core/platform/framework";
 
 export class WorkspacesCrudController
   implements
@@ -32,6 +33,7 @@ export class WorkspacesCrudController
       ResourceDeleteResponse
     >
 {
+  private logger: TwakeLogger;
   private getCompanyUserRole(context: WorkspaceExecutionContext) {
     return gr.services.companies
       .getCompanyUser({ id: context.company_id }, { id: context.user.id })
@@ -183,12 +185,18 @@ export class WorkspacesCrudController
     }
 
     const r = request.body.resource;
+
+    const existedEntity = await gr.services.workspaces.get({
+      company_id: request.params.company_id,
+      id: request.params.id,
+    });
+
     const entity = plainToClass(Workspace, {
       ...{
-        name: r.name,
-        logo: r.logo,
-        isDefault: r.default,
-        isArchived: r.archived,
+        name: r.name || existedEntity?.name,
+        logo: r.logo || existedEntity?.logo,
+        isDefault: r.default || existedEntity?.isDefault,
+        isArchived: r.archived || existedEntity?.isArchived,
       },
       ...{
         group_id: request.params.company_id,
@@ -244,6 +252,10 @@ export class WorkspacesCrudController
       status: "error",
     };
   }
+
+  constructor() {
+    this.logger = getLogger("Workspaces controller");
+  }
 }
 
 function getExecutionContext(