Merge pull request #1287 from avniproject/WIP

#1181 & #1280 UI fixes
avniproject · Aug 1, 2024 · d985c2b · d985c2b
2 parents 8706c7c + 4d5c6af
commit d985c2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/adminApp/user.js b/src/adminApp/user.js
@@ -171,11 +171,12 @@ const SubjectTypeSyncAttributeShow = ({ subjectType, syncConceptValueMap, ...pro
 const ConceptSyncAttributeShow = ({ subjectType, syncConceptValueMap, syncAttributeName, ...props }) => {
   const syncSettings = get(props.record, ["syncSettings", subjectType.name], {});
   const conceptUUID = get(syncSettings, [syncAttributeName]);
+  const syncConceptName = subjectType[syncAttributeName].name;
   if (isEmpty(conceptUUID)) return null;
 
   return (
     <div>
-      <span style={{ color: "rgba(0, 0, 0, 0.54)", fontSize: "12px", marginRight: 10 }}>{startCase(syncAttributeName)}</span>
+      <span style={{ color: "rgba(0, 0, 0, 0.54)", fontSize: "12px", marginRight: 10 }}>{startCase(syncConceptName)}</span>
       {map(get(syncSettings, `${syncAttributeName}Values`, []), value => (
         <Chip style={{ margin: "0.2em" }} label={syncConceptValueMap.get(value) || value} key={value} />
       ))}

diff --git a/src/formDesigner/components/Dashboard/CreateEditDashboard.js b/src/formDesigner/components/Dashboard/CreateEditDashboard.js
@@ -122,6 +122,7 @@ const CreateEditDashboard = ({ edit, history, operationalModules, getOperational
         {getErrorByKey(error, "EMPTY_NAME")}
         <p />
         <AvniTextField
+          style={{ width: "12em" }}
           multiline
           id="description"
           label="Dashboard Description"

diff --git a/src/formDesigner/components/Dashboard/SelectCardsView.js b/src/formDesigner/components/Dashboard/SelectCardsView.js
@@ -29,7 +29,7 @@ export const SelectCardsView = ({ dashboardSection, addCards }) => {
   return (
     <div>
       <Grid container spacing={2}>
-        <Grid item xs={10}>
+        <Grid item xs={10} style={{ zIndex: 2 }}>
           <Select
             name="addCard"
             ref={cardSelectRef}