css changes for audits, pvs filters

2025-07-17 21:00:45 +00:00 · 2023-02-15 16:29:54 -06:00
parent 57c02fe7c8
commit 3d3f7efa1d
9 changed files with 269 additions and 62 deletions
--- a/package.json
+++ b/package.json
@ -11,8 +11,8 @@
      "@mui/material": "5.11.1",
      "@mui/styles": "5.11.1",
      "@mui/system": "5.11.1",
-      "@mui/x-data-grid": "5.17.6",
-      "@mui/x-data-grid-pro": "5.17.6",
+      "@mui/x-data-grid": "5.17.23",
+      "@mui/x-data-grid-pro": "5.17.23",
      "@mui/x-license-pro": "5.12.3",
      "@react-jvectormap/core": "1.0.1",
      "@react-jvectormap/unitedstates": "1.0.1",
--- a/src/qqq/components/audits/AuditBody.tsx
+++ b/src/qqq/components/audits/AuditBody.tsx
@ -34,7 +34,7 @@ import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
 import Tooltip from "@mui/material/Tooltip";
 import Typography from "@mui/material/Typography";
-import {useContext, useEffect, useState} from "react";
+import React, {JSXElementConstructor, useContext, useEffect, useState} from "react";
 import QContext from "QContext";
 import Client from "qqq/utils/qqq/Client";
 import ValueUtils from "qqq/utils/qqq/ValueUtils";
@ -58,10 +58,128 @@ function AuditBody({tableMetaData, recordId, record}: Props): JSX.Element
   const [limit, setLimit] = useState(1000);
   const [statusString, setStatusString] = useState("Loading audits...");
   const [auditsByDate, setAuditsByDate] = useState([] as QRecord[][]);
-   const [auditDetailMap, setAuditDetailMap] = useState(null as Map<number, string[]>)
+   const [auditDetailMap, setAuditDetailMap] = useState(null as Map<number, JSX.Element[]>)
+   const [fieldChangeMap, setFieldChangeMap] = useState(null as Map<number, JSX.Element>)
   const [sortDirection, setSortDirection] = useState(localStorage.getItem("audit.sortDirection") === "true");
   const {accentColor} = useContext(QContext);

+   function wrapValue(value: any): JSX.Element
+   {
+      return <span style={{fontWeight: "500", color: " rgb(123, 128, 154)"}}>{value}</span>
+   }
+
+   function wasValue(value: any): JSX.Element
+   {
+      return <span style={{fontWeight: "100", color: " rgb(123, 128, 154)"}}>{value}</span>
+   }
+
+   function getAuditDetailFieldChangeRow(qRecord: QRecord): JSX.Element | null
+   {
+      const message = qRecord.values.get("auditDetail.message");
+      const fieldName = qRecord.values.get("auditDetail.fieldName");
+      const oldValue = qRecord.values.get("auditDetail.oldValue");
+      const newValue = qRecord.values.get("auditDetail.newValue");
+      if(fieldName && (oldValue !== null || newValue !== null))
+      {
+         const fieldLabel = tableMetaData?.fields?.get(fieldName)?.label ?? fieldName
+         return (<tr><td>{fieldLabel}</td><td>{oldValue}</td><td>{newValue}</td></tr>)
+      }
+      return (null);
+   }
+
+   function getAuditDetailElement(qRecord: QRecord): JSX.Element | null
+   {
+      const message = qRecord.values.get("auditDetail.message");
+      const fieldName = qRecord.values.get("auditDetail.fieldName");
+      const oldValue = qRecord.values.get("auditDetail.oldValue");
+      const newValue = qRecord.values.get("auditDetail.newValue");
+      if(fieldName && (oldValue !== null || newValue !== null))
+      {
+         const fieldLabel = tableMetaData?.fields?.get(fieldName)?.label ?? fieldName;
+         if(oldValue !== undefined && newValue !== undefined)
+         {
+            return (<>{fieldLabel}: Changed from {(oldValue)} to <b>{(newValue)}</b></>);
+         }
+         else if(newValue !== undefined)
+         {
+            return (<>{fieldLabel}: Set to <b>{(newValue)}</b></>);
+         }
+         else if(oldValue !== undefined)
+         {
+            return (<>{fieldLabel}: Removed value {(oldValue)}</>);
+         }
+
+         /*
+         const fieldLabel = <span style={{fontWeight: "700", color: "rgb(52, 71, 103)"}}>{tableMetaData?.fields?.get(fieldName)?.label ?? fieldName}</span>;
+         if(oldValue !== undefined && newValue !== undefined)
+         {
+            return (<>Changed {fieldLabel} from {wrapValue(oldValue)} to {wrapValue(newValue)}</>);
+         }
+         else if(newValue !== undefined)
+         {
+            return (<>Set {fieldLabel} to {wrapValue(newValue)}</>);
+         }
+         else if(oldValue !== undefined)
+         {
+            return (<>Removed {fieldLabel} value {wrapValue(oldValue)}</>);
+         }
+         */
+
+         /*
+         const fieldLabel = <span style={{fontWeight: "700", color: "rgb(52, 71, 103)"}}>{tableMetaData?.fields?.get(fieldName)?.label ?? fieldName}:</span>;
+         if(oldValue !== undefined && newValue !== undefined)
+         {
+            return (<>{fieldLabel} {wrapValue(newValue)} (was {oldValue})</>);
+         }
+         else if(newValue !== undefined)
+         {
+            return (<>{fieldLabel} {wrapValue(newValue)} (was --)</>);
+         }
+         else if(oldValue !== undefined)
+         {
+            return (<>{fieldLabel} {wrapValue("--")} (was {oldValue})</>);
+         }
+         */
+
+         /*
+         const fieldLabel = <span style={{fontWeight: "700", color: "rgb(52, 71, 103)"}}>{tableMetaData?.fields?.get(fieldName)?.label ?? fieldName}:</span>;
+         if(oldValue !== undefined && newValue !== undefined)
+         {
+            return (<>{fieldLabel} {newValue} {wasValue(`(was ${oldValue})`)}</>);
+         }
+         else if(newValue !== undefined)
+         {
+            return (<>{fieldLabel} {newValue} {wasValue("(was --)")}</>);
+         }
+         else if(oldValue !== undefined)
+         {
+            return (<>{fieldLabel} -- {wasValue(`(was ${oldValue})`)}</>);
+         }
+         */
+
+         /*
+         const fieldLabel = <span style={{fontWeight: "700", color: "rgb(52, 71, 103)"}}>{tableMetaData?.fields?.get(fieldName)?.label ?? fieldName}:</span>;
+         if(oldValue !== undefined && newValue !== undefined)
+         {
+            return (<>{fieldLabel} Changed to {wrapValue(newValue)} (was {oldValue})</>);
+         }
+         else if(newValue !== undefined)
+         {
+            return (<>{fieldLabel} Set to {wrapValue(newValue)}</>);
+         }
+         else if(oldValue !== undefined)
+         {
+            return (<>{fieldLabel} Removed value (was {oldValue})</>);
+         }
+         */
+      }
+      else if(message)
+      {
+         return (<>{message}</>);
+      }
+      return (null);
+   }
+
   useEffect(() =>
   {
      (async () =>
@ -112,7 +230,8 @@ function AuditBody({tableMetaData, recordId, record}: Props): JSX.Element
         // group the audits by auditId (e.g., this is a list that joined audit & auditDetail, so un-flatten it) //
         //////////////////////////////////////////////////////////////////////////////////////////////////////////
         const unflattenedAudits: QRecord[] = []
-         const detailMap: Map<number, string[]> = new Map();
+         const detailMap: Map<number, JSX.Element[]> = new Map();
+         const fieldChangeRowsMap: Map<number, JSX.Element[]> = new Map();
         for (let i = 0; i < audits.length; i++)
         {
            let id = audits[i].values.get("id");
@ -121,7 +240,7 @@ function AuditBody({tableMetaData, recordId, record}: Props): JSX.Element
               unflattenedAudits.push(audits[i]);
            }

-            let auditDetail = audits[i].values.get("auditDetail.message");
+            let auditDetail = getAuditDetailElement(audits[i]);
            if(auditDetail)
            {
               if(!detailMap.has(id))
@ -131,10 +250,45 @@ function AuditBody({tableMetaData, recordId, record}: Props): JSX.Element

               detailMap.get(id).push(auditDetail)
            }
+
+            // table version, probably not to commit
+            let fieldChangeRow = getAuditDetailFieldChangeRow(audits[i]);
+            if(auditDetail)
+            {
+               if(!fieldChangeRowsMap.has(id))
+               {
+                  fieldChangeRowsMap.set(id, []);
+               }
+               // fieldChangeRowsMap.get(id).push(fieldChangeRow)
+            }
         }
         audits = unflattenedAudits;
         setAuditDetailMap(detailMap);
-         console.log(detailMap);
+
+         const fieldChangeMap: Map<number, JSX.Element> = new Map();
+         for (let i = 0; i < unflattenedAudits.length; i++)
+         {
+            let id = unflattenedAudits[i].values.get("id");
+            if(fieldChangeRowsMap.has(id) && fieldChangeRowsMap.get(id).length > 0)
+            {
+               const fieldChangeTable = (
+                  <table style={{fontSize: "0.875rem"}} className="auditDetailTable" cellSpacing="0">
+                     <thead>
+                        <tr>
+                           <td>Field</td>
+                           <td>Old Value</td>
+                           <td>New Value</td>
+                        </tr>
+                     </thead>
+                     <tbody>
+                        {fieldChangeRowsMap.get(id).map((row, key) => <React.Fragment key={key}>{row}</React.Fragment>)}
+                     </tbody>
+                  </table>
+               )
+               fieldChangeMap.set(id, fieldChangeTable);
+            }
+         }
+         setFieldChangeMap(fieldChangeMap)

         //////////////////////////////
         // group the audits by date //
@ -265,11 +419,11 @@ function AuditBody({tableMetaData, recordId, record}: Props): JSX.Element
                                       <Avatar sx={{bgcolor: accentColor, zIndex: 2}}>
                                          <Icon>check</Icon>
                                       </Avatar>
-                                       <Box p={1}>
+                                       <Box p={1} width="100%">
                                          <Box fontSize="0.875rem" color="rgb(123, 128, 154)">
                                             {timestampParts[1]} {timestampParts[2]} {timestampParts[3]} &nbsp; {audit.displayValues.get("auditUserId")}
                                          </Box>
-                                          <Box fontSize="1rem">
+                                          <Box fontSize="0.875rem">
                                             {audit.values.get("message")}
                                          </Box>
                                          <Box fontSize="0.875rem">
@ -282,6 +436,9 @@ function AuditBody({tableMetaData, recordId, record}: Props): JSX.Element
                                                }
                                             </ul>
                                          </Box>
+                                          {
+                                             fieldChangeMap.has(audit.values.get("id")) && fieldChangeMap.get(audit.values.get("id"))
+                                          }
                                       </Box>
                                    </Box>
                                 );
--- a/src/qqq/components/misc/SavedFilters.tsx
+++ b/src/qqq/components/misc/SavedFilters.tsx
@ -413,7 +413,7 @@ function SavedFilters({qController, metaData, tableMetaData, currentSavedFilter,
                              {currentSavedFilter.values.get("label")}
                              {
                                 filterIsModified && (
-                                    <Tooltip sx={{cursor: "pointer"}} title={"The current has been modified, click \"Save...\" to save the changes."}>
+                                    <Tooltip sx={{cursor: "pointer"}} title={"The current filter has been modified, click \"Save...\" to save the changes."}>
                                       <FiberManualRecord sx={{color: "orange", paddingLeft: "2px", paddingTop: "4px"}} />
                                    </Tooltip>
                                 )
--- a/src/qqq/components/widgets/DashboardWidgets.tsx
+++ b/src/qqq/components/widgets/DashboardWidgets.tsx
@ -396,9 +396,9 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, omit
            {
               widgetMetaDataList.map((widgetMetaData, i) => (
                  omitWrappingGridContainer
-                     ? renderWidget(widgetMetaData, i)
+                     ? widgetMetaData && renderWidget(widgetMetaData, i)
                     :
-                     <Grid id={widgetMetaData.name} key={`${widgetMetaData.name}-${i}`} item lg={widgetMetaData.gridColumns ? widgetMetaData.gridColumns : 12} xs={12} sx={{display: "flex", alignItems: "stretch", scrollMarginTop: "100px"}}>
+                     widgetMetaData && <Grid id={widgetMetaData.name} key={`${widgetMetaData.name}-${i}`} item lg={widgetMetaData.gridColumns ? widgetMetaData.gridColumns : 12} xs={12} sx={{display: "flex", alignItems: "stretch", scrollMarginTop: "100px"}}>
                        {renderWidget(widgetMetaData, i)}
                     </Grid>
               ))
--- a/src/qqq/components/widgets/ParentWidget.tsx
+++ b/src/qqq/components/widgets/ParentWidget.tsx
@ -97,6 +97,11 @@ function ParentWidget({urlParams, widgetMetaData, widgetIndex, data, reloadWidge
      reloadWidgetCallback(widgetIndex, data);
   }

+   ///////////////////////////////////////////////////////////////////////////////////////////
+   // if this parent widget is in card form, and its children are too, then we need some px //
+   ///////////////////////////////////////////////////////////////////////////////////////////
+   const px = (widgetMetaData && widgetMetaData.isCard && widgets && widgets[0] && widgets[0].isCard) ? 3 : 0;
+
   // @ts-ignore
   return (
      qInstance && data ? (
@ -106,7 +111,7 @@ function ParentWidget({urlParams, widgetMetaData, widgetIndex, data, reloadWidge
            storeDropdownSelections={storeDropdownSelections}
            reloadWidgetCallback={parentReloadWidgetCallback}
         >
-            <Box sx={{height: "100%", width: "100%"}}>
+            <Box sx={{height: "100%", width: "100%"}} px={px}>
               <DashboardWidgets widgetMetaDataList={widgets} entityPrimaryKey={entityPrimaryKey} tableName={tableName} childUrlParams={childUrlParams} areChildren={true} parentWidgetMetaData={widgetMetaData}/>
            </Box>
         </Widget>
--- a/src/qqq/pages/processes/ProcessRun.tsx
+++ b/src/qqq/pages/processes/ProcessRun.tsx
@ -34,7 +34,7 @@ import {QJobRunning} from "@kingsrook/qqq-frontend-core/lib/model/processes/QJob
 import {QJobStarted} from "@kingsrook/qqq-frontend-core/lib/model/processes/QJobStarted";
 import {QRecord} from "@kingsrook/qqq-frontend-core/lib/model/QRecord";
 import {QQueryFilter} from "@kingsrook/qqq-frontend-core/lib/model/query/QQueryFilter";
-import {Button, CircularProgress, Icon, TablePagination} from "@mui/material";
+import {Alert, Button, CircularProgress, Icon, TablePagination} from "@mui/material";
 import Box from "@mui/material/Box";
 import Card from "@mui/material/Card";
 import Grid from "@mui/material/Grid";
@ -405,8 +405,16 @@ function ProcessRun({process, defaultProcessValues, isModal, isWidget, isReport,
                        component.type === QComponentType.BULK_EDIT_FORM && (
                           tableMetaData && localTableSections ?
                              <Grid container spacing={3} mt={2}>
+                                 {
+                                    localTableSections.length == 0 &&
+                                    <Grid item xs={12}>
+                                       <Alert color="error">There are no editable fields on this table.</Alert>
+                                    </Grid>
+                                 }
                                 <Grid item xs={12} lg={3}>
-                                    <QRecordSidebar tableSections={localTableSections} stickyTop="20px" />
+                                    {
+                                       localTableSections.length > 0 && <QRecordSidebar tableSections={localTableSections} stickyTop="20px" />
+                                    }
                                 </Grid>
                                 <Grid item xs={12} lg={9}>

--- a/src/qqq/pages/records/query/GridFilterOperators.tsx
+++ b/src/qqq/pages/records/query/GridFilterOperators.tsx
@ -87,14 +87,14 @@ function CustomIsAnyInput(type: "number" | "text", props: GridFilterInputValuePr
   {
      event.target.blur();
      setPasteModalIsOpen(true);
-   }
+   };

   const applyValue = (item: GridFilterItem) =>
   {
      console.log(`updating grid values: ${JSON.stringify(item.value)}`);
      setGridFilterItem(item);
      props.applyValue(item);
-   }
+   };

   const clearData = () =>
   {
@ -104,7 +104,7 @@ function CustomIsAnyInput(type: "number" | "text", props: GridFilterInputValuePr
      setInputText("");
      setDetectedText("");
      setCustomDelimiterValue("");
-      setPasteModalIsOpen(false)
+      setPasteModalIsOpen(false);
   };

   const handleCancelClicked = () =>
@ -264,7 +264,7 @@ function CustomIsAnyInput(type: "number" | "text", props: GridFilterInputValuePr

      console.log(`current delimiter is: ${currentDelimiter}, delimiting on: ${currentDelimiterCharacter}`);

-      let regex = new RegExp(currentDelimiterCharacter)
+      let regex = new RegExp(currentDelimiterCharacter);
      let parts = inputText.split(regex);
      let chipData = [] as string[];

@ -351,7 +351,8 @@ function CustomIsAnyInput(type: "number" | "text", props: GridFilterInputValuePr
                                 <FormControl sx={{m: 1, width: "100%"}}>
                                    <ChipTextField
                                       handleChipChange={() =>
-                                       {}}
+                                       {
+                                       }}
                                       chipData={chipData}
                                       chipType={type}
                                       multiline
@ -797,6 +798,31 @@ function InputPossibleValueSourceMultiple(tableName: string, field: QFieldMetaDa
   );
 }

+const getPvsValueString = (value: GridFilterItem["value"]): string =>
+{
+   console.log("get pvs value", value);
+   if (value && value.length)
+   {
+      let labels = [] as string[];
+      for (let i = 0; i < value.length; i++)
+      {
+         if(value[i] && value[i].label)
+         {
+            labels.push(value[i].label);
+         }
+         else
+         {
+            labels.push(value);
+         }
+      }
+      return (labels.join(", "));
+   }
+   else if (value && value.label)
+   {
+      return (value.label);
+   }
+   return (value);
+};

 //////////////////////////////////
 // possible value set operators //
@ -808,34 +834,40 @@ export const buildQGridPvsOperators = (tableName: string, field: QFieldMetaData)
         label: "is",
         value: "is",
         getApplyFilterFn: () => null,
+         getValueAsString: getPvsValueString,
         InputComponent: (props: GridFilterInputValueProps<GridApiCommunity>) => InputPossibleValueSourceSingle(tableName, field, props)
      },
      {
         label: "is not",
         value: "isNot",
         getApplyFilterFn: () => null,
+         getValueAsString: getPvsValueString,
         InputComponent: (props: GridFilterInputValueProps<GridApiCommunity>) => InputPossibleValueSourceSingle(tableName, field, props)
      },
      {
         label: "is any of",
         value: "isAnyOf",
+         getValueAsString: getPvsValueString,
         getApplyFilterFn: () => null,
         InputComponent: (props: GridFilterInputValueProps<GridApiCommunity>) => InputPossibleValueSourceMultiple(tableName, field, props)
      },
      {
         label: "is none of",
         value: "isNone",
+         getValueAsString: getPvsValueString,
         getApplyFilterFn: () => null,
         InputComponent: (props: GridFilterInputValueProps<GridApiCommunity>) => InputPossibleValueSourceMultiple(tableName, field, props)
      },
      {
         label: "is empty",
         value: "isEmpty",
+         getValueAsString: getPvsValueString,
         getApplyFilterFn: (filterItem: GridFilterItem, column: GridColDef) => null
      },
      {
         label: "is not empty",
         value: "isNotEmpty",
+         getValueAsString: getPvsValueString,
         getApplyFilterFn: (filterItem: GridFilterItem, column: GridColDef) => null
      }
   ]);
--- a/src/qqq/pages/records/query/RecordQuery.tsx
+++ b/src/qqq/pages/records/query/RecordQuery.tsx
@ -963,9 +963,9 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
                  Refresh
               </Button>
            </div>
-            <GridToolbarColumnsButton />
+            <GridToolbarColumnsButton nonce={undefined} onResize={undefined} onResizeCapture={undefined} />
            <div style={{position: "relative"}}>
-               <GridToolbarFilterButton />
+               <GridToolbarFilterButton nonce={undefined} onResize={undefined} onResizeCapture={undefined} />
               {
                  hasValidFilters && (

@ -991,8 +991,8 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
                     </div>
                  )
               }
-               <GridToolbarDensitySelector />
-               <GridToolbarExportContainer>
+               <GridToolbarDensitySelector nonce={undefined} onResize={undefined} onResizeCapture={undefined} />
+               <GridToolbarExportContainer nonce={undefined} onResize={undefined} onResizeCapture={undefined}>
                  <ExportMenuItem format="csv" />
                  <ExportMenuItem format="xlsx" />
                  <ExportMenuItem format="json" />
--- a/src/qqq/styles/qqq-override-styles.css
+++ b/src/qqq/styles/qqq-override-styles.css
@ -154,6 +154,11 @@
   align-items: flex-end;
 }

+.MuiDataGrid-filterFormValueInput > div
+{
+   height: auto;
+}
+
 /* make filter dropdowns a bit wider, less likely to need to wrap. */
 .MuiDataGrid-filterForm .MuiDataGrid-filterFormColumnInput
 {