Merge branch 'feature/CE-938-order-release-automation' into integration/sprint-43

2025-07-17 21:00:45 +00:00 · 2024-05-31 15:04:52 -05:00
parent 6469d569c0 fe9e20715a
commit aac579232d
4 changed files with 1053 additions and 1257 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx
+++ b/src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx
@ -108,18 +108,32 @@ export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData,
   let columns: QQueryColumns = null;
   let usingDefaultEmptyFilter = false;
   let queryFilter = recordValues["queryFilterJson"] && JSON.parse(recordValues["queryFilterJson"]) as QQueryFilter;
+   const defaultFilterFields = getDefaultFilterFieldNames(widgetMetaData);
   if (!queryFilter)
   {
      queryFilter = new QQueryFilter();
+      if (defaultFilterFields?.length == 0)
+      {
+         usingDefaultEmptyFilter = true;
+      }
+   }
+   else
+   {
+      queryFilter = Object.assign(new QQueryFilter(), queryFilter);
+   }

-      //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // if there is no queryFilter provided, see if there are default fields from which a query should be seeded //
-      //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      const defaultFilterFields = getDefaultFilterFieldNames(widgetMetaData);
+   //////////////////////////////////////////////////////////////////////////////////////////////////////
+   // if there are default fields from which a query should be seeded, add/update the filter with them //
+   //////////////////////////////////////////////////////////////////////////////////////////////////////
   if (defaultFilterFields?.length > 0)
   {
      defaultFilterFields.forEach((fieldName: string) =>
      {
+         ////////////////////////////////////////////////////////////////////////////////////////////
+         // if a value for the default field exists, remove the criteria for it in our query first //
+         ////////////////////////////////////////////////////////////////////////////////////////////
+         queryFilter.criteria = queryFilter.criteria?.filter(c => c.fieldName != fieldName);
+
         if (recordValues[fieldName])
         {
            queryFilter.addCriteria(new QFilterCriteria(fieldName, QCriteriaOperator.EQUALS, [recordValues[fieldName]]));
@ -129,11 +143,6 @@ export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData,
      queryFilter.addOrderBy(new QFilterOrderBy("id", false));
      queryFilter = Object.assign({}, queryFilter);
   }
-      else
-      {
-         usingDefaultEmptyFilter = true;
-      }
-   }

   if (recordValues["columnsJson"])
   {
@ -380,7 +389,7 @@ export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData,
                     </Tooltip>
                  }
                  {
-                     !isEditable && <Box color={colors.gray.main}>Your report has no filters.</Box>
+                     !isEditable && <Box color={colors.gray.main}>No filters are configured.</Box>
                  }
               </Box>
            }
@ -403,7 +412,7 @@ export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData,
                           </Tooltip>
                        }
                        {
-                           !isEditable && <Box color={colors.gray.main}>Your report has no columns.</Box>
+                           !isEditable && <Box color={colors.gray.main}>No columns are selected.</Box>
                        }
                     </Box>
                  }
--- a/src/qqq/components/widgets/misc/RecordGridWidget.tsx
+++ b/src/qqq/components/widgets/misc/RecordGridWidget.tsx
@ -40,7 +40,7 @@ import {Link, useNavigate} from "react-router-dom";
 export interface ChildRecordListData extends WidgetData
 {
   title: string;
-   queryOutput: {records: {values: any}[]}
+   queryOutput: { records: { values: any }[] };
   childTableMetaData: QTableMetaData;
   tablePath: string;
   viewAllLink: string;
@ -75,9 +75,9 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
 {
   const instance = useRef({timer: null});
   const [rows, setRows] = useState([]);
-   const [records, setRecords] = useState([] as QRecord[])
+   const [records, setRecords] = useState([] as QRecord[]);
   const [columns, setColumns] = useState([]);
-   const [allColumns, setAllColumns] = useState([])
+   const [allColumns, setAllColumns] = useState([]);
   const [csv, setCsv] = useState(null as string);
   const [fileName, setFileName] = useState(null as string);
   const [gridMouseDownX, setGridMouseDownX] = useState(0);
@ -123,7 +123,7 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
               if (data.defaultValuesForNewChildRecords[columns[i].field])
               {
                  columns.splice(i, 1);
-                  i--
+                  i--;
               }
            }
         }
@ -145,19 +145,19 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
                  return <Box>
                     {allowRecordEdit && <IconButton onClick={() => editRecordCallback(params.row.__rowIndex)}><Icon>edit</Icon></IconButton>}
                     {allowRecordDelete && <IconButton onClick={() => deleteRecordCallback(params.row.__rowIndex)}><Icon>delete</Icon></IconButton>}
-                  </Box>
-               })
+                  </Box>;
               })
+            });
         }

         setRows(rows);
-         setRecords(records)
+         setRecords(records);
         setColumns(columns);

         let csv = "";
         for (let i = 0; i < allColumns.length; i++)
         {
-            csv += `${i > 0 ? "," : ""}"${ValueUtils.cleanForCsv(allColumns[i].headerName)}"`
+            csv += `${i > 0 ? "," : ""}"${ValueUtils.cleanForCsv(allColumns[i].headerName)}"`;
         }
         csv += "\n";

@ -165,8 +165,8 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
         {
            for (let j = 0; j < allColumns.length; j++)
            {
-               const value = records[i].displayValues.get(allColumns[j].field) ?? records[i].values.get(allColumns[j].field)
-               csv += `${j > 0 ? "," : ""}"${ValueUtils.cleanForCsv(value)}"`
+               const value = records[i].displayValues.get(allColumns[j].field) ?? records[i].values.get(allColumns[j].field);
+               csv += `${j > 0 ? "," : ""}"${ValueUtils.cleanForCsv(value)}"`;
            }
            csv += "\n";
         }
@ -188,7 +188,7 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
         <Typography key={"viewAllLink"} variant="body2" p={2} display="inline" fontSize=".875rem" pt="0" position="relative">
            <Link to={data.viewAllLink}>View All</Link>
         </Typography>
-      )
+      );
   }

   ///////////////////
@ -202,7 +202,7 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo

      if (data.totalRows && data.queryOutput.records.length < data.totalRows)
      {
-         tooltipTitle = "Export these " + data.queryOutput.records.length + " records."
+         tooltipTitle = "Export these " + data.queryOutput.records.length + " records.";
         if (data.viewAllLink)
         {
            tooltipTitle += "\nClick View All to export all records.";
@ -218,9 +218,9 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
      }
      else
      {
-         alert("There is no data available to export.")
-      }
+         alert("There is no data available to export.");
      }
+   };

   if (widgetMetaData?.showExportButton)
   {
@ -234,7 +234,7 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
   ////////////////////
   // add new button //
   ////////////////////
-   const labelAdditionalComponentsRight: LabelComponent[] = []
+   const labelAdditionalComponentsRight: LabelComponent[] = [];
   if (data && data.canAddChildRecord)
   {
      let disabledFields = data.disabledFieldsForNewChildRecords;
@ -242,7 +242,7 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
      {
         disabledFields = data.defaultValuesForNewChildRecords;
      }
-      labelAdditionalComponentsRight.push(new AddNewRecordButton(data.childTableMetaData, data.defaultValuesForNewChildRecords, "Add new", disabledFields, addNewRecordCallback))
+      labelAdditionalComponentsRight.push(new AddNewRecordButton(data.childTableMetaData, data.defaultValuesForNewChildRecords, "Add new", disabledFields, addNewRecordCallback));
   }


@ -258,8 +258,8 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo

      (async () =>
      {
-         const qInstance = await qController.loadMetaData()
-         let tablePath = qInstance.getTablePathByName(data.childTableMetaData.name)
+         const qInstance = await qController.loadMetaData();
+         let tablePath = qInstance.getTablePathByName(data.childTableMetaData.name);
         if (tablePath)
         {
            tablePath = `${tablePath}/${params.row[data.childTableMetaData.primaryKeyField]}`;
@ -304,8 +304,8 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
         labelAdditionalComponentsRight={labelAdditionalComponentsRight}
         labelBoxAdditionalSx={{position: "relative", top: "-0.375rem"}}
      >
-         <Box mx={-2} mb={-3}>
-            <Box className="recordGridWidget">
+         <Box mx={-3} mb={-3}>
+            <Box>
               <DataGridPro
                  autoHeight
                  sx={{
--- a/src/qqq/styles/qqq-override-styles.css
+++ b/src/qqq/styles/qqq-override-styles.css
@ -421,6 +421,14 @@ input[type="search"]::-webkit-search-results-decoration
   font-size: 2rem !important;
 }

+.dashboard-order-release-icon
+{
+   font-size: 1.5rem !important;
+   position: relative;
+   top: -5px;
+   margin-right: 8px;
+}
+
 .dashboard-schedule-icon
 {
   font-size: 1.1rem !important;
@ -703,11 +711,6 @@ input[type="search"]::-webkit-search-results-decoration
   padding: 24px;
 }

-.recordView .widget .recordGridWidget
-{
-   margin: -8px;
-}
-
 .MuiPickersDay-root.Mui-selected, .MuiPickersDay-root.MuiPickersDay-dayWithMargin:hover
 {
   color: white;