Changes after review

thecalcc · Jun 24, 2024 · 9f57a95 · 9f57a95
1 parent e8a045c
commit 9f57a95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/client/components/fields/editor/EventRelatedPlannings/EmbeddedCoverageForm.tsx b/client/components/fields/editor/EventRelatedPlannings/EmbeddedCoverageForm.tsx
@@ -111,7 +111,7 @@ export class EmbeddedCoverageFormComponent extends React.PureComponent<IProps, I
         };
 
         if ((this.props.coverage.language ?? '').length < 1) {
-            updates.language = newDesk?.desk_language;
+            updates.language = newDesk?.desk_language ?? null;
         }
 
         this.setState({

diff --git a/client/utils/index.ts b/client/utils/index.ts
@@ -544,7 +544,8 @@ export const getItemsById = (ids, items) => (
 export const getUsersForDesk = (desk, globalUserList = []) => {
     if (!desk) return globalUserList;
 
-    return globalUserList.filter(({_id}) => (desk.members ?? []).find((member) => member.user === _id));
+    const deskMembersSet = new Set(desk.members.map((member) => member.user));
+    return globalUserList.filter(({_id}) => deskMembersSet.has(_id));
 };
 
 export const getDesksForUser = (user, desksList = []) => {