Merge pull request #1257 from nickgros/SWC-6776b

SWC-6776 - Get entity type instead of using static text
Sage-Bionetworks · Oct 4, 2024 · e4c6824 · e4c6824
2 parents 0cca79a + d95c033
commit e4c6824
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/packages/synapse-react-client/src/components/EntityAclEditor/EntityAclEditor.test.tsx b/packages/synapse-react-client/src/components/EntityAclEditor/EntityAclEditor.test.tsx
@@ -113,7 +113,7 @@ function verifyInheritsSharingSettingsFromBenefactorMessage() {
 
 function verifyInheritsSharingSettingsPostUploadMessage() {
   screen.getByText(
-    /Currently, the sharing settings are inherited from the project named/,
+    /Currently, the sharing settings are inherited from the \w+ named/,
     { exact: false },
   )
 }

diff --git a/packages/synapse-react-client/src/components/EntityAclEditor/InheritanceMessage.tsx b/packages/synapse-react-client/src/components/EntityAclEditor/InheritanceMessage.tsx
@@ -1,4 +1,9 @@
 import React from 'react'
+import { useGetEntityHeader } from '../../synapse-queries/entity/useGetEntityHeaders'
+import {
+  convertToEntityType,
+  entityTypeToFriendlyName,
+} from '../../utils/functions/EntityTypeUtils'
 import { EntityLink } from '../EntityLink'
 import { Link, Typography } from '@mui/material'
 
@@ -11,11 +16,25 @@ type InheritanceMessageProps = {
 
 export function InheritanceMessage(props: InheritanceMessageProps) {
   const { isProject, isInherited, isAfterUpload = false, benefactorId } = props
+  const { data: benefactorHeader } = useGetEntityHeader(
+    benefactorId,
+    undefined,
+    {
+      enabled: Boolean(benefactorId),
+    },
+  )
+
   if (isAfterUpload) {
     return (
       <>
         <Typography variant={'body1'}>
-          Currently, the sharing settings are inherited from the project named
+          Currently, the sharing settings are inherited from the{' '}
+          {benefactorHeader
+            ? entityTypeToFriendlyName(
+                convertToEntityType(benefactorHeader.type),
+              ).toLowerCase()
+            : 'container'}{' '}
+          named
           {benefactorId ? (
             <>
               {' '}