Merge pull request #558 from Ferlab-Ste-Justine/feat/presc-341

feat: PRESC-341 option show ldm assigment
Ferlab-Ste-Justine · Dec 13, 2024 · 7e40ca7 · 7e40ca7
2 parents 35eb315 + b62a4d4
commit 7e40ca7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/packages/ui/Release.md b/packages/ui/Release.md
@@ -1,3 +1,6 @@
+### 10.14.5 2024-12-13
+- feat: PRESC-341 option show ldm assigment
+
 ### 10.14.4 2024-12-11
 - fix: SJIP-1057 remove label and input native tooltips
 

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ferlab/ui",
-    "version": "10.14.4",
+    "version": "10.14.5",
     "description": "Core components for scientific research data portals",
     "publishConfig": {
         "access": "public"

diff --git a/packages/ui/src/components/Assignments/AssignmentsSelect/index.tsx b/packages/ui/src/components/Assignments/AssignmentsSelect/index.tsx
@@ -16,6 +16,7 @@ export type TAssignmentsSelect = {
     assignedPractionnerRoles: string[];
     dictionary?: IAssignmentsDictionary | Record<string, never>;
     loading?: boolean;
+    showLdm?: boolean;
 };
 
 const tagRender =
@@ -57,6 +58,7 @@ const renderOptions = (
     setSearchValue: React.Dispatch<React.SetStateAction<string | undefined>>,
     selectedItems: TPractitionnerInfo[],
     setSelectedItems: React.Dispatch<React.SetStateAction<TPractitionnerInfo[]>>,
+    showLdm: boolean,
 ) =>
     options?.map((value: TPractitionnerInfo) => (
         <Button
@@ -73,6 +75,7 @@ const renderOptions = (
                 email={value.email ? value.email : ''}
                 name={getPractitionnerName(value.name)}
                 organization={value.ldm}
+                showLdm={showLdm}
             />
         </Button>
     ));
@@ -83,6 +86,7 @@ export const AssignmentsSelect = ({
     handleSelect,
     loading,
     options,
+    showLdm = true,
     visibleOptions = false,
 }: TAssignmentsSelect): ReactElement => {
     const noAssignDefaultValue = [
@@ -164,6 +168,7 @@ export const AssignmentsSelect = ({
                     setSearchValue,
                     selectedItems,
                     setSelectedItems,
+                    showLdm,
                 )}
             </ScrollContent>
         </div>

diff --git a/packages/ui/src/components/Assignments/AssignmentsTag/index.tsx b/packages/ui/src/components/Assignments/AssignmentsTag/index.tsx
@@ -17,6 +17,7 @@ export type TAssignmentsTag = {
     handleClose?: () => void;
     unAssign?: boolean;
     dictionary?: IAssignmentsDictionary | Record<string, never>;
+    showLdm?: boolean;
 };
 
 const onPreventMouseDown = (event: React.MouseEvent<HTMLSpanElement>) => {
@@ -31,6 +32,7 @@ export const AssignmentsTag = ({
     handleClose,
     name,
     organization,
+    showLdm = true,
     unAssign = false,
 }: TAssignmentsTag): ReactElement => {
     const { Text } = Typography;
@@ -54,7 +56,7 @@ export const AssignmentsTag = ({
                         <UserAvatar className={styles.userAvatar} size={24} userName={name} />
                         <Space className={styles.userInfo} size={4}>
                             <Text strong>{name}</Text>
-                            <Text type="secondary">{organization}</Text>
+                            {showLdm && <Text type="secondary">{organization}</Text>}
                         </Space>
                     </>
                 )}