#1051 - display UUID along with audit fields for ease of copying

avniproject · Oct 18, 2023 · 687b1a6 · 687b1a6
1 parent c612e46
commit 687b1a6
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 15 deletions.
diff --git a/src/adminApp/ApplicationMenu/ApplicationMenuShow.js b/src/adminApp/ApplicationMenu/ApplicationMenuShow.js
@@ -6,7 +6,7 @@ import { Title } from "react-admin";
 import Button from "@material-ui/core/Button";
 import Grid from "@material-ui/core/Grid";
 import _ from "lodash";
-import { Audit } from "../../formDesigner/components/Audit";
+import { SystemInfo } from "../../formDesigner/components/SystemInfo";
 import RuleDisplay from "../components/RuleDisplay";
 import ApplicationMenuService from "../service/ApplicationMenuService";
 import { ShowLabelValue } from "../../formDesigner/common/ShowLabelValue";
@@ -52,7 +52,7 @@ const ApplicationMenuShow = props => {
                 <p />
               </>
             )}
-            <Audit {...menuItem} />
+            <SystemInfo {...menuItem} />
           </div>
           {editAlert && <Redirect to={"/appDesigner/applicationMenu/" + props.match.params.id} />}
         </Box>

diff --git a/src/adminApp/EncounterType/EncounterTypeShow.js b/src/adminApp/EncounterType/EncounterTypeShow.js
@@ -15,7 +15,7 @@ import {
   findProgramEncounterForm
 } from "../domain/formMapping";
 import { BooleanStatusInShow } from "../../common/components/BooleanStatusInShow";
-import { Audit } from "../../formDesigner/components/Audit";
+import { SystemInfo } from "../../formDesigner/components/SystemInfo";
 import RuleDisplay from "../components/RuleDisplay";
 import { MessageReducer } from "../../formDesigner/components/MessageRule/MessageReducer";
 import { getMessageRules, getMessageTemplates } from "../service/MessageService";
@@ -166,7 +166,7 @@ const EncounterTypeShow = props => {
             readOnly={true}
           />
           <p />
-          <Audit {...encounterType} />
+          <SystemInfo {...encounterType} />
         </div>
 
         {editAlert && <Redirect to={"/appDesigner/encounterType/" + props.match.params.id} />}

diff --git a/src/adminApp/Program/ProgramShow.js b/src/adminApp/Program/ProgramShow.js
@@ -11,7 +11,7 @@ import { ShowSubjectType } from "../WorkFlow/ShowSubjectType";
 import { get, identity } from "lodash";
 import { findProgramEnrolmentForm, findProgramExitForm } from "../domain/formMapping";
 import { BooleanStatusInShow } from "../../common/components/BooleanStatusInShow";
-import { Audit } from "../../formDesigner/components/Audit";
+import { SystemInfo } from "../../formDesigner/components/SystemInfo";
 import RuleDisplay from "../components/RuleDisplay";
 import { MessageReducer } from "../../formDesigner/components/MessageRule/MessageReducer";
 import { getMessageRules, getMessageTemplates } from "../service/MessageService";
@@ -173,7 +173,7 @@ const ProgramShow = props => {
             entityTypeId={program.programId}
             readOnly={true}
           />
-          <Audit {...program} />
+          <SystemInfo {...program} />
         </div>
 
         {editAlert && <Redirect to={"/appDesigner/program/" + props.match.params.id} />}

diff --git a/src/adminApp/SubjectType/SubjectTypeShow.js b/src/adminApp/SubjectType/SubjectTypeShow.js
@@ -12,7 +12,7 @@ import { GroupRoleShow } from "./GroupRoleShow";
 import { findRegistrationForm } from "../domain/formMapping";
 import { useFormMappings, useLocationType } from "./effects";
 import { BooleanStatusInShow } from "../../common/components/BooleanStatusInShow";
-import { Audit } from "../../formDesigner/components/Audit";
+import { SystemInfo } from "../../formDesigner/components/SystemInfo";
 import { AdvancedSettingShow } from "./AdvancedSettingShow";
 import RuleDisplay from "../components/RuleDisplay";
 import { MessageReducer } from "../../formDesigner/components/MessageRule/MessageReducer";
@@ -150,7 +150,7 @@ const SubjectTypeShow = props => {
             />
             {subjectType.group && <GroupRoleShow groupRoles={subjectType.groupRoles} />}
             <AdvancedSettingShow locationTypes={locationTypes} subjectType={subjectType} />
-            <Audit {...subjectType} />
+            <SystemInfo {...subjectType} />
           </div>
           {editAlert && <Redirect to={"/appDesigner/subjectType/" + props.match.params.id} />}
         </Box>

diff --git a/src/documentation/components/Documentation.js b/src/documentation/components/Documentation.js
@@ -9,7 +9,7 @@ import { DocumentationItem } from "./DocumentationItem";
 import { SaveComponent } from "../../common/components/SaveComponent";
 import api from "../api";
 import { cloneForSave } from "../reducers";
-import { Audit } from "../../formDesigner/components/Audit";
+import { SystemInfo } from "../../formDesigner/components/SystemInfo";
 import { Privilege } from "openchs-models";
 import UserInfo from "../../common/model/UserInfo";
 import { connect } from "react-redux";
@@ -96,7 +96,7 @@ const Documentation = ({ userInfo }) => {
       />
       <Box mt={2} />
       {createdBy && (
-        <Audit
+        <SystemInfo
           direction={"row"}
           createdDateTime={createdDateTime}
           lastModifiedDateTime={lastModifiedDateTime}

diff --git a/src/formDesigner/components/ConceptDetails.js b/src/formDesigner/components/ConceptDetails.js
@@ -14,7 +14,7 @@ import Checkbox from "@material-ui/core/Checkbox";
 import { withRouter } from "react-router-dom";
 import { isEmpty, isNil, orderBy } from "lodash";
 import { BooleanStatusInShow } from "../../common/components/BooleanStatusInShow";
-import { Audit } from "./Audit";
+import { SystemInfo } from "./SystemInfo";
 import UserInfo from "../../common/model/UserInfo";
 import { connect } from "react-redux";
 import { Privilege } from "openchs-models";
@@ -311,7 +311,7 @@ function ConceptDetails({ userInfo, ...props }) {
           </>
 
           <p />
-          <Audit {...data} />
+          <SystemInfo {...data} />
         </div>
 
         {editAlert && <Redirect to={"/appdesigner/concept/" + props.match.params.uuid + "/edit"} />}

diff --git a/src/formDesigner/components/SystemInfo.js b/src/formDesigner/components/SystemInfo.js
@@ -2,8 +2,10 @@ import React from "react";
 import { Grid } from "@material-ui/core";
 import FormLabel from "@material-ui/core/FormLabel";
 import { createdAudit, modifiedAudit } from "../../adminApp/components/AuditUtil";
+import _ from "lodash";
 
-export const Audit = ({
+export const SystemInfo = ({
+  uuid,
   createdBy,
   lastModifiedBy,
   createdDateTime,
@@ -40,6 +42,16 @@ export const Audit = ({
             })}
           </span>
         </Grid>
+        {!_.isEmpty(uuid) && (
+          <Grid item container direction={"column"} spacing={1} xs={8}>
+            <Grid item>
+              <FormLabel style={{ fontSize: "13px" }}>UUID </FormLabel>
+            </Grid>
+            <Grid item>
+              <span style={{ fontSize: "15px" }}>{uuid}</span>
+            </Grid>
+          </Grid>
+        )}
       </Grid>
     </Grid>
   );

diff --git a/src/formDesigner/views/FormDetails.js b/src/formDesigner/views/FormDetails.js
@@ -20,7 +20,7 @@ import { Redirect } from "react-router-dom";
 
 import { SaveComponent } from "../../common/components/SaveComponent";
 import FormLevelRules from "../components/FormLevelRules";
-import { Audit } from "../components/Audit";
+import { SystemInfo } from "../components/SystemInfo";
 import StaticFormElementGroup from "../components/StaticFormElementGroup";
 import { DeclarativeRuleHolder } from "rules-config";
 import FormDesignerContext from "./FormDesignerContext";
@@ -1124,7 +1124,7 @@ class FormDetails extends Component {
               </Droppable>
             </DragDropContext>
 
-            <Audit {...this.state.form} direction={"row"} />
+            <SystemInfo {...this.state.form} direction={"row"} />
             {/* </div> */}
           </TabContainer>