Fix: Update texts

Signed-off-by: George J Padayatti <[email protected]>
decentralised-dataexchange · Apr 9, 2024 · b4883d0 · b4883d0
1 parent 5845832
commit b4883d0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/src/container/AddCredential/dataAttributeCardCredentials.tsx b/src/container/AddCredential/dataAttributeCardCredentials.tsx
@@ -23,6 +23,17 @@ interface Props {
 export const DataAttributeCardForDDA = (props: Props) => {
   const { selectedData } = props;
 
+  const splitByDotAndGetLastWord = (text) => {
+      const parts = text.split(".");
+      const lastValue = parts[parts.length - 1];
+      return lastValue
+  }
+
+  const camelCaseToWords = (str) => {
+    const words = str.match(/[A-Z]*[^A-Z]+/g);
+    return words.map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
+  };
+
   return (
     <Box
       style={{
@@ -48,7 +59,7 @@ export const DataAttributeCardForDDA = (props: Props) => {
                   }}
                 >
                   <Typography variant="subtitle2">
-                    {attribute.attribute}
+                    {camelCaseToWords(splitByDotAndGetLastWord(attribute.attribute))}
                   </Typography>
                   <Typography variant="subtitle2">
                     {attribute.value}

diff --git a/src/container/DDAgreements/ddaTable.jsx b/src/container/DDAgreements/ddaTable.jsx
@@ -47,15 +47,15 @@ const DDAtable = ({
 
   const getStatus = (status) => {
     if (status === "unlisted") {
-      return "Unlisted";
+      return "Unlist";
     } else if (status === "awaitingForApproval") {
-      return "In Review";
+      return "Review";
     } else if (status === "approved") {
-      return "Approved";
+      return "Approve";
     } else if (status === "rejected") {
-      return "Rejected";
+      return "Reject";
     } else if (status === "listed") {
-      return "Listed";
+      return "List";
     }
   };
 
@@ -89,7 +89,7 @@ const DDAtable = ({
                   }}
                 >
                   <Tooltip
-                    title={"Publish Data Disclosure Agreement"}
+                    title={"List to Data Marketplace"}
                     placement="top"
                   >
                     <IconButton aria-label="delete">

diff --git a/src/container/DDAgreements/index.tsx b/src/container/DDAgreements/index.tsx
@@ -141,9 +141,9 @@ const DDAgreements = () => {
         <ListDDAModal
           open={isOpenPublish}
           setOpen={setIsOpenPublish}
-          headerText={"Publish Data Disclosure Agreement"}
+          headerText={"List to Data Marketplace"}
           resourceName={"dataDisclosureAgreements"}
-          confirmButtonText={"PUBLISH"}
+          confirmButtonText={"SUBMIT"}
           selectedData={selectedDDA}
           setRefetchTable={setRefetchTable}
           refetchTable={refetchTable}

diff --git a/src/container/DDAgreements/listDDAModal.tsx b/src/container/DDAgreements/listDDAModal.tsx
@@ -115,7 +115,7 @@ export default function ListDDAModal(props: Props) {
               }}
             >
               <Typography variant="subtitle1">
-                Status
+                Status Action:
                 <span style={{ color: "rgba(224, 7, 7, 0.986)" }}>*</span>
               </Typography>
               <Select
@@ -125,12 +125,12 @@ export default function ListDDAModal(props: Props) {
                 variant="outlined"
                 sx={{ marginTop: "5px" }}
                 size="small"
-                defaultValue=""
+                defaultValue={status}
               >
-                <MenuItem value="unlisted">Unlisted</MenuItem>
-                <MenuItem value="awaitingForApproval">In Review</MenuItem>
-                <MenuItem value="listed">Listed</MenuItem>
-                <span style={{ cursor: "not-allowed" }}>
+                <MenuItem value="unlisted">Unlist</MenuItem>
+                <MenuItem value="awaitingForApproval">Review</MenuItem>
+                <MenuItem value="listed">List</MenuItem>
+                {/* <span style={{ cursor: "not-allowed" }}>
                   <MenuItem value="approved" disabled>
                     Approved
                   </MenuItem>
@@ -139,7 +139,7 @@ export default function ListDDAModal(props: Props) {
                   <MenuItem value="rejected" disabled>
                     Rejected
                   </MenuItem>
-                </span>
+                </span> */}
               </Select>
             </Box>
           </Box>