Merge branch 'feature/CE-1107-add-day-by-day-views-for-the' into integration/sprint-40

Merged feature/CE-881-create-basic-saved-reports into integration/sprint-40
2025-07-21 22:58:43 +00:00 · 2024-04-17 23:09:17 -05:00 · 2024-04-17 10:52:31 -05:00 · 2024-04-16 20:39:49 -05:00 · 2024-04-16 18:40:57 -05:00 · 2024-04-16 11:40:37 -05:00
47 changed files with 659 additions and 20340 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -6,7 +6,7 @@
      "@auth0/auth0-react": "1.10.2",
      "@emotion/react": "11.7.1",
      "@emotion/styled": "11.6.0",
-      "@kingsrook/qqq-frontend-core": "1.0.99",
+      "@kingsrook/qqq-frontend-core": "1.0.96",
      "@mui/icons-material": "5.4.1",
      "@mui/material": "5.11.1",
      "@mui/styles": "5.11.1",
--- a/public/index.html
+++ b/public/index.html
@ -25,6 +25,15 @@ Coded by www.creative-tim.com
    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
    <link href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp" rel="stylesheet" />
  </head>
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-X1NV0P06WS"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', 'G-X1NV0P06WS');
+  </script>
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <div id="root"></div>
--- a/src/App.tsx
+++ b/src/App.tsx
@ -664,16 +664,10 @@ export default function App()
   const [dotMenuOpen, setDotMenuOpen] = useState(false);
   const [keyboardHelpOpen, setKeyboardHelpOpen] = useState(false);
   const [helpHelpActive] = useState(queryParams.has("helpHelp"));
-   const [userId, setUserId] = useState(user?.email);
-
-   useEffect(() =>
-   {
-      setUserId(user?.email)
-   }, [user]);
-

   const [googleAnalyticsUtils] = useState(new GoogleAnalyticsUtils());

+
   /*******************************************************************************
    **
    *******************************************************************************/
@ -695,7 +689,6 @@ export default function App()
            dotMenuOpen: dotMenuOpen,
            keyboardHelpOpen: keyboardHelpOpen,
            helpHelpActive: helpHelpActive,
-            userId: userId,
            setPageHeader: (header: string | JSX.Element) => setPageHeader(header),
            setAccentColor: (accentColor: string) => setAccentColor(accentColor),
            setAccentColorLight: (accentColorLight: string) => setAccentColorLight(accentColorLight),
--- a/src/QContext.tsx
+++ b/src/QContext.tsx
@ -59,7 +59,6 @@ interface QContext
   pathToLabelMap?: {[path: string]: string};
   branding?: QBrandingMetaData;
   helpHelpActive?: boolean;
-   userId?: string;
 }

 const defaultState = {
--- a/src/main/java/com/kingsrook/qqq/frontend/materialdashboard/model/metadata/MaterialDashboardTableMetaData.java
+++ b/src/main/java/com/kingsrook/qqq/frontend/materialdashboard/model/metadata/MaterialDashboardTableMetaData.java
@ -133,17 +133,6 @@ public class MaterialDashboardTableMetaData extends QSupplementalTableMetaData
      validateListOfFieldNames(tableMetaData, defaultQuickFilterFieldNames, qInstanceValidator, prefix + "defaultQuickFilterFieldNames: ");

      for(FieldRule fieldRule : CollectionUtils.nonNullList(fieldRules))
-      {
-         validateFieldRule(qInstance, tableMetaData, qInstanceValidator, fieldRule, prefix);
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   static void validateFieldRule(QInstance qInstance, QTableMetaData tableMetaData, QInstanceValidator qInstanceValidator, FieldRule fieldRule, String prefix)
      {
         qInstanceValidator.assertCondition(fieldRule.getTrigger() != null, prefix + "has a fieldRule without a trigger");
         qInstanceValidator.assertCondition(fieldRule.getAction() != null, prefix + "has a fieldRule without an action");
@ -153,18 +142,10 @@ public class MaterialDashboardTableMetaData extends QSupplementalTableMetaData
            qInstanceValidator.assertNoException(() -> tableMetaData.getField(fieldRule.getSourceField()), prefix + "has a fieldRule with an unrecognized sourceField: " + fieldRule.getSourceField());
         }

-      if(StringUtils.hasContent(fieldRule.getTargetField()))
+         if(qInstanceValidator.assertCondition(StringUtils.hasContent(fieldRule.getTargetField()), prefix + "has a fieldRule without a targetField"))
         {
            qInstanceValidator.assertNoException(() -> tableMetaData.getField(fieldRule.getTargetField()), prefix + "has a fieldRule with an unrecognized targetField: " + fieldRule.getTargetField());
         }
-
-      if(StringUtils.hasContent(fieldRule.getTargetWidget()))
-      {
-         if(qInstanceValidator.assertCondition(qInstance.getWidget(fieldRule.getTargetWidget()) != null, prefix + "has a widgetRule with an unrecognized targetWidget: " + fieldRule.getTargetWidget()))
-         {
-            qInstanceValidator.assertCondition(CollectionUtils.nonNullList(tableMetaData.getSections()).stream().anyMatch(s -> fieldRule.getTargetWidget().equals(s.getWidgetName())),
-               prefix + "has a widgetRule with a targetWidget which is not used in any sections on the table");
-         }
      }
   }

--- a/src/main/java/com/kingsrook/qqq/frontend/materialdashboard/model/metadata/fieldrules/FieldRule.java
+++ b/src/main/java/com/kingsrook/qqq/frontend/materialdashboard/model/metadata/fieldrules/FieldRule.java
@ -38,8 +38,6 @@ public class FieldRule implements Serializable
   private FieldRuleAction  action;
   private String           targetField;

-   private String targetWidget;
-


   /*******************************************************************************
@ -164,35 +162,4 @@ public class FieldRule implements Serializable
      return (this);
   }

-
-
-   /*******************************************************************************
-    ** Getter for targetWidget
-    *******************************************************************************/
-   public String getTargetWidget()
-   {
-      return (this.targetWidget);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for targetWidget
-    *******************************************************************************/
-   public void setTargetWidget(String targetWidget)
-   {
-      this.targetWidget = targetWidget;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for targetWidget
-    *******************************************************************************/
-   public FieldRule withTargetWidget(String targetWidget)
-   {
-      this.targetWidget = targetWidget;
-      return (this);
-   }
-
 }
--- a/src/main/java/com/kingsrook/qqq/frontend/materialdashboard/model/metadata/fieldrules/FieldRuleAction.java
+++ b/src/main/java/com/kingsrook/qqq/frontend/materialdashboard/model/metadata/fieldrules/FieldRuleAction.java
@ -27,6 +27,5 @@ package com.kingsrook.qqq.frontend.materialdashboard.model.metadata.fieldrules;
 *******************************************************************************/
 public enum FieldRuleAction
 {
-   CLEAR_TARGET_FIELD,
-   RELOAD_WIDGET
+   CLEAR_TARGET_FIELD
 }
--- a/src/qqq/components/forms/DynamicFormUtils.ts
+++ b/src/qqq/components/forms/DynamicFormUtils.ts
@ -175,20 +175,12 @@ class DynamicFormUtils
                     initialDisplayValue: initialDisplayValue,
                  };
            }
-            else if(processName)
-            {
-               dynamicFormFields[field.name].possibleValueProps =
-                  {
-                     isPossibleValue: true,
-                     processName: processName,
-                     initialDisplayValue: initialDisplayValue,
-                  };
-            }
            else
            {
               dynamicFormFields[field.name].possibleValueProps =
                  {
                     isPossibleValue: true,
+                     processName: processName,
                     initialDisplayValue: initialDisplayValue,
                  };
            }
--- a/src/qqq/components/forms/DynamicSelect.tsx
+++ b/src/qqq/components/forms/DynamicSelect.tsx
@ -28,17 +28,16 @@ import Box from "@mui/material/Box";
 import Switch from "@mui/material/Switch";
 import TextField from "@mui/material/TextField";
 import {ErrorMessage, useFormikContext} from "formik";
+import React, {useEffect, useState} from "react";
 import colors from "qqq/assets/theme/base/colors";
 import MDTypography from "qqq/components/legacy/MDTypography";
 import Client from "qqq/utils/qqq/Client";
-import React, {useEffect, useState} from "react";

 interface Props
 {
   tableName?: string;
   processName?: string;
-   fieldName?: string;
-   possibleValueSourceName?: string;
+   fieldName: string;
   overrideId?: string;
   fieldLabel: string;
   inForm: boolean;
@ -58,8 +57,6 @@ interface Props
 DynamicSelect.defaultProps = {
   tableName: null,
   processName: null,
-   fieldName: null,
-   possibleValueSourceName: null,
   inForm: true,
   initialValue: null,
   initialDisplayValue: null,
@ -76,78 +73,16 @@ DynamicSelect.defaultProps = {
   },
 };

-const {inputBorderColor} = colors;
-
-
-export const getAutocompleteOutlinedStyle = (isDisabled: boolean) =>
-{
-   return ({
-      "& .MuiOutlinedInput-root": {
-         borderRadius: "0.75rem",
-      },
-      "& .MuiInputBase-root": {
-         padding: "0.5rem",
-         background: isDisabled ? "#f0f2f5!important" : "initial",
-      },
-      "& .MuiOutlinedInput-root .MuiAutocomplete-input": {
-         padding: "0",
-         fontSize: "1rem"
-      },
-      "& .Mui-disabled .MuiOutlinedInput-notchedOutline": {
-         borderColor: inputBorderColor
-      }
-   });
-}
-
-
 const qController = Client.getInstance();

-function DynamicSelect({tableName, processName, fieldName, possibleValueSourceName, overrideId, fieldLabel, inForm, initialValue, initialDisplayValue, initialValues, onChange, isEditable, isMultiple, bulkEditMode, bulkEditSwitchChangeHandler, otherValues, variant, initiallyOpen}: Props)
+function DynamicSelect({tableName, processName, fieldName, overrideId, fieldLabel, inForm, initialValue, initialDisplayValue, initialValues, onChange, isEditable, isMultiple, bulkEditMode, bulkEditSwitchChangeHandler, otherValues, variant, initiallyOpen}: Props)
 {
   const [open, setOpen] = useState(initiallyOpen);
   const [options, setOptions] = useState<readonly QPossibleValue[]>([]);
   const [searchTerm, setSearchTerm] = useState(null);
   const [firstRender, setFirstRender] = useState(true);
   const [otherValuesWhenResultsWereLoaded, setOtherValuesWhenResultsWereLoaded] = useState(JSON.stringify(Object.fromEntries((otherValues))))
-
-   useEffect(() =>
-   {
-      if(tableName && processName)
-      {
-         console.log("DynamicSelect - you may not provide both a tableName and a processName")
-      }
-      if(tableName && !fieldName)
-      {
-         console.log("DynamicSelect - if you provide a tableName, you must also provide a fieldName");
-      }
-      if(processName && !fieldName)
-      {
-         console.log("DynamicSelect - if you provide a processName, you must also provide a fieldName");
-      }
-      if(fieldName && possibleValueSourceName)
-      {
-         console.log("DynamicSelect - if you provide a fieldName and a possibleValueSourceName, the possibleValueSourceName will be ignored");
-      }
-      if(!fieldName && !possibleValueSourceName)
-      {
-         console.log("DynamicSelect - you must provide either a fieldName (and a tableName or processName) or a possibleValueSourceName");
-      }
-      if(fieldName)
-      {
-         if(!tableName || !processName)
-         {
-            console.log("DynamicSelect - if you provide a fieldName, you must also provide a tableName or processName");
-         }
-      }
-      if(possibleValueSourceName)
-      {
-         if(tableName || processName)
-         {
-            console.log("DynamicSelect - if you provide a possibleValueSourceName, you should not also provide a tableName or processName");
-         }
-      }
-
-   }, [tableName, processName, fieldName, possibleValueSourceName]);
+   const {inputBorderColor} = colors;

   ////////////////////////////////////////////////////////////////////////////////////////////////
   // default value - needs to be an array (from initialValues (array) prop) for multiple mode - //
@ -198,7 +133,7 @@ function DynamicSelect({tableName, processName, fieldName, possibleValueSourceNa
      (async () =>
      {
         // console.log(`doing a search with ${searchTerm}`);
-         const results: QPossibleValue[] = await qController.possibleValues(tableName, processName, fieldName ?? possibleValueSourceName, searchTerm ?? "", null, otherValues);
+         const results: QPossibleValue[] = await qController.possibleValues(tableName, processName, fieldName, searchTerm ?? "", null, otherValues);

         if(tableMetaData == null && tableName)
         {
@ -231,7 +166,7 @@ function DynamicSelect({tableName, processName, fieldName, possibleValueSourceNa
            setLoading(true);
            setOptions([]);
            console.log("Refreshing possible values...");
-            const results: QPossibleValue[] = await qController.possibleValues(tableName, processName, fieldName ?? possibleValueSourceName, searchTerm ?? "", null, otherValues);
+            const results: QPossibleValue[] = await qController.possibleValues(tableName, processName, fieldName, searchTerm ?? "", null, otherValues);
            setLoading(false);
            setOptions([ ...results ]);
            setOtherValuesWhenResultsWereLoaded(JSON.stringify(Object.fromEntries(otherValues)));
@ -271,7 +206,7 @@ function DynamicSelect({tableName, processName, fieldName, possibleValueSourceNa
            onChange(value ? new QPossibleValue(value) : null);
         }
      }
-      else if(setFieldValueRef && fieldName)
+      else if(setFieldValueRef)
      {
         setFieldValueRef(fieldName, value ? value.id : null);
      }
@ -347,13 +282,28 @@ function DynamicSelect({tableName, processName, fieldName, possibleValueSourceNa
   let autocompleteSX = {};
   if (variant == "outlined")
   {
-      autocompleteSX = getAutocompleteOutlinedStyle(isDisabled);
+      autocompleteSX = {
+         "& .MuiOutlinedInput-root": {
+            borderRadius: "0.75rem",
+         },
+         "& .MuiInputBase-root": {
+            padding: "0.5rem",
+            background: isDisabled ? "#f0f2f5!important" : "initial",
+         },
+         "& .MuiOutlinedInput-root .MuiAutocomplete-input": {
+            padding: "0",
+            fontSize: "1rem"
+         },
+         "& .Mui-disabled .MuiOutlinedInput-notchedOutline": {
+            borderColor: inputBorderColor
+         }
+      }
   }

   const autocomplete = (
      <Box>
         <Autocomplete
-            id={overrideId ?? fieldName ?? possibleValueSourceName}
+            id={overrideId ?? fieldName}
            sx={autocompleteSX}
            open={open}
            fullWidth
@ -433,7 +383,7 @@ function DynamicSelect({tableName, processName, fieldName, possibleValueSourceNa
            inForm &&
            <Box mt={0.75}>
               <MDTypography component="div" variant="caption" color="error" fontWeight="regular">
-                  {!isDisabled && <div className="fieldErrorMessage"><ErrorMessage name={fieldName ?? possibleValueSourceName} render={msg => <span data-field-error="true">{msg}</span>} /></div>}
+                  {!isDisabled && <div className="fieldErrorMessage"><ErrorMessage name={fieldName} render={msg => <span data-field-error="true">{msg}</span>} /></div>}
               </MDTypography>
            </Box>
         }
--- a/src/qqq/components/forms/EntityForm.tsx
+++ b/src/qqq/components/forms/EntityForm.tsx
@ -43,7 +43,6 @@ import DynamicFormUtils from "qqq/components/forms/DynamicFormUtils";
 import MDTypography from "qqq/components/legacy/MDTypography";
 import HelpContent from "qqq/components/misc/HelpContent";
 import QRecordSidebar from "qqq/components/misc/RecordSidebar";
-import DynamicFormWidget from "qqq/components/widgets/misc/DynamicFormWidget";
 import PivotTableSetupWidget from "qqq/components/widgets/misc/PivotTableSetupWidget";
 import RecordGridWidget, {ChildRecordListData} from "qqq/components/widgets/misc/RecordGridWidget";
 import ReportSetupWidget from "qqq/components/widgets/misc/ReportSetupWidget";
@ -410,19 +409,6 @@ function EntityForm(props: Props): JSX.Element
         />
      }

-      if(widgetMetaData.type == "dynamicForm")
-      {
-         return <DynamicFormWidget
-            key={formValues["savedReportId"]} // todo - pull this from the metaData (could do so above too...)
-            isEditable={true}
-            widgetMetaData={widgetMetaData}
-            widgetData={widgetData}
-            recordValues={formValues}
-            record={record}
-            onSaveCallback={setFormFieldValuesFromWidget}
-         />
-      }
-
      return (<Box>Unsupported widget type: {widgetMetaData.type}</Box>)
   }

@ -496,7 +482,7 @@ function EntityForm(props: Props): JSX.Element
                  return (true);
               }

-               if(widget.type == "reportSetup" || widget.type == "pivotTableSetup" || widget.type == "dynamicForm")
+               if(widget.type == "reportSetup" || widget.type == "pivotTableSetup")
               {
                  return (true);
               }
@ -720,8 +706,7 @@ function EntityForm(props: Props): JSX.Element
            else
            {
               const widgetMetaData = metaData.widgets.get(section.widgetName);
-               const widgetData = await qController.widget(widgetMetaData.name, makeQueryStringWithIdAndObject(tableMetaData, defaultValues));
-
+               const widgetData = await qController.widget(widgetMetaData.name, props.id ? `${tableMetaData.primaryKeyField}=${props.id}` : "");
               newRenderedWidgetSections[section.widgetName] = getWidgetSection(widgetMetaData, widgetData);
               newChildListWidgetData[section.widgetName] = widgetData;
            }
@ -981,51 +966,6 @@ function EntityForm(props: Props): JSX.Element
   };


-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function makeQueryStringWithIdAndObject(tableMetaData: QTableMetaData, object: {[key: string]: any})
-   {
-      const queryParamsArray: string[] = [];
-      if(props.id)
-      {
-         queryParamsArray.push(`${tableMetaData.primaryKeyField}=${encodeURIComponent(props.id)}`)
-      }
-
-      if(object)
-      {
-         for (let key in object)
-         {
-            queryParamsArray.push(`${key}=${encodeURIComponent(object[key])}`)
-         }
-      }
-
-      return (queryParamsArray.join("&"));
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   async function reloadWidget(widgetName: string, additionalQueryParamsForWidget: {[key: string]: any })
-   {
-      const widgetData = await qController.widget(widgetName, makeQueryStringWithIdAndObject(tableMetaData, additionalQueryParamsForWidget));
-      const widgetMetaData = metaData.widgets.get(widgetName);
-
-      /////////////////////////////////////////////////////////////////////////////////////////////////////
-      // todo - rename this - it holds all widget dta, not just child-lists.  also, the type is wrong... //
-      /////////////////////////////////////////////////////////////////////////////////////////////////////
-      const newChildListWidgetData: { [name: string]: ChildRecordListData } = Object.assign({}, childListWidgetData);
-      newChildListWidgetData[widgetName] = widgetData;
-      setChildListWidgetData(newChildListWidgetData);
-
-      const newRenderedWidgetSections = Object.assign({}, renderedWidgetSections);
-      newRenderedWidgetSections[widgetName] = getWidgetSection(widgetMetaData, widgetData);
-      setRenderedWidgetSections(newRenderedWidgetSections);
-      forceUpdate();
-   }
-
-
   /*******************************************************************************
    ** process a form-field having a changed value (e.g., apply field rules).
    *******************************************************************************/
@ -1041,10 +981,6 @@ function EntityForm(props: Props): JSX.Element
                  console.log(`Clearing value from [${fieldRule.targetField}] due to change in [${fieldName}]`);
                  valueChangesToMake[fieldRule.targetField] = null;
                  break;
-               case FieldRuleAction.RELOAD_WIDGET:
-                  const additionalQueryParamsForWidget: {[key: string]: any} = {};
-                  additionalQueryParamsForWidget[fieldRule.sourceField] = newValue;
-                  reloadWidget(fieldRule.targetWidget, additionalQueryParamsForWidget);
            }
         }
      }
--- a/src/qqq/components/query/AssignFilterVariable.tsx
+++ b/src/qqq/components/query/AssignFilterVariable.tsx
@ -1,66 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2023.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {QFieldMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldMetaData";
-import {FilterVariableExpression} from "@kingsrook/qqq-frontend-core/lib/model/query/FilterVariableExpression";
-import Box from "@mui/material/Box";
-import Icon from "@mui/material/Icon";
-import Tooltip from "@mui/material/Tooltip";
-import CriteriaDateField from "qqq/components/query/CriteriaDateField";
-import React, {SyntheticEvent, useState} from "react";
-
-
-export type Expression = FilterVariableExpression;
-
-
-interface AssignFilterButtonProps
-{
-   valueIndex: number;
-   field: QFieldMetaData;
-   valueChangeHandler: (event: React.ChangeEvent | SyntheticEvent, valueIndex?: number | "all", newValue?: any) => void;
-}
-
-CriteriaDateField.defaultProps = {
-   valueIndex: 0,
-   label: "Value",
-   idPrefix: "value-"
-};
-
-export default function AssignFilterVariable({valueIndex, field, valueChangeHandler}: AssignFilterButtonProps): JSX.Element
-{
-   const [isValueAVariable, setIsValueAVariable] = useState(false);
-
-   const handleVariableButtonOnClick = () =>
-   {
-      setIsValueAVariable(!isValueAVariable);
-      const expression = new FilterVariableExpression({fieldName: field.name, valueIndex: valueIndex});
-      valueChangeHandler(null, valueIndex, expression);
-   };
-
-   return <Box display="flex" alignItems="flex-end">
-      <Box>
-         <Tooltip title={`Use a variable as the value for the ${field.name} field`} placement="bottom">
-            <Icon fontSize="small" color="info" sx={{mx: 0.25, cursor: "pointer", position: "relative", top: "2px"}} onClick={handleVariableButtonOnClick}>functions</Icon>
-         </Tooltip>
-      </Box>
-   </Box>;
-}
-
--- a/src/qqq/components/query/BasicAndAdvancedQueryControls.tsx
+++ b/src/qqq/components/query/BasicAndAdvancedQueryControls.tsx
@ -114,7 +114,7 @@ export function getCurrentSortIndicator(queryFilter: QQueryFilter, tableMetaData
 *******************************************************************************/
 const BasicAndAdvancedQueryControls = forwardRef((props: BasicAndAdvancedQueryControlsProps, ref) =>
 {
-   const {metaData, tableMetaData, savedViewsComponent, columnMenuComponent, quickFilterFieldNames, setQuickFilterFieldNames, setQueryFilter, queryFilter, gridApiRef, queryFilterJSON, mode, setMode, queryScreenUsage} = props;
+   const {metaData, tableMetaData, savedViewsComponent, columnMenuComponent, quickFilterFieldNames, setQuickFilterFieldNames, setQueryFilter, queryFilter, gridApiRef, queryFilterJSON, mode, setMode} = props;

   /////////////////////
   // state variables //
@ -682,7 +682,6 @@ const BasicAndAdvancedQueryControls = forwardRef((props: BasicAndAdvancedQueryCo
                                 criteriaParam={getQuickCriteriaParam(fieldName)}
                                 fieldMetaData={field}
                                 defaultOperator={defaultOperator}
-                                 queryScreenUsage={queryScreenUsage}
                                 handleRemoveQuickFilterField={null} />);
                           })
                        }
@ -702,7 +701,6 @@ const BasicAndAdvancedQueryControls = forwardRef((props: BasicAndAdvancedQueryCo
                                 criteriaParam={getQuickCriteriaParam(fieldName)}
                                 fieldMetaData={field}
                                 defaultOperator={defaultOperator}
-                                 queryScreenUsage={queryScreenUsage}
                                 handleRemoveQuickFilterField={handleRemoveQuickFilterField} />);
                           })
                        }
--- a/src/qqq/components/query/CriteriaDateField.tsx
+++ b/src/qqq/components/query/CriteriaDateField.tsx
@ -21,7 +21,6 @@

 import {QFieldMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldMetaData";
 import {QFieldType} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldType";
-import {FilterVariableExpression} from "@kingsrook/qqq-frontend-core/lib/model/query/FilterVariableExpression";
 import {NowExpression} from "@kingsrook/qqq-frontend-core/lib/model/query/NowExpression";
 import {NowWithOffsetExpression, NowWithOffsetOperator, NowWithOffsetUnit} from "@kingsrook/qqq-frontend-core/lib/model/query/NowWithOffsetExpression";
 import {ThisOrLastPeriodExpression, ThisOrLastPeriodOperator, ThisOrLastPeriodUnit} from "@kingsrook/qqq-frontend-core/lib/model/query/ThisOrLastPeriodExpression";
@ -35,14 +34,14 @@ import MenuItem from "@mui/material/MenuItem";
 import {styled} from "@mui/material/styles";
 import TextField from "@mui/material/TextField";
 import Tooltip, {tooltipClasses, TooltipProps} from "@mui/material/Tooltip";
+import React, {SyntheticEvent, useEffect, useReducer, useState} from "react";
 import AdvancedDateTimeFilterValues from "qqq/components/query/AdvancedDateTimeFilterValues";
 import {QFilterCriteriaWithId} from "qqq/components/query/CustomFilterPanel";
 import {EvaluatedExpression} from "qqq/components/query/EvaluatedExpression";
 import {makeTextField} from "qqq/components/query/FilterCriteriaRowValues";
-import React, {SyntheticEvent, useReducer, useState} from "react";


-export type Expression = NowWithOffsetExpression | ThisOrLastPeriodExpression | NowExpression | FilterVariableExpression;
+export type Expression = NowWithOffsetExpression | ThisOrLastPeriodExpression | NowExpression;


 interface CriteriaDateFieldProps
@ -53,7 +52,6 @@ interface CriteriaDateFieldProps
   field: QFieldMetaData;
   criteria: QFilterCriteriaWithId;
   valueChangeHandler: (event: React.ChangeEvent | SyntheticEvent, valueIndex?: number | "all", newValue?: any) => void;
-   allowVariables?: boolean;
 }

 CriteriaDateField.defaultProps = {
@ -62,30 +60,19 @@ CriteriaDateField.defaultProps = {
   idPrefix: "value-"
 };

-export const NoWrapTooltip = styled(({className, children, ...props}: TooltipProps) => (
-   <Tooltip {...props} classes={{popper: className}}>{children}</Tooltip>
-))({
-   [`& .${tooltipClasses.tooltip}`]: {
-      whiteSpace: "nowrap"
-   },
-});
-
-export default function CriteriaDateField({valueIndex, label, idPrefix, field, criteria, valueChangeHandler, allowVariables}: CriteriaDateFieldProps): JSX.Element
+export default function CriteriaDateField({valueIndex, label, idPrefix, field, criteria, valueChangeHandler}: CriteriaDateFieldProps): JSX.Element
 {
-   const [relativeDateTimeOpen, setRelativeDateTimeOpen] = useState(false);
   const [relativeDateTimeMenuAnchorElement, setRelativeDateTimeMenuAnchorElement] = useState(null);
-   const [forceAdvancedDateTimeDialogOpen, setForceAdvancedDateTimeDialogOpen] = useState(false);
+   const [forceAdvancedDateTimeDialogOpen, setForceAdvancedDateTimeDialogOpen] = useState(false)
   const [, forceUpdate] = useReducer((x) => x + 1, 0);

   const openRelativeDateTimeMenu = (event: React.MouseEvent<HTMLElement>) =>
   {
-      setRelativeDateTimeOpen(true);
      setRelativeDateTimeMenuAnchorElement(event.currentTarget);
   };

   const closeRelativeDateTimeMenu = () =>
   {
-      setRelativeDateTimeOpen(false);
      setRelativeDateTimeMenuAnchorElement(null);
   };

@ -150,6 +137,14 @@ export default function CriteriaDateField({valueIndex, label, idPrefix, field, c
   const isExpression = criteria.values && criteria.values[valueIndex] && criteria.values[valueIndex].type;
   const currentExpression = isExpression ? criteria.values[valueIndex] : null;

+   const NoWrapTooltip = styled(({className, children, ...props}: TooltipProps) => (
+      <Tooltip {...props} classes={{popper: className}}>{children}</Tooltip>
+   ))({
+      [`& .${tooltipClasses.tooltip}`]: {
+         whiteSpace: "nowrap"
+      },
+   });
+
   const tooltipMenuItemFromExpression = (valueIndex: number, tooltipPlacement: "left" | "right", expression: Expression) =>
   {
      let startOfPrefix = "";
@ -199,14 +194,14 @@ export default function CriteriaDateField({valueIndex, label, idPrefix, field, c
   return <Box display="flex" alignItems="flex-end">
      {
         isExpression ? makeDateTimeExpressionTextField(criteria.values[valueIndex], valueIndex, label, idPrefix)
-            : makeTextField(field, criteria, valueChangeHandler, valueIndex, label, idPrefix, allowVariables)
+            : makeTextField(field, criteria, valueChangeHandler, valueIndex, label, idPrefix)
      }
      <Box>
         <Tooltip title={`Choose a common relative ${field.type == QFieldType.DATE ? "date" : "date-time"} expression`} placement="bottom">
            <Icon fontSize="small" color="info" sx={{mx: 0.25, cursor: "pointer", position: "relative", top: "2px"}} onClick={openRelativeDateTimeMenu}>date_range</Icon>
         </Tooltip>
         <Menu
-            open={relativeDateTimeOpen}
+            open={relativeDateTimeMenuAnchorElement}
            anchorEl={relativeDateTimeMenuAnchorElement}
            transformOrigin={{horizontal: "left", vertical: "top"}}
            onClose={closeRelativeDateTimeMenu}
--- a/src/qqq/components/query/CustomColumnsPanel.tsx
+++ b/src/qqq/components/query/CustomColumnsPanel.tsx
@ -21,9 +21,7 @@

 import {QInstance} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QInstance";
 import {QTableMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QTableMetaData";
-
-import {FormControlLabel, FormGroup} from "@mui/material";
-import Box from "@mui/material/Box";
+import {Box, FormControlLabel, FormGroup} from "@mui/material";
 import Button from "@mui/material/Button";
 import Icon from "@mui/material/Icon";
 import IconButton from "@mui/material/IconButton";
@ -58,7 +56,7 @@ export const CustomColumnsPanel = forwardRef<any, GridColumnsPanelProps>(
      const someRef = createRef();

      const textRef = useRef(null);
-      const [didInitialFocus, setDidInitialFocus] = useState(false);
+      const [didInitialFocus, setDidInitialFocus] = useState(false)

      const [openGroups, setOpenGroups] = useState(props.initialOpenedGroups || {});
      const openGroupsBecauseOfFilter = {} as { [name: string]: boolean };
@ -195,7 +193,7 @@ export const CustomColumnsPanel = forwardRef<any, GridColumnsPanelProps>(
      sortedColumns.sort((a, b): number =>
      {
         return a.headerName.localeCompare(b.headerName);
-      });
+      })

      for (let i = 0; i < sortedColumns.length; i++)
      {
@ -363,7 +361,7 @@ export const CustomColumnsPanel = forwardRef<any, GridColumnsPanelProps>(
      const changeFilterText = (newValue: string) =>
      {
         setFilterText(newValue);
-         props.filterTextChanger(newValue);
+         props.filterTextChanger(newValue)
      };

      const filterTextChanged = (event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) =>
--- a/src/qqq/components/query/EvaluatedExpression.tsx
+++ b/src/qqq/components/query/EvaluatedExpression.tsx
@ -21,9 +21,9 @@

 import {QFieldMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldMetaData";
 import {QFieldType} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldType";
+import React, {useEffect, useState} from "react";
 import {Expression} from "qqq/components/query/CriteriaDateField";
 import ValueUtils from "qqq/utils/qqq/ValueUtils";
-import React, {useEffect, useState} from "react";

 /*******************************************************************************
 ** Helper component to show value inside tooltips that ticks up every second.
@ -57,11 +57,6 @@ const HOUR_MS = 60 * 60 * 1000;
 const DAY_MS = 24 * 60 * 60 * 1000;
 const evaluateExpression = (time: Date, field: QFieldMetaData, expression: Expression): string =>
 {
-   if (expression.type == "FilterVariableExpression")
-   {
-      return (expression.toString());
-   }
-
   let rs: Date = null;
   if (expression.type == "NowWithOffset")
   {
--- a/src/qqq/components/query/ExportMenuItem.tsx
+++ b/src/qqq/components/query/ExportMenuItem.tsx
@ -46,13 +46,13 @@ export default function ExportMenuItem(props: QExportMenuItemProps)

   const {recordAnalytics} = useContext(QContext);

+   recordAnalytics({category: "tableEvents", action: "export", label: tableMetaData.label});
+
   return (
      <MenuItem
         disabled={totalRecords === 0}
         onClick={() =>
         {
-            recordAnalytics({category: "tableEvents", action: "export", label: tableMetaData.label});
-
            ///////////////////////////////////////////////////////////////////////////////
            // build the list of visible fields.  note, not doing them in-order (in case //
            // the user did drag & drop), because column order model isn't right yet     //
--- a/src/qqq/components/query/FilterCriteriaRow.tsx
+++ b/src/qqq/components/query/FilterCriteriaRow.tsx
@ -72,7 +72,7 @@ export const getValueModeRequiredCount = (valueMode: ValueMode): number =>
      case ValueMode.PVS_MULTI:
         return (null);
   }
-};
+}

 export interface OperatorOption
 {
@ -183,7 +183,7 @@ export const getOperatorOptions = (tableMetaData: QTableMetaData, fieldName: str
   }

   return (operatorOptions);
-};
+}


 interface FilterCriteriaRowProps
@ -200,7 +200,8 @@ interface FilterCriteriaRowProps
 }

 FilterCriteriaRow.defaultProps =
-   {};
+   {
+   };

 export function validateCriteria(criteria: QFilterCriteria, operatorSelectedValue?: OperatorOption): {criteriaIsValid: boolean, criteriaStatusTooltip: string}
 {
--- a/src/qqq/components/query/FilterCriteriaRowValues.tsx
+++ b/src/qqq/components/query/FilterCriteriaRowValues.tsx
@ -23,23 +23,19 @@
 import {QFieldMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldMetaData";
 import {QFieldType} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldType";
 import {QTableMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QTableMetaData";
-import {FilterVariableExpression} from "@kingsrook/qqq-frontend-core/lib/model/query/FilterVariableExpression";
 import Autocomplete from "@mui/material/Autocomplete";
 import Box from "@mui/material/Box";
 import Icon from "@mui/material/Icon";
 import IconButton from "@mui/material/IconButton";
 import InputAdornment from "@mui/material/InputAdornment/InputAdornment";
 import TextField from "@mui/material/TextField";
+import React, {SyntheticEvent, useReducer} from "react";
 import DynamicSelect from "qqq/components/forms/DynamicSelect";
-import AssignFilterVariable from "qqq/components/query/AssignFilterVariable";
-import CriteriaDateField, {NoWrapTooltip} from "qqq/components/query/CriteriaDateField";
+import CriteriaDateField from "qqq/components/query/CriteriaDateField";
 import {QFilterCriteriaWithId} from "qqq/components/query/CustomFilterPanel";
-import {EvaluatedExpression} from "qqq/components/query/EvaluatedExpression";
 import FilterCriteriaPaster from "qqq/components/query/FilterCriteriaPaster";
 import {OperatorOption, ValueMode} from "qqq/components/query/FilterCriteriaRow";
-import {QueryScreenUsage} from "qqq/pages/records/query/RecordQuery";
 import ValueUtils from "qqq/utils/qqq/ValueUtils";
-import React, {SyntheticEvent, useReducer, useState} from "react";

 interface Props
 {
@ -48,8 +44,7 @@ interface Props
   field: QFieldMetaData;
   table: QTableMetaData;
   valueChangeHandler: (event: React.ChangeEvent | SyntheticEvent, valueIndex?: number | "all", newValue?: any) => void;
-   initiallyOpenMultiValuePvs?: boolean;
-   queryScreenUsage?: QueryScreenUsage;
+   initiallyOpenMultiValuePvs?: boolean
 }

 FilterCriteriaRowValues.defaultProps =
@ -77,10 +72,8 @@ export const getTypeForTextField = (field: QFieldMetaData): string =>
   return (type);
 };

-export const makeTextField = (field: QFieldMetaData, criteria: QFilterCriteriaWithId, valueChangeHandler?: (event: (React.ChangeEvent | React.SyntheticEvent), valueIndex?: (number | "all"), newValue?: any) => void, valueIndex: number = 0, label = "Value", idPrefix = "value-", allowVariables = false) =>
+export const makeTextField = (field: QFieldMetaData, criteria: QFilterCriteriaWithId, valueChangeHandler?: (event: (React.ChangeEvent | React.SyntheticEvent), valueIndex?: (number | "all"), newValue?: any) => void, valueIndex: number = 0, label = "Value", idPrefix = "value-") =>
 {
-   const isExpression = criteria.values && criteria.values[valueIndex] && criteria.values[valueIndex].type;
-
   let type = getTypeForTextField(field);
   const inputLabelProps: any = {};

@ -102,6 +95,7 @@ export const makeTextField = (field: QFieldMetaData, criteria: QFilterCriteriaWi
   };


+
   /*******************************************************************************
    ** Event handler for key-down events - specifically added here, to stop pressing
    ** 'tab' in a date or date-time from closing the quick-filter...
@ -118,36 +112,6 @@ export const makeTextField = (field: QFieldMetaData, criteria: QFilterCriteriaWi
      }
   };

-
-   const makeFilterVariableTextField = (expression: FilterVariableExpression, valueIndex: number = 0, label = "Value", idPrefix = "value-") =>
-   {
-      const clearValue = (event: React.MouseEvent<HTMLAnchorElement> | React.MouseEvent<HTMLButtonElement>, index: number) =>
-      {
-         valueChangeHandler(event, index, "");
-         document.getElementById(`${idPrefix}${criteria.id}`).focus();
-      };
-
-      const inputProps2: any = {};
-      inputProps2.endAdornment = (
-         <InputAdornment position="end">
-            <IconButton sx={{visibility: expression ? "visible" : "hidden"}} onClick={(event) => clearValue(event, valueIndex)}>
-               <Icon>closer</Icon>
-            </IconButton>
-         </InputAdornment>
-      );
-
-      return <NoWrapTooltip title={<EvaluatedExpression field={field} expression={expression} />} placement="bottom" enterDelay={1000} sx={{marginLeft: "-75px !important", marginTop: "-8px !important"}}><TextField
-         id={`${idPrefix}${criteria.id}`}
-         label={label}
-         variant="standard"
-         autoComplete="off"
-         InputProps={{disabled: true, readOnly: true, unselectable: "off", ...inputProps2}}
-         InputLabelProps={{shrink: true}}
-         value="${VARIABLE}"
-         fullWidth
-      /></NoWrapTooltip>;
-   };
-
   const inputProps: any = {};
   inputProps.endAdornment = (
      <InputAdornment position="end">
@ -157,12 +121,7 @@ export const makeTextField = (field: QFieldMetaData, criteria: QFilterCriteriaWi
      </InputAdornment>
   );

-   return <Box sx={{margin: 0, padding: 0, display: "flex"}}>
-      {
-         isExpression ? (
-            makeFilterVariableTextField(criteria.values[valueIndex], valueIndex, label, idPrefix)
-         ) : (
-            <TextField
+   return <TextField
      id={`${idPrefix}${criteria.id}`}
      label={label}
      variant="standard"
@ -175,22 +134,12 @@ export const makeTextField = (field: QFieldMetaData, criteria: QFilterCriteriaWi
      InputProps={inputProps}
      fullWidth
      autoFocus={true}
-            />
-         )
-      }
-      {
-         allowVariables && (
-            <AssignFilterVariable field={field} valueChangeHandler={valueChangeHandler} valueIndex={valueIndex} />
-         )
-      }
-   </Box>;
+   />;
 };

-
-function FilterCriteriaRowValues({operatorOption, criteria, field, table, valueChangeHandler, initiallyOpenMultiValuePvs, queryScreenUsage}: Props): JSX.Element
+function FilterCriteriaRowValues({operatorOption, criteria, field, table, valueChangeHandler, initiallyOpenMultiValuePvs}: Props): JSX.Element
 {
   const [, forceUpdate] = useReducer((x) => x + 1, 0);
-   const [allowVariables, setAllowVariables] = useState(queryScreenUsage == "reportSetup");

   if (!operatorOption)
   {
@ -225,7 +174,7 @@ function FilterCriteriaRowValues({operatorOption, criteria, field, table, valueC
      case ValueMode.NONE:
         return null;
      case ValueMode.SINGLE:
-         return makeTextField(field, criteria, valueChangeHandler, 0, undefined, undefined, allowVariables);
+         return makeTextField(field, criteria, valueChangeHandler);
      case ValueMode.SINGLE_DATE:
         return <CriteriaDateField field={field} valueChangeHandler={valueChangeHandler} criteria={criteria} />;
      case ValueMode.DOUBLE_DATE:
@ -234,7 +183,7 @@ function FilterCriteriaRowValues({operatorOption, criteria, field, table, valueC
            <CriteriaDateField field={field} valueChangeHandler={valueChangeHandler} criteria={criteria} valueIndex={1} label="To" idPrefix="to-" />
         </Box>;
      case ValueMode.SINGLE_DATE_TIME:
-         return <CriteriaDateField field={field} valueChangeHandler={valueChangeHandler} criteria={criteria} allowVariables={allowVariables} />;
+         return <CriteriaDateField field={field} valueChangeHandler={valueChangeHandler} criteria={criteria} />;
      case ValueMode.DOUBLE_DATE_TIME:
         return <Box>
            <CriteriaDateField field={field} valueChangeHandler={valueChangeHandler} criteria={criteria} valueIndex={0} label="From" idPrefix="from-" />
@ -243,10 +192,10 @@ function FilterCriteriaRowValues({operatorOption, criteria, field, table, valueC
      case ValueMode.DOUBLE:
         return <Box>
            <Box width="50%" display="inline-block">
-               {makeTextField(field, criteria, valueChangeHandler, 0, "From", "from-", allowVariables)}
+               {makeTextField(field, criteria, valueChangeHandler, 0, "From", "from-")}
            </Box>
            <Box width="50%" display="inline-block">
-               {makeTextField(field, criteria, valueChangeHandler, 1, "To", "to-", allowVariables)}
+               {makeTextField(field, criteria, valueChangeHandler, 1, "To", "to-")}
            </Box>
         </Box>;
      case ValueMode.MULTI:
--- a/src/qqq/components/query/QuickFilter.tsx
+++ b/src/qqq/components/query/QuickFilter.tsx
@ -30,15 +30,14 @@ import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import Menu from "@mui/material/Menu";
 import TextField from "@mui/material/TextField";
+import React, {SyntheticEvent, useContext, useReducer, useState} from "react";
 import QContext from "QContext";
 import {QFilterCriteriaWithId} from "qqq/components/query/CustomFilterPanel";
 import {getDefaultCriteriaValue, getOperatorOptions, getValueModeRequiredCount, OperatorOption, validateCriteria} from "qqq/components/query/FilterCriteriaRow";
 import FilterCriteriaRowValues from "qqq/components/query/FilterCriteriaRowValues";
 import XIcon from "qqq/components/query/XIcon";
-import {QueryScreenUsage} from "qqq/pages/records/query/RecordQuery";
 import FilterUtils from "qqq/utils/qqq/FilterUtils";
 import TableUtils from "qqq/utils/qqq/TableUtils";
-import React, {SyntheticEvent, useContext, useReducer, useState} from "react";

 export type CriteriaParamType = QFilterCriteriaWithId | null | "tooComplex";

@ -51,7 +50,6 @@ interface QuickFilterProps
   updateCriteria: (newCriteria: QFilterCriteria, needDebounce: boolean, doRemoveCriteria: boolean) => void;
   defaultOperator?: QCriteriaOperator;
   handleRemoveQuickFilterField?: (fieldName: string) => void;
-   queryScreenUsage?: QueryScreenUsage;
 }

 QuickFilter.defaultProps =
@ -73,7 +71,7 @@ export const quickFilterButtonStyles = {
   minHeight: "auto",
   padding: "0.375rem 0.625rem", whiteSpace: "nowrap",
   marginBottom: "0.5rem"
-};
+}

 /*******************************************************************************
 ** Test if a CriteriaParamType represents an actual query criteria - or, if it's
@ -109,7 +107,7 @@ const doesOperatorOptionEqualCriteria = (operatorOption: OperatorOption, criteri
   }

   return (false);
-};
+}


 /*******************************************************************************
@ -135,13 +133,13 @@ const getOperatorSelectedValue = (operatorOptions: OperatorOption[], criteria: Q
   }

   return (null);
-};
+}

 /*******************************************************************************
 ** Component to render a QuickFilter - that is - a button, with a Menu under it,
 ** with Operator and Value controls.
 *******************************************************************************/
-export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData, criteriaParam, updateCriteria, defaultOperator, handleRemoveQuickFilterField, queryScreenUsage}: QuickFilterProps): JSX.Element
+export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData, criteriaParam, updateCriteria, defaultOperator, handleRemoveQuickFilterField}: QuickFilterProps): JSX.Element
 {
   const operatorOptions = fieldMetaData ? getOperatorOptions(tableMetaData, fullFieldName) : [];
   const [_, tableForField] = TableUtils.getFieldAndTable(tableMetaData, fullFieldName);
@ -239,7 +237,7 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
      }

      return (false);
-   };
+   }

   /*******************************************************************************
    ** Construct a new criteria object - resetting the values tied to the operator
@ -254,7 +252,7 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
      setOperatorInputValue(operatorOption?.label);
      setCriteria(criteria);
      return(criteria);
-   };
+   }

   /*******************************************************************************
    ** event handler to open the menu in response to the button being clicked.
@ -268,7 +266,7 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
      {
         const element = document.getElementById("value-" + criteria.id);
         element?.focus();
-      });
+      })
   };

   /*******************************************************************************
@ -347,7 +345,6 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
      // @ts-ignore
      const value = newValue !== undefined ? newValue : event ? event.target.value : null;

-      console.log("IN HERE");
      if (!criteria.values)
      {
         criteria.values = [];
@ -385,7 +382,7 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
         const newCriteria = makeNewCriteria();
         updateCriteria(newCriteria, false, true);
      }
-   };
+   }

   /*******************************************************************************
    ** event handler for clicking the (x) icon that turns off this quick filter field.
@ -393,12 +390,12 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
    *******************************************************************************/
   const handleTurningOffQuickFilterField = () =>
   {
-      closeMenu();
+      closeMenu()
      if(handleRemoveQuickFilterField)
      {
         handleRemoveQuickFilterField(criteria?.fieldName);
      }
-   };
+   }

   ////////////////////////////////////////////////////////////////////////////////////
   // if no field was input (e.g., record-query is still loading), return null early //
@ -415,8 +412,8 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
   const maybeNewOperatorSelectedValue = getOperatorSelectedValue(operatorOptions, criteria, defaultOperator);
   if(JSON.stringify(maybeNewOperatorSelectedValue) !== JSON.stringify(operatorSelectedValue))
   {
-      setOperatorSelectedValue(maybeNewOperatorSelectedValue);
-      setOperatorInputValue(maybeNewOperatorSelectedValue?.label);
+      setOperatorSelectedValue(maybeNewOperatorSelectedValue)
+      setOperatorInputValue(maybeNewOperatorSelectedValue?.label)
   }

   /////////////////////////////////////////////////////////////////////////////////////
@ -434,7 +431,7 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
   const tooltipEnterDelay = 500;

   let buttonAdditionalStyles: any = {};
-   let buttonContent = <span>{tableForField?.name != tableMetaData.name ? `${tableForField.label}: ` : ""}{fieldMetaData.label}</span>;
+   let buttonContent = <span>{tableForField?.name != tableMetaData.name ? `${tableForField.label}: ` : ""}{fieldMetaData.label}</span>
   let buttonClassName = "filterNotActive";
   if (criteriaIsValid)
   {
@ -451,7 +448,7 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
      let operatorString = (<>{operatorSelectedValue.label}&nbsp;</>);
      if(operatorSelectedValue.value == QCriteriaOperator.EQUALS || operatorSelectedValue.value == QCriteriaOperator.IN)
      {
-         operatorString = (<></>);
+         operatorString = (<></>)
      }

      buttonContent = (<><span style={{fontWeight: 700}}>{buttonContent}:</span>&nbsp;<span style={{fontWeight: 400}}>{operatorString}{valuesString}</span></>);
@ -502,12 +499,12 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
      {
         handleTurningOffQuickFilterField();
      }
-   };
+   }

   //////////////////////////////
   // return the button & menu //
   //////////////////////////////
-   const widthAndMaxWidth = (fieldMetaData?.type == QFieldType.DATE_TIME) ? 295 : 250;
+   const widthAndMaxWidth = fieldMetaData?.type == QFieldType.DATE_TIME ? 275 : 250
   return (
      <>
         {button}
@ -544,7 +541,6 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData
               </Box>
               <Box width={widthAndMaxWidth} maxWidth={widthAndMaxWidth} className="quickFilter filterValuesColumn">
                  <FilterCriteriaRowValues
-                     queryScreenUsage={queryScreenUsage}
                     operatorOption={operatorSelectedValue}
                     criteria={criteria}
                     field={fieldMetaData}
--- a/src/qqq/components/sharing/ShareModal.tsx
+++ b/src/qqq/components/sharing/ShareModal.tsx
@ -1,482 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-
-import {QTableMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QTableMetaData";
-import {QJobComplete} from "@kingsrook/qqq-frontend-core/lib/model/processes/QJobComplete";
-import {QJobError} from "@kingsrook/qqq-frontend-core/lib/model/processes/QJobError";
-import {QRecord} from "@kingsrook/qqq-frontend-core/lib/model/QRecord";
-import {Alert} from "@mui/material";
-import Autocomplete from "@mui/material/Autocomplete";
-import Box from "@mui/material/Box";
-import Button from "@mui/material/Button";
-import Card from "@mui/material/Card";
-import Icon from "@mui/material/Icon";
-import Modal from "@mui/material/Modal";
-import TextField from "@mui/material/TextField";
-import Tooltip from "@mui/material/Tooltip/Tooltip";
-import Typography from "@mui/material/Typography";
-import FormData from "form-data";
-import colors from "qqq/assets/theme/base/colors";
-import {QCancelButton} from "qqq/components/buttons/DefaultButtons";
-import DynamicSelect, {getAutocompleteOutlinedStyle} from "qqq/components/forms/DynamicSelect";
-import Client from "qqq/utils/qqq/Client";
-import React, {useEffect, useReducer, useState} from "react";
-
-interface ShareModalProps
-{
-   open: boolean;
-   onClose: () => void;
-   tableMetaData: QTableMetaData;
-   record: QRecord;
-}
-
-ShareModal.defaultProps = {};
-
-
-interface CurrentShare
-{
-   shareId: any;
-   scopeId: string;
-   audienceType: string;
-   audienceId: any;
-   audienceLabel: string;
-}
-
-interface Scope
-{
-   id: string;
-   label: string;
-}
-
-const scopeOptions: Scope[] = [
-   {id: "READ_ONLY", label: "Read-Only"},
-   {id: "READ_WRITE", label: "Read and Edit"}
-];
-
-const defaultScope = scopeOptions[0];
-
-const qController = Client.getInstance();
-
-interface ShareableTableMetaData
-{
-   sharedRecordTableName: string;
-   assetIdFieldName: string;
-   scopeFieldName: string;
-   audienceTypesPossibleValueSourceName: string;
-   audiencePossibleValueSourceName: string;
-   thisTableOwnerIdFieldName: string;
-   audienceTypes: {[name: string]: any}; // values here are: ShareableAudienceType
-}
-
-/*******************************************************************************
- ** component containing a Modal dialog for sharing records
- *******************************************************************************/
-export default function ShareModal({open, onClose, tableMetaData, record}: ShareModalProps): JSX.Element
-{
-   const [statusString, setStatusString] = useState("Loading...");
-   const [alert, setAlert] = useState(null as string);
-
-   const [selectedAudienceOption, setSelectedAudienceOption] = useState(null as {id: string, label: string});
-   const [selectedAudienceType, setSelectedAudienceType] = useState(null);
-   const [selectedAudienceId, setSelectedAudienceId] = useState(null);
-   const [selectedScopeId, setSelectedScopeId] = useState(defaultScope.id);
-   const [submitting, setSubmitting] = useState(false);
-
-   const [currentShares, setCurrentShares] = useState([] as CurrentShare[])
-   const [needToLoadCurrentShares, setNeedToLoadCurrentShares] = useState(true);
-   const [everLoadedCurrentShares, setEverLoadedCurrentShares] = useState(false);
-
-   const shareableTableMetaData = tableMetaData.shareableTableMetaData as ShareableTableMetaData;
-
-   const [, forceUpdate] = useReducer((x) => x + 1, 0);
-
-   if(!shareableTableMetaData)
-   {
-      console.error(`Did not find a shareableTableMetaData on table ${tableMetaData.name}`);
-   }
-
-   /////////////////////////////////////////////////////////
-   // trigger initial load, and post any changes, re-load //
-   /////////////////////////////////////////////////////////
-   useEffect(() =>
-   {
-      if(needToLoadCurrentShares)
-      {
-         loadShares();
-      }
-   }, [needToLoadCurrentShares]);
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function close(event: object, reason: string)
-   {
-      if (reason === "backdropClick" || reason === "escapeKeyDown")
-      {
-         return;
-      }
-
-      onClose();
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function handleAudienceChange(value: any | any[], reason: string)
-   {
-      if(value)
-      {
-         const [audienceType, audienceId] = value.id.split(":");
-         setSelectedAudienceType(audienceType);
-         setSelectedAudienceId(audienceId);
-      }
-      else
-      {
-         setSelectedAudienceType(null);
-         setSelectedAudienceId(null);
-      }
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function handleScopeChange(event: React.SyntheticEvent, value: any | any[], reason: string)
-   {
-      if(value)
-      {
-         setSelectedScopeId(value.id);
-      }
-      else
-      {
-         setSelectedScopeId(null);
-      }
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   async function editingExistingShareScope(shareId: number, value: any | any[])
-   {
-      setStatusString("Saving...");
-      setAlert(null);
-
-      const formData = new FormData();
-      formData.append("tableName", tableMetaData.name);
-      formData.append("recordId", record.values.get(tableMetaData.primaryKeyField));
-      formData.append("shareId", shareId);
-      formData.append("scopeId", value.id);
-
-      const processResult = await qController.processRun("editSharedRecord", formData, null, true);
-
-      if (processResult instanceof QJobError)
-      {
-         const jobError = processResult as QJobError;
-         setStatusString(null);
-         setAlert("Error editing shared record: " + jobError.error);
-         setSubmitting(false)
-      }
-      else
-      {
-         const result = processResult as QJobComplete;
-         setStatusString(null);
-         setAlert(null);
-         setNeedToLoadCurrentShares(true);
-         setSubmitting(false)
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   async function loadShares()
-   {
-      setNeedToLoadCurrentShares(false);
-
-      const formData = new FormData();
-      formData.append("tableName", tableMetaData.name);
-      formData.append("recordId", record.values.get(tableMetaData.primaryKeyField));
-      const processResult = await qController.processRun("getSharedRecords", formData, null, true);
-
-      setStatusString("Loading...");
-      setAlert(null)
-
-      if (processResult instanceof QJobError)
-      {
-         const jobError = processResult as QJobError;
-         setStatusString(null);
-         setAlert("Error loading: " + jobError.error);
-      }
-      else
-      {
-         const result = processResult as QJobComplete;
-
-         const newCurrentShares: CurrentShare[] = [];
-         for (let i in result.values["resultList"])
-         {
-            newCurrentShares.push(result.values["resultList"][i].values);
-         }
-         setCurrentShares(newCurrentShares);
-         setEverLoadedCurrentShares(true);
-
-         setStatusString(null);
-         setAlert(null);
-      }
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   async function saveNewShare()
-   {
-      setSubmitting(true)
-      setStatusString("Saving...");
-      setAlert(null);
-
-      const formData = new FormData();
-      formData.append("tableName", tableMetaData.name);
-      formData.append("recordId", record.values.get(tableMetaData.primaryKeyField));
-      formData.append("audienceType", selectedAudienceType);
-      formData.append("audienceId", selectedAudienceId);
-      formData.append("scopeId", selectedScopeId);
-
-      const processResult = await qController.processRun("insertSharedRecord", formData, null, true);
-
-      if (processResult instanceof QJobError)
-      {
-         const jobError = processResult as QJobError;
-         setStatusString(null);
-         setAlert("Error sharing record: " + jobError.error);
-         setSubmitting(false)
-      }
-      else
-      {
-         const result = processResult as QJobComplete;
-         setStatusString(null);
-         setAlert(null);
-         setSelectedAudienceOption(null);
-         setNeedToLoadCurrentShares(true);
-         setSubmitting(false)
-      }
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   async function removeShare(shareId: number)
-   {
-      setStatusString("Deleting...");
-      setAlert(null);
-
-      const formData = new FormData();
-      formData.append("tableName", tableMetaData.name);
-      formData.append("recordId", record.values.get(tableMetaData.primaryKeyField));
-      formData.append("shareId", shareId);
-
-      const processResult = await qController.processRun("deleteSharedRecord", formData, null, true);
-
-      if (processResult instanceof QJobError)
-      {
-         const jobError = processResult as QJobError;
-         setStatusString(null);
-         setAlert("Error deleting share: " + jobError.error);
-      }
-      else
-      {
-         const result = processResult as QJobComplete;
-         setNeedToLoadCurrentShares(true);
-         setStatusString(null);
-         setAlert(null);
-      }
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function getScopeOption(scopeId: string): Scope
-   {
-      for (let scopeOption of scopeOptions)
-      {
-         if(scopeOption.id == scopeId)
-         {
-            return (scopeOption);
-         }
-      }
-
-      return (null);
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function renderScopeDropdown(id: string, defaultValue: Scope, onChange: (event: React.SyntheticEvent, value: any | any[], reason: string) => void)
-   {
-      const isDisabled = (id == "new-share-scope" && submitting);
-      return (
-         <Autocomplete
-            id={id}
-            disabled={isDisabled}
-            renderInput={(params) => (<TextField {...params} label="Scope" variant="outlined" autoComplete="off" type="search" InputProps={{...params.InputProps}} />)}
-            options={scopeOptions}
-            // @ts-ignore
-            defaultValue={defaultValue}
-            onChange={onChange}
-            isOptionEqualToValue={(option, value) => option.id === value.id}
-            // @ts-ignore Property label does not exist on string | {thing with label}
-            getOptionLabel={(option) => option.label}
-            autoSelect={true}
-            autoHighlight={true}
-            disableClearable
-            fullWidth
-            sx={getAutocompleteOutlinedStyle(isDisabled)}
-         />
-      );
-   }
-
-   //////////////////////
-   // render the modal //
-   //////////////////////
-   return (<Modal open={open} onClose={close}>
-      <div className="share">
-         <Box sx={{position: "absolute", overflowY: "auto", maxHeight: "100%", width: "100%", display: "flex", height: "100%", flexDirection: "column", justifyContent: "center"}}>
-            <Card sx={{my: 5, mx: "auto", p: 3}}>
-
-               {/* header */}
-               <Box display="flex" flexDirection="row" justifyContent="space-between" alignItems="flex-start">
-                  <Typography variant="h4" pb={1} fontWeight="600">
-                     Share {tableMetaData.label}: {record?.recordLabel ?? record?.values?.get(tableMetaData.primaryKeyField) ?? "Unknown"}
-                     <Box color={colors.gray.main} pb={"0.5rem"} fontSize={"0.875rem"} fontWeight="400" maxWidth="590px">
-                        {/* todo move to helpContent (what do we attach the meta-data too??) */}
-                        Select a user or a group to share this record with.
-                        You can choose if they should only be able to Read the record, or also make Edits to it.
-                     </Box>
-                     <Box fontSize={14} maxWidth="590px" pb={1} fontWeight="300">
-                        {alert && <Alert color="error" onClose={() => setAlert(null)}>{alert}</Alert>}
-                        {statusString}
-                        {!alert && !statusString && (<>&nbsp;</>)}
-                     </Box>
-                  </Typography>
-               </Box>
-
-               {/* body */}
-               <Box pb={3} display="flex" flexDirection="column">
-                  {/* row for adding a new share */}
-                  <Box display="flex" flexDirection="row" alignItems="center">
-                     <Box width="350px" pr={2} mb={-1.5}>
-                        <DynamicSelect
-                           possibleValueSourceName={shareableTableMetaData.audiencePossibleValueSourceName}
-                           fieldLabel="User or Group" // todo should come from shareableTableMetaData
-                           initialValue={selectedAudienceOption?.id}
-                           initialDisplayValue={selectedAudienceOption?.label}
-                           inForm={false}
-                           onChange={handleAudienceChange}
-                        />
-                     </Box>
-                     <Box width="180px" pr={2}>
-                        {renderScopeDropdown("new-share-scope", defaultScope, handleScopeChange)}
-                     </Box>
-                     <Box>
-                        <Tooltip title={selectedAudienceId == null ? "Select a user or group to share with." : null}>
-                           <span>
-                              <Button disabled={submitting || selectedAudienceId == null} sx={iconButtonSX} onClick={() => saveNewShare()}>
-                                 <Icon color={selectedAudienceId == null ? "secondary" : "info"}>save</Icon>
-                              </Button>
-                           </span>
-                        </Tooltip>
-                     </Box>
-                  </Box>
-
-                  {/* row showing existing shares */}
-                  <Box pt={3}>
-                     <Box pb="0.25rem">
-                        <h5 style={{fontWeight: "600"}}>Current Shares
-                           {
-                              everLoadedCurrentShares ? <>&nbsp;({currentShares.length})</> : <></>
-                           }
-                        </h5>
-                     </Box>
-                     <Box sx={{border: `1px solid ${colors.grayLines.main}`, borderRadius: "1rem", overflow: "hidden"}}>
-                        <Box sx={{overflow: "auto"}} height="210px" pt="0.75rem">
-                           {
-                              currentShares.map((share) => (
-                                 <Box key={share.shareId} display="flex" justifyContent="space-between" alignItems="center" p="0.25rem" pb="0.75rem" fontSize="1rem">
-                                    <Box display="flex" alignItems="center">
-                                       <Box width="310px" pl="1rem">{share.audienceLabel}</Box>
-                                       <Box width="160px">{renderScopeDropdown(`scope-${share.shareId}`, getScopeOption(share.scopeId), (event: React.SyntheticEvent, value: any | any[], reason: string) => editingExistingShareScope(share.shareId, value))}</Box>
-                                    </Box>
-                                    <Box pr="1rem">
-                                       <Button sx={{...iconButtonSX, ...redIconButton}} onClick={() => removeShare(share.shareId)}><Icon>clear</Icon></Button>
-                                    </Box>
-                                 </Box>
-                              ))
-                           }
-                        </Box>
-                     </Box>
-                  </Box>
-
-               </Box>
-
-               {/* footer */}
-               <Box display="flex" flexDirection="row" justifyContent="flex-end">
-                  <QCancelButton label="Done" iconName="check" onClickHandler={() => close(null, null)} disabled={false} />
-               </Box>
-            </Card>
-         </Box>
-      </div>
-   </Modal>);
-
-}
-
-const iconButtonSX =
-   {
-      border: `1px solid ${colors.grayLines.main} !important`,
-      borderRadius: "0.75rem",
-      textTransform: "none",
-      fontSize: "1rem",
-      fontWeight: "400",
-      width: "40px",
-      minWidth: "40px",
-      paddingLeft: 0,
-      paddingRight: 0,
-      color: colors.secondary.main,
-      "&:hover": {color: colors.secondary.main},
-      "&:focus": {color: colors.secondary.main},
-      "&:focus:not(:hover)": {color: colors.secondary.main},
-   };
-
-const redIconButton =
-   {
-      color: colors.error.main,
-      "&:hover": {color: colors.error.main},
-      "&:focus": {color: colors.error.main},
-      "&:focus:not(:hover)": {color: colors.error.main},
-   };
-
--- a/src/qqq/components/widgets/DashboardWidgets.tsx
+++ b/src/qqq/components/widgets/DashboardWidgets.tsx
@ -38,7 +38,6 @@ import StackedBarChart from "qqq/components/widgets/charts/StackedBarChart";
 import CompositeWidget from "qqq/components/widgets/CompositeWidget";
 import DataBagViewer from "qqq/components/widgets/misc/DataBagViewer";
 import DividerWidget from "qqq/components/widgets/misc/Divider";
-import DynamicFormWidget from "qqq/components/widgets/misc/DynamicFormWidget";
 import FieldValueListWidget from "qqq/components/widgets/misc/FieldValueListWidget";
 import PivotTableSetupWidget from "qqq/components/widgets/misc/PivotTableSetupWidget";
 import QuickSightChart from "qqq/components/widgets/misc/QuickSightChart";
@ -262,7 +261,7 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, reco
   {
      const rs: {[name: string]: any} = {};

-      if(record && record.values)
+      if(record.values)
      {
         record.values.forEach((value, key) => rs[key] = value);
      }
@ -597,12 +596,6 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, reco
                  {}} />
               )
            }
-            {
-               widgetMetaData.type === "dynamicForm" && (
-                  widgetData && widgetData[i] &&
-                  <DynamicFormWidget isEditable={false} widgetMetaData={widgetMetaData} widgetData={widgetData[i]} record={record} recordValues={convertQRecordValuesFromMapToObject(record)} />
-               )
-            }
         </Box>
      );
   };
--- a/src/qqq/components/widgets/Widget.tsx
+++ b/src/qqq/components/widgets/Widget.tsx
@ -21,7 +21,8 @@

 import {QTableMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QTableMetaData";
 import {QWidgetMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QWidgetMetaData";
-import {Box, InputLabel} from "@mui/material";
+import {InputLabel} from "@mui/material";
+import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import Card from "@mui/material/Card";
 import Icon from "@mui/material/Icon";
@ -195,6 +196,8 @@ export function HeaderLinkButtonComponent({label, onClickCallback, disabled, dis
 }


+
+
 /*******************************************************************************
 **
 *******************************************************************************/
@ -217,7 +220,7 @@ export function HeaderToggleComponent({label, getValue, onClickCallback, disable
   const onClick = () =>
   {
      onClickCallback();
-   };
+   }

   return (
      <Box alignItems="baseline" mr="-0.75rem">
@ -233,6 +236,7 @@ export function HeaderToggleComponent({label, getValue, onClickCallback, disable
 }


+
 /*******************************************************************************
 **
 *******************************************************************************/
@ -694,7 +698,7 @@ function Widget(props: React.PropsWithChildren<Props>): JSX.Element
   );

   let sublabelElement = (
-      <Box key="sublabel" height="20px">
+      <Box height="20px">
         <Typography sx={{position: "relative", top: "-18px"}} variant="caption">
            {props.widgetData?.sublabel}
         </Typography>
@ -781,7 +785,7 @@ function Widget(props: React.PropsWithChildren<Props>): JSX.Element
                     }
                     {localLabelAdditionalElementsLeft}
                  </Box>
-                  <Box key="sublabelContainer" display="flex">
+                  <Box display="flex">
                     {
                        hasPermission && props.widgetData?.sublabel && (sublabelElement)
                     }
--- a/src/qqq/components/widgets/misc/DynamicFormWidget.tsx
+++ b/src/qqq/components/widgets/misc/DynamicFormWidget.tsx
@ -1,264 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-
-import {QFieldMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldMetaData";
-import {QWidgetMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QWidgetMetaData";
-import {QRecord} from "@kingsrook/qqq-frontend-core/lib/model/QRecord";
-import Box from "@mui/material/Box";
-import {FormikContextType, useFormikContext} from "formik";
-import QDynamicForm from "qqq/components/forms/DynamicForm";
-import DynamicFormUtils from "qqq/components/forms/DynamicFormUtils";
-import Widget from "qqq/components/widgets/Widget";
-import {renderSectionOfFields} from "qqq/pages/records/view/RecordView";
-import Client from "qqq/utils/qqq/Client";
-import React, {useEffect, useState} from "react";
-
-
-/*******************************************************************************
- ** component props
- *******************************************************************************/
-interface DynamicFormWidgetProps
-{
-   isEditable: boolean;
-   widgetMetaData: QWidgetMetaData;
-   widgetData: any;
-   record: QRecord;
-   recordValues: { [name: string]: any };
-   onSaveCallback?: (values: { [name: string]: any }) => void;
-}
-
-
-/*******************************************************************************
- ** default values for props
- *******************************************************************************/
-DynamicFormWidget.defaultProps = {
-   onSaveCallback: null
-};
-
-
-/*******************************************************************************
- ** Component to display a dynamic form - e.g., on a record edit or view screen,
- ** or even within a process.
- *******************************************************************************/
-export default function DynamicFormWidget({isEditable, widgetMetaData, widgetData, record, recordValues, onSaveCallback}: DynamicFormWidgetProps): JSX.Element
-{
-   const [fields, setFields] = useState([] as QFieldMetaData[]);
-
-   const [effectiveIsEditable, setEffectiveIsEditable] = useState(isEditable);
-   if(widgetMetaData.defaultValues.has("isEditable"))
-   {
-      const defaultIsEditableValue = widgetMetaData.defaultValues.get("isEditable")
-      if(defaultIsEditableValue != effectiveIsEditable)
-      {
-         setEffectiveIsEditable(defaultIsEditableValue);
-      }
-   }
-
-   const [dynamicFormFields, setDynamicFormFields] = useState(null as any);
-   const [formValidations, setFormValidations] = useState(null as any);
-
-   const [lastKnowFormValues, setLastKnowFormValues] = useState({} as {[name: string]: any});
-
-
-   //////////////////////////////////////////////////////////////////////////////////////////
-   // on initial load, and any time widgetData changes (e.g., if widget gets re-rendered), //
-   // figure out what our form fields are                                                  //
-   //////////////////////////////////////////////////////////////////////////////////////////
-   useEffect(() =>
-   {
-      setDynamicFormFields({})
-      setFormValidations({})
-
-      if(widgetData && widgetData.fieldList)
-      {
-         const newFields: QFieldMetaData[] = [];
-         for (let i = 0; i < widgetData.fieldList.length; i++)
-         {
-            newFields.push(new QFieldMetaData(widgetData.fieldList[i]));
-         }
-         setFields(newFields);
-
-         if(newFields.length > 0)
-         {
-            const {dynamicFormFields: newDynamicFormFields, formValidations: newFormValidations} = DynamicFormUtils.getFormData(newFields);
-            const defaultDisplayValues = new Map<string,string>(); // todo - seems not right?
-            DynamicFormUtils.addPossibleValueProps(newDynamicFormFields, newFields, recordValues.tableName, null, record ? record.displayValues : defaultDisplayValues);
-            setDynamicFormFields(newDynamicFormFields)
-            setFormValidations(newFormValidations)
-         }
-
-         setLastKnowFormValues({});
-      }
-      else
-      {
-         setFields([])
-      }
-   }, [widgetData]);
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function checkForFormValueChanges(formikProps: FormikContextType<any>)
-   {
-      if(!fields || !fields.length)
-      {
-         return;
-      }
-
-      let anyChanged = false;
-      for (let i = 0; i < fields.length; i++)
-      {
-         const name = fields[i].name;
-         if(formikProps.values[name] != lastKnowFormValues[name])
-         {
-            anyChanged = true;
-            lastKnowFormValues[name] = formikProps.values[name];
-         }
-      }
-
-      if(anyChanged)
-      {
-         const mergedDynamicFormValuesIntoFieldName = widgetData.mergedDynamicFormValuesIntoFieldName;
-         if(mergedDynamicFormValuesIntoFieldName && onSaveCallback)
-         {
-            const onSaveCallbackParam: {[name: string]: any} = {};
-            onSaveCallbackParam[mergedDynamicFormValuesIntoFieldName] = JSON.stringify(lastKnowFormValues);
-            onSaveCallback(onSaveCallbackParam);
-         }
-      }
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function getInitialValue(fieldName: string)
-   {
-      for (let i = 0; i < fields?.length; i++)
-      {
-         if(fields[i].name == fieldName && fields[i].defaultValue)
-         {
-            return (fields[i].defaultValue)
-         }
-      }
-
-      return (null);
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function renderEditForm()
-   {
-      const formikProps = useFormikContext();
-      if(!fields || !fields.length)
-      {
-         return (
-            <Box>
-               <Box fontSize="1rem">{widgetData && widgetData.noFieldsMessage}</Box>
-            </Box>
-         );
-      }
-
-      const formData: any = {};
-      formData.values = formikProps.values;
-      formData.touched = formikProps.touched;
-      formData.errors = formikProps.errors;
-      formData.formFields = {};
-
-      // todo - merge the formValidations object with formik's - maybe in the useEffect where we build it
-      // setValidations(Yup.object().shape(formValidations));
-      // formikProps.validationSchema.
-
-      for (let key of Object.keys(dynamicFormFields))
-      {
-         const dynamicFormField = dynamicFormFields[key];
-         formData.formFields[dynamicFormField.name] = dynamicFormField;
-
-         const initialValue = getInitialValue(dynamicFormField.name);
-         if(initialValue != null)
-         {
-            console.log(`@dk trying to set an initial value [${dynamicFormField.name}] to [${initialValue}]`);
-            // @ts-ignore some any
-            formikProps.initialValues[dynamicFormField.name] = initialValue;
-         }
-      }
-
-      if(formData.values)
-      {
-         checkForFormValueChanges(formikProps);
-      }
-
-      return (
-         <Box>
-            <QDynamicForm formData={formData} record={record} />
-         </Box>
-      );
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function renderViewForm()
-   {
-      const fieldNames: string[] = [];
-      const fieldMap: {[name: string]: QFieldMetaData} = {};
-      const fakeRecord = new QRecord({});
-
-      const mergedDynamicFormValuesIntoFieldName = widgetData.mergedDynamicFormValuesIntoFieldName;
-
-      for (let i = 0; i < fields?.length; i++)
-      {
-         const fieldName = fields[i].name;
-         fieldNames.push(fieldName);
-         fieldMap[fieldName] = fields[i];
-
-         if(mergedDynamicFormValuesIntoFieldName && recordValues[mergedDynamicFormValuesIntoFieldName])
-         {
-            fakeRecord.values.set(fieldName, recordValues[mergedDynamicFormValuesIntoFieldName][fieldName]);
-         }
-      }
-
-      const section = renderSectionOfFields(`dynamicFormWidget:${widgetMetaData.name}`, fieldNames, null, false, fakeRecord, fieldMap);
-
-      return (<Box>
-         {section}
-      </Box>);
-   }
-
-
-   ////////////
-   // render //
-   ////////////
-   return (<Widget widgetMetaData={widgetMetaData}>
-      {
-         <React.Fragment>
-            {effectiveIsEditable ? renderEditForm() : renderViewForm()}
-         </React.Fragment>
-      }
-   </Widget>);
-}
-
--- a/src/qqq/components/widgets/misc/PivotTableSetupWidget.tsx
+++ b/src/qqq/components/widgets/misc/PivotTableSetupWidget.tsx
@ -280,7 +280,7 @@ export default function PivotTableSetupWidget({isEditable, widgetMetaData, recor
      }

      modalPivotTableDefinition[rowsOrColumns].push(new PivotTableGroupBy());
-      validateForm();
+      validateForm()
      forceUpdate();
   }

@ -292,7 +292,7 @@ export default function PivotTableSetupWidget({isEditable, widgetMetaData, recor
   {
      updateUsedGroupByFieldNames(modalPivotTableDefinition);
      updateUsedValueFieldNames(modalPivotTableDefinition);
-      validateForm();
+      validateForm()
      forceUpdate();
   }

@ -308,7 +308,7 @@ export default function PivotTableSetupWidget({isEditable, widgetMetaData, recor
      }

      modalPivotTableDefinition.values.push(new PivotTableValue());
-      validateForm();
+      validateForm()
      forceUpdate();
   }

@ -319,7 +319,7 @@ export default function PivotTableSetupWidget({isEditable, widgetMetaData, recor
   function removeValue(index: number)
   {
      modalPivotTableDefinition.values.splice(index, 1);
-      validateForm();
+      validateForm()
      forceUpdate();
   }

@ -503,7 +503,7 @@ export default function PivotTableSetupWidget({isEditable, widgetMetaData, recor
   const labelAdditionalElementsRight: JSX.Element[] = [];
   if (isEditable)
   {
-      labelAdditionalElementsRight.push(<HeaderToggleComponent key="pivotTableHeader" disabled={editPopupDisabled} disabledTooltip={selectTableFirstTooltipTitle ?? selectColumnsFirstTooltipTitle} label="Use Pivot Table?" getValue={() => enabled} onClickCallback={toggleEnabled} />);
+      labelAdditionalElementsRight.push(<HeaderToggleComponent disabled={editPopupDisabled} disabledTooltip={selectTableFirstTooltipTitle ?? selectColumnsFirstTooltipTitle} label="Use Pivot Table?" getValue={() => enabled} onClickCallback={toggleEnabled} />);
   }


--- a/src/qqq/components/widgets/misc/RecordGridWidget.tsx
+++ b/src/qqq/components/widgets/misc/RecordGridWidget.tsx
@ -185,7 +185,7 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
   if(data && data.viewAllLink)
   {
      labelAdditionalElementsLeft.push(
-         <Typography key={"viewAllLink"} variant="body2" p={2} display="inline" fontSize=".875rem" pt="0" position="relative">
+         <Typography variant="body2" p={2} display="inline" fontSize=".875rem" pt="0" position="relative">
            <Link to={data.viewAllLink}>View All</Link>
         </Typography>
      )
@ -225,8 +225,8 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
   if(widgetMetaData?.showExportButton)
   {
      labelAdditionalElementsLeft.push(
-         <Typography key={"exportButton"} variant="body2" px={0} display="inline" position="relative">
-            <Tooltip title={tooltipTitle}><span><Button sx={{px: 1, py: 0, minWidth: "initial"}} onClick={onExportClick} disabled={isExportDisabled}><Icon sx={{color: "#757575", fontSize: 1.25}}>save_alt</Icon></Button></span></Tooltip>
+         <Typography key={1} variant="body2" px={0} display="inline" position="relative">
+            <Tooltip title={tooltipTitle}><Button sx={{px: 1, py: 0, minWidth: "initial"}} onClick={onExportClick} disabled={isExportDisabled}><Icon sx={{color: "#757575", fontSize: 1.25}}>save_alt</Icon></Button></Tooltip>
         </Typography>
      );
   }
@ -305,7 +305,6 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
         labelBoxAdditionalSx={{position: "relative", top: "-0.375rem"}}
      >
         <Box mx={-2} mb={-3}>
-            <Box className="recordGridWidget">
            <DataGridPro
               autoHeight
               sx={{
@ -349,7 +348,6 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo
               // sortModel={columnSortModel}
            />
         </Box>
-         </Box>
      </Widget>
   );
 }
--- a/src/qqq/components/widgets/misc/ReportSetupWidget.tsx
+++ b/src/qqq/components/widgets/misc/ReportSetupWidget.tsx
@ -124,12 +124,12 @@ export default function ReportSetupWidget({isEditable, widgetMetaData, recordVal
      {
         (async () =>
         {
-            const tableMetaData = await qController.loadTableMetaData(recordValues["tableName"]);
+            const tableMetaData = await qController.loadTableMetaData(recordValues["tableName"])
            setTableMetaData(tableMetaData);

            const queryFilterForFrontend = Object.assign({}, queryFilter);
-            await FilterUtils.cleanupValuesInFilerFromQueryString(qController, tableMetaData, queryFilterForFrontend);
-            setFrontendQueryFilter(queryFilterForFrontend);
+            await FilterUtils.cleanupValuesInFilerFromQueryString(qController, tableMetaData, queryFilterForFrontend)
+            setFrontendQueryFilter(queryFilterForFrontend)
         })();
      }
   }, [recordValues]);
@ -195,7 +195,7 @@ export default function ReportSetupWidget({isEditable, widgetMetaData, recordVal
    *******************************************************************************/
   function renderColumn(column: Column): JSX.Element
   {
-      const [field, table] = FilterUtils.getField(tableMetaData, column.name);
+      const [field, table] = FilterUtils.getField(tableMetaData, column.name)

      if(!column || !column.isVisible || column.name == "__check__" || !field)
      {
@ -269,10 +269,10 @@ export default function ReportSetupWidget({isEditable, widgetMetaData, recordVal
   // add link to widget header for opening modal //
   /////////////////////////////////////////////////
   const selectTableFirstTooltipTitle = tableMetaData ? null : "You must select a table before you can set up your report filters and columns";
-   const labelAdditionalElementsRight: JSX.Element[] = [];
+   const labelAdditionalElementsRight: JSX.Element[] = []
   if(isEditable)
   {
-      labelAdditionalElementsRight.push(<HeaderLinkButtonComponent key="filterAndColumnsHeader" label="Edit Filters and Columns" onClickCallback={openEditor} disabled={tableMetaData == null} disabledTooltip={selectTableFirstTooltipTitle} />);
+      labelAdditionalElementsRight.push(<HeaderLinkButtonComponent label="Edit Filters and Columns" onClickCallback={openEditor} disabled={tableMetaData == null} disabledTooltip={selectTableFirstTooltipTitle} />)
   }


@ -316,7 +316,7 @@ export default function ReportSetupWidget({isEditable, widgetMetaData, recordVal
            <Box display="flex" flexWrap="wrap" fontSize="1rem">
               {
                  mayShowColumnsPreview() &&
-                  columns.columns.map((column, i) => <React.Fragment key={`column-${i}`}>{renderColumn(column)}</React.Fragment>)
+                  columns.columns.map((column, i) => <React.Fragment key={i}>{renderColumn(column)}</React.Fragment>)
               }
               {
                  !mayShowColumnsPreview() &&
--- a/src/qqq/models/fields/FieldRules.ts
+++ b/src/qqq/models/fields/FieldRules.ts
@ -29,7 +29,6 @@ export interface FieldRule
   sourceField: string;
   action: FieldRuleAction;
   targetField: string;
-   targetWidget: string;
 }


@ -47,6 +46,5 @@ export enum FieldRuleTrigger
 *******************************************************************************/
 export enum FieldRuleAction
 {
-   CLEAR_TARGET_FIELD = "CLEAR_TARGET_FIELD",
-   RELOAD_WIDGET = "RELOAD_WIDGET"
+   CLEAR_TARGET_FIELD = "CLEAR_TARGET_FIELD"
 }
--- a/src/qqq/pages/processes/ProcessRun.tsx
+++ b/src/qqq/pages/processes/ProcessRun.tsx
@ -58,7 +58,6 @@ import QRecordSidebar from "qqq/components/misc/RecordSidebar";
 import {GoogleDriveFolderPickerWrapper} from "qqq/components/processes/GoogleDriveFolderPickerWrapper";
 import ProcessSummaryResults from "qqq/components/processes/ProcessSummaryResults";
 import ValidationReview from "qqq/components/processes/ValidationReview";
-import DashboardWidgets from "qqq/components/widgets/DashboardWidgets";
 import BaseLayout from "qqq/layouts/BaseLayout";
 import {TABLE_VARIANT_LOCAL_STORAGE_KEY_ROOT} from "qqq/pages/records/query/RecordQuery";
 import Client from "qqq/utils/qqq/Client";
@ -125,8 +124,6 @@ function ProcessRun({process, table, defaultProcessValues, isModal, isWidget, is
   const [showErrorDetail, setShowErrorDetail] = useState(false);
   const [showFullHelpText, setShowFullHelpText] = useState(false);

-   const [renderedWidgets, setRenderedWidgets] = useState({} as {[step: string]: {[widgetName: string]: any}});
-
   const {pageHeader, recordAnalytics, setPageHeader} = useContext(QContext);

   //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -276,42 +273,6 @@ function ProcessRun({process, table, defaultProcessValues, isModal, isWidget, is
      };
   };

-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   function renderWidget(widgetName: string)
-   {
-      if(!renderedWidgets[activeStep.name])
-      {
-         renderedWidgets[activeStep.name] = {};
-         setRenderedWidgets(renderedWidgets);
-      }
-
-      if(renderedWidgets[activeStep.name][widgetName])
-      {
-         return renderedWidgets[activeStep.name][widgetName];
-      }
-
-      const widgetMetaData = qInstance.widgets.get(widgetName);
-      if(!widgetMetaData)
-      {
-         return (<Alert color="error">Unrecognized widget name: {widgetName}</Alert>);
-      }
-
-      const queryStringParts: string[] = [];
-      for (let name in processValues)
-      {
-         queryStringParts.push(`${name}=${encodeURIComponent(processValues[name])}`)
-      }
-
-      const renderedWidget = (<Box m={-2}>
-         <DashboardWidgets widgetMetaDataList={[widgetMetaData]} omitWrappingGridContainer={true} childUrlParams={queryStringParts.join("&")} />
-      </Box>)
-      renderedWidgets[activeStep.name][widgetName] = renderedWidget;
-      return renderedWidget;
-   }
-
   ////////////////////////////////////////////////////
   // generate the main form body content for a step //
   ////////////////////////////////////////////////////
@ -692,12 +653,6 @@ function ProcessRun({process, table, defaultProcessValues, isModal, isWidget, is
                              </Box>
                           )
                        }
-                        {
-                           component.type === QComponentType.WIDGET && (
-                              component.values?.widgetName &&
-                              renderWidget(component.values?.widgetName)
-                           )
-                        }
                     </div>
                  );
               }))
--- a/src/qqq/pages/records/query/RecordQuery.tsx
+++ b/src/qqq/pages/records/query/RecordQuery.tsx
@ -176,7 +176,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
         {
            return view;
         }
-      };
+      }
   });

   ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -408,10 +408,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
   //////////////////////////////////////////////////////////////////
   // we use our own header - so clear out the context page header //
   //////////////////////////////////////////////////////////////////
-   if (!isModal)
-   {
   setPageHeader(null);
-   }

   //////////////////////
   // ole' faithful... //
@ -486,6 +483,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
   };


+
   /*******************************************************************************
    **
    *******************************************************************************/
@ -749,13 +747,13 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
         const viewForLocalStorage: RecordQueryView = JSON.parse(viewAsJSON);
         if (viewForLocalStorage?.queryFilter?.criteria?.length > 0)
         {
-            FilterUtils.stripAwayIncompleteCriteria(viewForLocalStorage.queryFilter);
+            FilterUtils.stripAwayIncompleteCriteria(viewForLocalStorage.queryFilter)
         }
         localStorageSet(viewLocalStorageKey, JSON.stringify(viewForLocalStorage));
      }
      catch(e)
      {
-         console.log("Error storing view in local storage: " + e);
+         console.log("Error storing view in local storage: " + e)
      }
   };

@ -1436,6 +1434,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
      return (selectedIds.length);
   };

+
   /*******************************************************************************
    ** get a query-string to put on the url to indicate what records are going into
    ** a process.
@ -2981,8 +2980,8 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init

   return (
      <BaseLayout>{body}</BaseLayout>
-   );
-});
+   )
+})


 RecordQuery.defaultProps = {
--- a/src/qqq/pages/records/view/RecordView.tsx
+++ b/src/qqq/pages/records/view/RecordView.tsx
@ -21,7 +21,6 @@

 import {QException} from "@kingsrook/qqq-frontend-core/lib/exceptions/QException";
 import {Capability} from "@kingsrook/qqq-frontend-core/lib/model/metaData/Capability";
-import {QFieldMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldMetaData";
 import {QInstance} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QInstance";
 import {QProcessMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QProcessMetaData";
 import {QTableMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QTableMetaData";
@ -50,13 +49,11 @@ import Tooltip from "@mui/material/Tooltip/Tooltip";
 import QContext from "QContext";
 import colors from "qqq/assets/theme/base/colors";
 import AuditBody from "qqq/components/audits/AuditBody";
-import {QActionsMenuButton, QCancelButton, QDeleteButton, QEditButton, standardWidth} from "qqq/components/buttons/DefaultButtons";
+import {QActionsMenuButton, QCancelButton, QDeleteButton, QEditButton} from "qqq/components/buttons/DefaultButtons";
 import EntityForm from "qqq/components/forms/EntityForm";
-import MDButton from "qqq/components/legacy/MDButton";
 import {GotoRecordButton} from "qqq/components/misc/GotoRecordDialog";
 import HelpContent, {hasHelpContent} from "qqq/components/misc/HelpContent";
 import QRecordSidebar from "qqq/components/misc/RecordSidebar";
-import ShareModal from "qqq/components/sharing/ShareModal";
 import DashboardWidgets from "qqq/components/widgets/DashboardWidgets";
 import BaseLayout from "qqq/layouts/BaseLayout";
 import ProcessRun from "qqq/pages/processes/ProcessRun";
@ -85,51 +82,6 @@ RecordView.defaultProps =

 const TABLE_VARIANT_LOCAL_STORAGE_KEY_ROOT = "qqq.tableVariant";

-
-/*******************************************************************************
- **
- *******************************************************************************/
-export function renderSectionOfFields(key: string, fieldNames: string[], tableMetaData: QTableMetaData, helpHelpActive: boolean, record: QRecord, fieldMap?: {[name: string]: QFieldMetaData} )
-{
-   return <Box key={key} display="flex" flexDirection="column" py={1} pr={2}>
-      {
-         fieldNames.map((fieldName: string) =>
-         {
-            let [field, tableForField] = tableMetaData ? TableUtils.getFieldAndTable(tableMetaData, fieldName) : fieldMap ? [fieldMap[fieldName], null] : [null, null];
-
-            if (field != null)
-            {
-               let label = field.label;
-
-               const helpRoles = ["VIEW_SCREEN", "READ_SCREENS", "ALL_SCREENS"];
-               const showHelp = helpHelpActive || hasHelpContent(field.helpContents, helpRoles);
-               const formattedHelpContent = <HelpContent helpContents={field.helpContents} roles={helpRoles} heading={label} helpContentKey={`table:${tableMetaData?.name};field:${fieldName}`} />;
-
-               const labelElement = <Typography variant="button" textTransform="none" fontWeight="bold" pr={1} color="rgb(52, 71, 103)" sx={{cursor: "default"}}>{label}:</Typography>;
-
-               return (
-                  <Box key={fieldName} flexDirection="row" pr={2}>
-                     <>
-                        {
-                           showHelp && formattedHelpContent ? <Tooltip title={formattedHelpContent}>{labelElement}</Tooltip> : labelElement
-                        }
-                        <div style={{display: "inline-block", width: 0}}>&nbsp;</div>
-                        <Typography variant="button" textTransform="none" fontWeight="regular" color="rgb(123, 128, 154)">
-                           {ValueUtils.getDisplayValue(field, record, "view", fieldName)}
-                        </Typography>
-                     </>
-                  </Box>
-               );
-            }
-         })
-      }
-   </Box>;
-}
-
-
-/*******************************************************************************
- ** Record View Screen component.
- *******************************************************************************/
 function RecordView({table, launchProcess}: Props): JSX.Element
 {
   const {id} = useParams();
@ -165,14 +117,11 @@ function RecordView({table, launchProcess}: Props): JSX.Element
   const [launchingProcess, setLaunchingProcess] = useState(launchProcess);
   const [showEditChildForm, setShowEditChildForm] = useState(null as any);
   const [showAudit, setShowAudit] = useState(false);
-   const [showShareModal, setShowShareModal] = useState(false);
-
-   const [isDeleteSubmitting, setIsDeleteSubmitting] = useState(false);

   const openActionsMenu = (event: any) => setActionsMenu(event.currentTarget);
   const closeActionsMenu = () => setActionsMenu(null);

-   const {accentColor, setPageHeader, tableMetaData, setTableMetaData, tableProcesses, setTableProcesses, dotMenuOpen, keyboardHelpOpen, helpHelpActive, recordAnalytics, userId: currentUserId} = useContext(QContext);
+   const {accentColor, setPageHeader, tableMetaData, setTableMetaData, tableProcesses, setTableProcesses, dotMenuOpen, keyboardHelpOpen, helpHelpActive, recordAnalytics} = useContext(QContext);

   if (localStorage.getItem(tableVariantLocalStorageKey))
   {
@ -570,7 +519,40 @@ function RecordView({table, launchProcess}: Props): JSX.Element
               // for a section with field names, render the field values.                                               //
               // for the T1 section, the "wrapper" will come out below - but for other sections, produce a wrapper too. //
               ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-               const fields = renderSectionOfFields(section.name, section.fieldNames, tableMetaData, helpHelpActive, record);
+               const fields = (
+                  <Box key={section.name} display="flex" flexDirection="column" py={1} pr={2}>
+                     {
+                        section.fieldNames.map((fieldName: string) =>
+                        {
+                           let [field, tableForField] = TableUtils.getFieldAndTable(tableMetaData, fieldName);
+                           if (field != null)
+                           {
+                              let label = field.label;
+
+                              const helpRoles = ["VIEW_SCREEN", "READ_SCREENS", "ALL_SCREENS"];
+                              const showHelp = helpHelpActive || hasHelpContent(field.helpContents, helpRoles);
+                              const formattedHelpContent = <HelpContent helpContents={field.helpContents} roles={helpRoles} heading={label} helpContentKey={`table:${tableName};field:${fieldName}`} />;
+
+                              const labelElement = <Typography variant="button" textTransform="none" fontWeight="bold" pr={1} color="rgb(52, 71, 103)" sx={{cursor: "default"}}>{label}:</Typography>;
+
+                              return (
+                                 <Box key={fieldName} flexDirection="row" pr={2}>
+                                    <>
+                                       {
+                                          showHelp && formattedHelpContent ? <Tooltip title={formattedHelpContent}>{labelElement}</Tooltip> : labelElement
+                                       }
+                                       <div style={{display: "inline-block", width: 0}}>&nbsp;</div>
+                                       <Typography variant="button" textTransform="none" fontWeight="regular" color="rgb(123, 128, 154)">
+                                          {ValueUtils.getDisplayValue(field, record, "view", fieldName)}
+                                       </Typography>
+                                    </>
+                                 </Box>
+                              );
+                           }
+                        })
+                     }
+                  </Box>
+               );

               if (section.tier === "T1")
               {
@ -640,7 +622,6 @@ function RecordView({table, launchProcess}: Props): JSX.Element
   const handleClickDeleteButton = () =>
   {
      setDeleteConfirmationOpen(true);
-      setIsDeleteSubmitting(false);
   };

   const handleDeleteConfirmClose = () =>
@ -650,7 +631,6 @@ function RecordView({table, launchProcess}: Props): JSX.Element

   const handleDelete = (event: { preventDefault: () => void }) =>
   {
-      setIsDeleteSubmitting(true);
      event?.preventDefault();
      (async () =>
      {
@ -659,13 +639,11 @@ function RecordView({table, launchProcess}: Props): JSX.Element
         await qController.delete(tableName, id)
            .then(() =>
            {
-               setIsDeleteSubmitting(false);
               const path = pathParts.slice(0, -1).join("/");
               navigate(path, {state: {deleteSuccess: true}});
            })
            .catch((error) =>
            {
-               setIsDeleteSubmitting(false);
               setDeleteConfirmationOpen(false);
               console.log("Caught:");
               console.log(error);
@ -781,68 +759,6 @@ function RecordView({table, launchProcess}: Props): JSX.Element
      </Menu>
   );

-
-   /*******************************************************************************
-    ** function to open the sharing modal
-    *******************************************************************************/
-   const openShareModal = () =>
-   {
-      setShowShareModal(true);
-   };
-
-
-   /*******************************************************************************
-    ** function to close the sharing modal
-    *******************************************************************************/
-   const closeShareModal = () =>
-   {
-      setShowShareModal(false);
-   };
-
-
-   /*******************************************************************************
-    ** render the share button (if allowed for table)
-    *******************************************************************************/
-   const renderShareButton = () =>
-   {
-      if (tableMetaData && tableMetaData.shareableTableMetaData)
-      {
-         let shareDisabled = true;
-         let disabledTooltipText = "";
-         if(tableMetaData.shareableTableMetaData.thisTableOwnerIdFieldName && record)
-         {
-            const ownerId = record.values.get(tableMetaData.shareableTableMetaData.thisTableOwnerIdFieldName);
-            if(ownerId != currentUserId)
-            {
-               disabledTooltipText = `Only the owner of a ${tableMetaData.label} may share it.`
-               shareDisabled = true;
-            }
-            else
-            {
-               disabledTooltipText = "";
-               shareDisabled = false;
-            }
-         }
-         else
-         {
-            shareDisabled = false;
-         }
-
-         return (<Box width={standardWidth} mr={2}>
-            <Tooltip title={disabledTooltipText}>
-               <span>
-                  <MDButton id="shareButton" type="button" color="info" size="small" onClick={() => openShareModal()} fullWidth startIcon={<Icon>group_add</Icon>} disabled={shareDisabled}>
-                     Share
-                  </MDButton>
-               </span>
-            </Tooltip>
-         </Box>);
-      }
-
-      return (<React.Fragment />);
-   };
-
-
   const openModalProcess = (process: QProcessMetaData = null) =>
   {
      navigate(process.name);
@ -998,7 +914,6 @@ function RecordView({table, launchProcess}: Props): JSX.Element
                                                   </Typography>
                                                   <Box display="flex">
                                                      <GotoRecordButton metaData={metaData} tableMetaData={tableMetaData} />
-                                                      {renderShareButton()}
                                                      <QActionsMenuButton isOpen={actionsMenu} onClickHandler={openActionsMenu} />
                                                   </Box>
                                                   {renderActionsMenu}
@ -1047,7 +962,7 @@ function RecordView({table, launchProcess}: Props): JSX.Element
                                 </DialogContent>
                                 <DialogActions>
                                    <Button onClick={handleDeleteConfirmClose}>No</Button>
-                                    <Button onClick={handleDelete} autoFocus disabled={isDeleteSubmitting}>
+                                    <Button onClick={handleDelete} autoFocus>
                                       Yes
                                    </Button>
                                 </DialogActions>
@ -1064,7 +979,7 @@ function RecordView({table, launchProcess}: Props): JSX.Element

                              {
                                 showEditChildForm &&
-                                 <Modal open={showEditChildForm !== null} onClose={(event, reason) => closeEditChildForm(event, reason)}>
+                                 <Modal open={showEditChildForm as boolean} onClose={(event, reason) => closeEditChildForm(event, reason)}>
                                    <div className="modalEditForm">
                                       <EntityForm
                                          isModal={true}
@ -1095,11 +1010,6 @@ function RecordView({table, launchProcess}: Props): JSX.Element
                                 </Modal>
                              }

-                              {
-                                 showShareModal && tableMetaData && record &&
-                                 <ShareModal open={showShareModal} onClose={closeShareModal} tableMetaData={tableMetaData} record={record}></ShareModal>
-                              }
-
                           </Box>
                     }
                  </Box>
--- a/src/qqq/styles/qqq-override-styles.css
+++ b/src/qqq/styles/qqq-override-styles.css
@ -688,16 +688,6 @@ input[type="search"]::-webkit-search-results-decoration
   font-weight: 500;
 }

-.recordView .widget
-{
-   padding: 24px;
-}
-
-.recordView .widget .recordGridWidget
-{
-   margin: -8px;
-}
-
 .MuiPickersDay-root.Mui-selected, .MuiPickersDay-root.MuiPickersDay-dayWithMargin:hover
 {
   color: white;
--- a/src/qqq/utils/qqq/FilterUtils.tsx
+++ b/src/qqq/utils/qqq/FilterUtils.tsx
@ -23,7 +23,6 @@ import {QController} from "@kingsrook/qqq-frontend-core/lib/controllers/QControl
 import {QFieldMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldMetaData";
 import {QFieldType} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldType";
 import {QTableMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QTableMetaData";
-import {FilterVariableExpression} from "@kingsrook/qqq-frontend-core/lib/model/query/FilterVariableExpression";
 import {NowExpression} from "@kingsrook/qqq-frontend-core/lib/model/query/NowExpression";
 import {NowWithOffsetExpression} from "@kingsrook/qqq-frontend-core/lib/model/query/NowWithOffsetExpression";
 import {QCriteriaOperator} from "@kingsrook/qqq-frontend-core/lib/model/query/QCriteriaOperator";
@ -366,12 +365,7 @@ class FilterUtils
         for (let i = 0; i < maxLoops; i++)
         {
            const value = criteria.values[i];
-            if (value.type == "FilterVariableExpression")
-            {
-               const expression = new FilterVariableExpression(value);
-               labels.push(expression.toString());
-            }
-            else if (value.type == "NowWithOffset")
+            if (value.type == "NowWithOffset")
            {
               const expression = new NowWithOffsetExpression(value);
               labels.push(expression.toString());
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@ -47,8 +47,6 @@ module.exports = function (app)
   app.use("/download/*", getRequestHandler());
   app.use("/metaData/*", getRequestHandler());
   app.use("/data/*", getRequestHandler());
-   app.use("/possibleValues/*", getRequestHandler());
-   app.use("/possibleValues", getRequestHandler());
   app.use("/widget/*", getRequestHandler());
   app.use("/serverInfo", getRequestHandler());
   app.use("/manageSession", getRequestHandler());
--- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/junit/TestUtils.java
+++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/junit/TestUtils.java
@ -29,7 +29,6 @@ import com.kingsrook.qqq.backend.core.model.metadata.authentication.QAuthenticat
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
-import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryBackendModule;


 /*******************************************************************************
@ -76,7 +75,7 @@ public class TestUtils
   {
      return (new QBackendMetaData()
         .withName(DEFAULT_BACKEND_NAME)
-         .withBackendType(MemoryBackendModule.class));
+         .withBackendType("memory"));
   }


--- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/model/metadata/MaterialDashboardTableMetaDataTest.java
+++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/model/metadata/MaterialDashboardTableMetaDataTest.java
@ -29,9 +29,6 @@ import com.kingsrook.qqq.backend.core.instances.QInstanceValidator;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.frontend.materialdashboard.junit.BaseTest;
 import com.kingsrook.qqq.frontend.materialdashboard.junit.TestUtils;
-import com.kingsrook.qqq.frontend.materialdashboard.model.metadata.fieldrules.FieldRule;
-import com.kingsrook.qqq.frontend.materialdashboard.model.metadata.fieldrules.FieldRuleAction;
-import com.kingsrook.qqq.frontend.materialdashboard.model.metadata.fieldrules.FieldRuleTrigger;
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@ -79,37 +76,6 @@ class MaterialDashboardTableMetaDataTest extends BaseTest

      assertValidationFailureReasons(qInstance -> qInstance.getTable(TestUtils.TABLE_NAME_PERSON).withSupplementalMetaData(new MaterialDashboardTableMetaData().withDefaultQuickFilterFieldNames(List.of("firstName", "lastName", "firstName"))),
         "duplicated field name: firstName");
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Test
-   void testValidateFieldRules()
-   {
-      assertValidationFailureReasons(qInstance -> qInstance.getTable(TestUtils.TABLE_NAME_PERSON).withSupplementalMetaData(new MaterialDashboardTableMetaData().withFieldRule(new FieldRule())),
-         "without an action",
-         "without a trigger",
-         "without a sourceField");
-
-      assertValidationFailureReasons(qInstance -> qInstance.getTable(TestUtils.TABLE_NAME_PERSON).withSupplementalMetaData(new MaterialDashboardTableMetaData().withFieldRule(new FieldRule()
-            .withTrigger(FieldRuleTrigger.ON_CHANGE)
-            .withAction(FieldRuleAction.CLEAR_TARGET_FIELD)
-            .withSourceField("notAField")
-            .withTargetField("alsoNotAField")
-         )),
-         "unrecognized sourceField: notAField",
-         "unrecognized targetField: alsoNotAField");
-
-      assertValidationFailureReasons(qInstance -> qInstance.getTable(TestUtils.TABLE_NAME_PERSON).withSupplementalMetaData(new MaterialDashboardTableMetaData().withFieldRule(new FieldRule()
-            .withTrigger(FieldRuleTrigger.ON_CHANGE)
-            .withAction(FieldRuleAction.RELOAD_WIDGET)
-            .withSourceField("id")
-            .withTargetWidget("notAWidget")
-         )),
-         "unrecognized targetWidget: notAWidget");

   }

--- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QBaseSeleniumTest.java
+++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QBaseSeleniumTest.java
@ -33,7 +33,6 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
@ -44,7 +43,6 @@ import static org.junit.jupiter.api.Assertions.fail;
 /*******************************************************************************
 ** Base class for Selenium tests
 *******************************************************************************/
-@ExtendWith(SeleniumTestWatcher.class)
 public class QBaseSeleniumTest
 {
   protected static ChromeOptions chromeOptions;
@ -95,8 +93,6 @@ public class QBaseSeleniumTest
      driver.manage().window().setSize(new Dimension(1700, 1300));
      qSeleniumLib = new QSeleniumLib(driver);

-      SeleniumTestWatcher.setCurrentSeleniumLib(qSeleniumLib);
-
      if(useInternalJavalin())
      {
         qSeleniumJavalin = new QSeleniumJavalin();
@ -201,10 +197,10 @@ public class QBaseSeleniumTest
         qSeleniumLib.takeScreenshotToFile(getClass().getSimpleName() + "/" + testInfo.getDisplayName());
      }

-      ////////////////////////////////////////////////////////////////////////////////////////
-      // note - at one time we did a driver.quit here - but we're moving that into          //
-      // SeleniumTestWatcher, so it can dump logs if it wants to (it runs after the @After) //
-      ////////////////////////////////////////////////////////////////////////////////////////
+      if(driver != null)
+      {
+         driver.quit();
+      }

      if(qSeleniumJavalin != null)
      {
--- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QSeleniumLib.java
+++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QSeleniumLib.java
@ -42,8 +42,6 @@ import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.logging.LogEntries;
-import org.openqa.selenium.logging.LogEntry;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 import static org.assertj.core.api.Assertions.assertThat;
@ -737,22 +735,4 @@ public class QSeleniumLib
      return (this);
   }

-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public void dumpConsole()
-   {
-      Set<String> availableLogTypes = driver.manage().logs().getAvailableLogTypes();
-      for(String logType : availableLogTypes)
-      {
-         LogEntries logEntries = driver.manage().logs().get(logType);
-         for(LogEntry logEntry : logEntries)
-         {
-            System.out.println(logEntry.toJson());
-         }
-      }
-   }
-
 }
--- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QueryScreenLib.java
+++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QueryScreenLib.java
@ -261,7 +261,9 @@ public class QueryScreenLib
      if(StringUtils.hasContent(value))
      {
         qSeleniumLib.waitForSelector(".filterValuesColumn INPUT").click();
-         qSeleniumLib.waitForSelector(".filterValuesColumn INPUT").sendKeys(value);
+         // todo - no, not in a listbox/LI here...
+         qSeleniumLib.waitForSelectorContaining(".MuiAutocomplete-listbox LI", value).click();
+         System.out.println(value);
      }

      qSeleniumLib.clickBackdrop();
@ -269,21 +271,6 @@ public class QueryScreenLib



-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public void setBasicBooleanFilter(String fieldLabel, String operatorLabel)
-   {
-      qSeleniumLib.waitForSelectorContaining("BUTTON", fieldLabel).click();
-      qSeleniumLib.waitForMillis(250);
-      qSeleniumLib.waitForSelector("#criteriaOperator").click();
-      qSeleniumLib.waitForSelectorContaining("LI", operatorLabel).click();
-
-      qSeleniumLib.clickBackdrop();
-   }
-
-
-
   /*******************************************************************************
    **
    *******************************************************************************/
--- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/SeleniumTestWatcher.java
+++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/SeleniumTestWatcher.java
@ -1,126 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.frontend.materialdashboard.selenium.lib;
-
-
-import java.util.Optional;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.TestWatcher;
-
-
-/*******************************************************************************
- **
- *******************************************************************************/
-public class SeleniumTestWatcher implements TestWatcher
-{
-   private static QSeleniumLib qSeleniumLib;
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static void setCurrentSeleniumLib(QSeleniumLib qSeleniumLib)
-   {
-      SeleniumTestWatcher.qSeleniumLib = qSeleniumLib;
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Override
-   public void testFailed(ExtensionContext context, Throwable cause)
-   {
-      if(qSeleniumLib != null)
-      {
-         System.out.println("Dumping browser console after failed test: " + context.getDisplayName());
-         System.out.println("----------------------------------------------------------------------------");
-         try
-         {
-            qSeleniumLib.dumpConsole();
-         }
-         catch(Exception e)
-         {
-            System.out.println("Error dumping console:");
-            e.printStackTrace();
-         }
-         System.out.println("----------------------------------------------------------------------------");
-      }
-
-      tryToQuitSelenium();
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private void tryToQuitSelenium()
-   {
-      if(qSeleniumLib != null)
-      {
-         try
-         {
-            qSeleniumLib.driver.quit();
-         }
-         catch(Exception e)
-         {
-            System.err.println("Error quiting selenium driver: " + e.getMessage());
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Override
-   public void testSuccessful(ExtensionContext context)
-   {
-      tryToQuitSelenium();
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Override
-   public void testAborted(ExtensionContext context, Throwable cause)
-   {
-      tryToQuitSelenium();
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Override
-   public void testDisabled(ExtensionContext context, Optional<String> reason)
-   {
-      tryToQuitSelenium();
-   }
-}
--- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/SavedReportTest.java
+++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/SavedReportTest.java
@ -1,172 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.frontend.materialdashboard.selenium.tests;
-
-
-import java.util.List;
-import com.kingsrook.qqq.frontend.materialdashboard.selenium.lib.QBaseSeleniumTest;
-import com.kingsrook.qqq.frontend.materialdashboard.selenium.lib.QSeleniumLib;
-import com.kingsrook.qqq.frontend.materialdashboard.selenium.lib.QueryScreenLib;
-import com.kingsrook.qqq.frontend.materialdashboard.selenium.lib.javalin.QSeleniumJavalin;
-import org.junit.jupiter.api.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.WebElement;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-
-/*******************************************************************************
- ** Test for Saved Report screen (table has some special behaviors)
- *******************************************************************************/
-public class SavedReportTest extends QBaseSeleniumTest
-{
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Override
-   protected void addJavalinRoutes(QSeleniumJavalin qSeleniumJavalin)
-   {
-      super.addJavalinRoutes(qSeleniumJavalin);
-      qSeleniumJavalin
-         .withRouteToFile("/metaData/table/savedReport", "metaData/table/savedReport.json")
-         .withRouteToFile("/widget/reportSetupWidget", "widget/reportSetupWidget.json")
-         .withRouteToFile("/widget/pivotTableSetupWidget", "widget/pivotTableSetupWidget.json")
-         .withRouteToFile("/data/savedReport/possibleValues/tableName", "data/savedReport/possibleValues/tableName.json")
-
-         .withRouteToFile("/data/person/count", "data/person/count.json")
-         .withRouteToFile("/data/person/query", "data/person/index.json")
-      ;
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Test
-   void testCreate()
-   {
-      qSeleniumLib.gotoAndWaitForBreadcrumbHeaderToContain("/userCustomizations/savedReport/create", "Creating New Saved Report");
-
-      //////////////////////////////////////////////////////////////
-      // make sure things are disabled before a table is selected //
-      //////////////////////////////////////////////////////////////
-      WebElement webElement = qSeleniumLib.waitForSelectorContaining("button", "Edit Filters and Columns");
-      assertEquals("true", webElement.getAttribute("disabled"));
-
-      qSeleniumLib.waitForSelector("#label").click();
-      qSeleniumLib.waitForSelector("#label").sendKeys("My Report");
-
-      qSeleniumLib.waitForSelector("#tableName").click();
-      qSeleniumLib.waitForSelector("#tableName").sendKeys("Person" + Keys.DOWN + Keys.ENTER);
-
-      //////////////////////////////////
-      // make sure things enabled now //
-      //////////////////////////////////
-      webElement = qSeleniumLib.waitForSelectorContaining("button", "Edit Filters and Columns");
-      assertNull(webElement.getAttribute("disabled"));
-
-      ////////////////////////////////////////////////////
-      // open query-screen popup, wait for query to run //
-      ////////////////////////////////////////////////////
-      qSeleniumJavalin.beginCapture();
-      qSeleniumLib.waitForSelectorContaining("button", "Edit Filters and Columns").click();
-      qSeleniumJavalin.waitForCapturedPath("/data/person/count");
-      qSeleniumJavalin.waitForCapturedPath("/data/person/query");
-      qSeleniumJavalin.endCapture();
-
-      QueryScreenLib queryScreenLib = new QueryScreenLib(qSeleniumLib);
-      queryScreenLib.setBasicFilter("First Name", "contains", "Darin");
-
-      ////////////////////////
-      // close query screen //
-      ////////////////////////
-      qSeleniumLib.waitForSelectorContaining("button", "OK").click();
-
-      //////////////////////////////////////////////////////
-      // make sure query things appear on edit screen now //
-      //////////////////////////////////////////////////////
-      qSeleniumLib.waitForSelectorContaining(".advancedQueryString", "First Name");
-      qSeleniumLib.waitForSelectorContaining(".advancedQueryString", "contains");
-      qSeleniumLib.waitForSelectorContaining(".advancedQueryString", "Darin");
-      List<WebElement> columns = qSeleniumLib.waitForSelectorContaining("h5", "Columns")
-         .findElement(QSeleniumLib.PARENT)
-         .findElements(By.cssSelector("DIV"));
-
-      assertThat(columns)
-         .hasSizeGreaterThanOrEqualTo(5) // at least this many
-         .anyMatch(we -> we.getText().equals("Home City")); // a few fields are found
-
-      ///////////////////
-      // turn on pivot //
-      ///////////////////
-      qSeleniumLib.waitForSelectorContaining("label", "Use Pivot Table").click();
-      qSeleniumLib.waitForSelectorContaining("button", "Edit Pivot Table").click();
-      qSeleniumLib.waitForSelectorContaining("h3", "Edit Pivot Table");
-
-      ///////////////
-      // add a row //
-      ///////////////
-      qSeleniumLib.waitForSelectorContaining(".MuiModal-root button", "Add new row").click();
-      WebElement row0Input = qSeleniumLib.waitForSelector("#rows-0");
-      row0Input.click();
-      row0Input.sendKeys("Last Name" + Keys.ENTER);
-
-      //////////////////
-      // add a column //
-      //////////////////
-      qSeleniumLib.waitForSelectorContaining(".MuiModal-root button", "Add new column").click();
-      WebElement column0Input = qSeleniumLib.waitForSelector("#columns-0");
-      column0Input.click();
-      column0Input.sendKeys("Home City" + Keys.ENTER);
-
-      /////////////////
-      // add a value //
-      /////////////////
-      qSeleniumLib.waitForSelectorContaining(".MuiModal-root button", "Add new value").click();
-      WebElement value0Input = qSeleniumLib.waitForSelector("#values-field-0");
-      value0Input.click();
-      value0Input.sendKeys("Id" + Keys.ENTER);
-
-      /////////////////////////////////////////
-      // try to submit - but expect an error //
-      /////////////////////////////////////////
-      qSeleniumLib.waitForSelectorContaining("button", "OK").click();
-      qSeleniumLib.waitForSelectorContaining(".MuiAlert-standard", "Missing value in 1 field.").click();
-
-      ///////////////////////////
-      // now select a function //
-      ///////////////////////////
-      WebElement function0Input = qSeleniumLib.waitForSelector("#values-function-0");
-      function0Input.click();
-      function0Input.sendKeys("Count" + Keys.ENTER);
-
-      qSeleniumLib.waitForSelectorContaining("button", "OK").click();
-      qSeleniumLib.waitForSelectorContainingToNotExist("h3", "Edit Pivot Table");
-
-      // qSeleniumLib.waitForever();
-   }
-
-}
--- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/query/QueryScreenTest.java
+++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/query/QueryScreenTest.java
@ -153,16 +153,16 @@ public class QueryScreenTest extends QBaseSeleniumTest

      queryScreenLib.addBasicFilter("Is Employed");

-      testBasicBooleanCriteria(queryScreenLib, "Is Employed", "equals yes", "(?s).*Is Employed:.*yes.*", """
+      testBasicCriteria(queryScreenLib, "Is Employed", "equals yes", null, "(?s).*Is Employed:.*yes.*", """
         {"fieldName":"isEmployed","operator":"EQUALS","values":[true]}""");

-      testBasicBooleanCriteria(queryScreenLib, "Is Employed", "equals no", "(?s).*Is Employed:.*no.*", """
+      testBasicCriteria(queryScreenLib, "Is Employed", "equals no", null, "(?s).*Is Employed:.*no.*", """
         {"fieldName":"isEmployed","operator":"EQUALS","values":[false]}""");

-      testBasicBooleanCriteria(queryScreenLib, "Is Employed", "is empty", "(?s).*Is Employed:.*is empty.*", """
+      testBasicCriteria(queryScreenLib, "Is Employed", "is empty", null, "(?s).*Is Employed:.*is empty.*", """
         {"fieldName":"isEmployed","operator":"IS_BLANK","values":[]}""");

-      testBasicBooleanCriteria(queryScreenLib, "Is Employed", "is not empty", "(?s).*Is Employed:.*is not empty.*", """
+      testBasicCriteria(queryScreenLib, "Is Employed", "is not empty", null, "(?s).*Is Employed:.*is not empty.*", """
         {"fieldName":"isEmployed","operator":"IS_NOT_BLANK","values":[]}""");
   }

@ -203,10 +203,10 @@ public class QueryScreenTest extends QBaseSeleniumTest
   /*******************************************************************************
    **
    *******************************************************************************/
-   private void testBasicBooleanCriteria(QueryScreenLib queryScreenLib, String fieldLabel, String operatorLabel, String expectButtonStringRegex, String expectFilterJsonContains)
+   private void testBasicCriteria(QueryScreenLib queryScreenLib, String fieldLabel, String operatorLabel, String value, String expectButtonStringRegex, String expectFilterJsonContains)
   {
      qSeleniumJavalin.beginCapture();
-      queryScreenLib.setBasicBooleanFilter(fieldLabel, operatorLabel);
+      queryScreenLib.setBasicFilter(fieldLabel, operatorLabel, value);
      queryScreenLib.waitForBasicFilterButtonMatchingRegex(expectButtonStringRegex);
      qSeleniumJavalin.waitForCapturedPathWithBodyContaining("/data/person/query", expectFilterJsonContains);
      qSeleniumJavalin.endCapture();
--- a/src/test/resources/fixtures/data/savedReport/possibleValues/tableName.json
+++ b/src/test/resources/fixtures/data/savedReport/possibleValues/tableName.json
@ -1,16 +0,0 @@
-{
-   "options": [
-      {
-         "id": "person",
-         "label": "Person"
-      },
-      {
-         "id": "city",
-         "label": "City"
-      },
-      {
-         "id": "savedReport",
-         "label": "Saved Report"
-      }
-   ]
-}
--- a/src/test/resources/fixtures/metaData/index.json
+++ b/src/test/resources/fixtures/metaData/index.json
@ -189,26 +189,6 @@
         "insertPermission": true,
         "editPermission": true,
         "deletePermission": true
-      },
-      "savedReport": {
-         "name": "savedReport",
-         "label": "Saved Report",
-         "isHidden": false,
-         "iconName": "article",
-         "capabilities": [
-            "TABLE_COUNT",
-            "TABLE_GET",
-            "TABLE_QUERY",
-            "QUERY_STATS",
-            "TABLE_UPDATE",
-            "TABLE_INSERT",
-            "TABLE_DELETE"
-         ],
-         "readPermission": true,
-         "insertPermission": true,
-         "editPermission": true,
-         "deletePermission": true,
-         "usesVariants": false
      }
   },
   "processes": {
@ -440,40 +420,6 @@
            }
         ]
      },
-      "userCustomizations": {
-         "name": "userCustomizations",
-         "label": "User Customizations",
-         "iconName": "article",
-         "widgets": [],
-         "children": [
-            {
-               "type": "TABLE",
-               "name": "savedReport",
-               "label": "Saved Report",
-               "iconName": "article"
-            }
-         ],
-         "childMap": {
-            "savedReport": {
-               "type": "TABLE",
-               "name": "savedReport",
-               "label": "Saved Report",
-               "iconName": "article"
-            }
-         },
-         "sections": [
-            {
-               "name": "userCustomizations",
-               "label": "User Customizations",
-               "icon": {
-                  "name": "badge"
-               },
-               "tables": [
-                  "savedReport"
-               ]
-            }
-         ]
-      },
      "miscellaneous": {
         "name": "miscellaneous",
         "label": "Miscellaneous",
@ -784,20 +730,6 @@
            }
         ],
         "iconName": "data_object"
-      },
-      {
-         "type": "APP",
-         "name": "userCustomizations",
-         "label": "User Customizations",
-         "children": [
-            {
-               "type": "TABLE",
-               "name": "savedReport",
-               "label": "Saved Report",
-               "iconName": "article"
-            }
-         ],
-         "iconName": "data_object"
      }
   ],
   "branding": {
@ -818,28 +750,6 @@
         "isCard": true,
         "storeDropdownSelections": false,
         "hasPermission": true
-      },
-      "reportSetupWidget": {
-         "name": "reportSetupWidget",
-         "label": "Filters and Columns",
-         "type": "reportSetup",
-         "isCard": true,
-         "storeDropdownSelections": false,
-         "showReloadButton": true,
-         "showExportButton": false,
-         "defaultValues": {},
-         "hasPermission": true
-      },
-      "pivotTableSetupWidget": {
-         "name": "pivotTableSetupWidget",
-         "label": "Pivot Table",
-         "type": "pivotTableSetup",
-         "isCard": true,
-         "storeDropdownSelections": false,
-         "showReloadButton": true,
-         "showExportButton": false,
-         "defaultValues": {},
-         "hasPermission": true
      }
   },
   "environmentValues": {
--- a/src/test/resources/fixtures/metaData/table/savedReport.json
+++ b/src/test/resources/fixtures/metaData/table/savedReport.json
@ -1,218 +0,0 @@
-{
-   "table": {
-      "name": "savedReport",
-      "label": "Saved Report",
-      "isHidden": false,
-      "primaryKeyField": "id",
-      "iconName": "article",
-      "fields": {
-         "queryFilterJson": {
-            "name": "queryFilterJson",
-            "label": "Query Filter",
-            "type": "STRING",
-            "isRequired": false,
-            "isEditable": true,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         },
-         "columnsJson": {
-            "name": "columnsJson",
-            "label": "Columns",
-            "type": "STRING",
-            "isRequired": false,
-            "isEditable": true,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         },
-         "inputFieldsJson": {
-            "name": "inputFieldsJson",
-            "label": "Input Fields",
-            "type": "STRING",
-            "isRequired": false,
-            "isEditable": true,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         },
-         "pivotTableJson": {
-            "name": "pivotTableJson",
-            "label": "Pivot Table",
-            "type": "STRING",
-            "isRequired": false,
-            "isEditable": true,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         },
-         "modifyDate": {
-            "name": "modifyDate",
-            "label": "Modify Date",
-            "type": "DATE_TIME",
-            "isRequired": false,
-            "isEditable": false,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         },
-         "label": {
-            "name": "label",
-            "label": "Report Name",
-            "type": "STRING",
-            "isRequired": true,
-            "isEditable": true,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         },
-         "id": {
-            "name": "id",
-            "label": "Id",
-            "type": "INTEGER",
-            "isRequired": false,
-            "isEditable": false,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         },
-         "userId": {
-            "name": "userId",
-            "label": "User Id",
-            "type": "STRING",
-            "isRequired": false,
-            "isEditable": true,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         },
-         "tableName": {
-            "name": "tableName",
-            "label": "Table",
-            "type": "STRING",
-            "isRequired": true,
-            "isEditable": true,
-            "isHeavy": false,
-            "possibleValueSourceName": "tables",
-            "displayFormat": "%s"
-         },
-         "createDate": {
-            "name": "createDate",
-            "label": "Create Date",
-            "type": "DATE_TIME",
-            "isRequired": false,
-            "isEditable": false,
-            "isHeavy": false,
-            "displayFormat": "%s"
-         }
-      },
-      "sections": [
-         {
-            "name": "identity",
-            "label": "Identity",
-            "tier": "T1",
-            "fieldNames": [
-               "id",
-               "label",
-               "tableName"
-            ],
-            "icon": {
-               "name": "badge"
-            },
-            "isHidden": false
-         },
-         {
-            "name": "filtersAndColumns",
-            "label": "Filters and Columns",
-            "tier": "T2",
-            "widgetName": "reportSetupWidget",
-            "icon": {
-               "name": "table_chart"
-            },
-            "isHidden": false
-         },
-         {
-            "name": "pivotTable",
-            "label": "Pivot Table",
-            "tier": "T2",
-            "widgetName": "pivotTableSetupWidget",
-            "icon": {
-               "name": "pivot_table_chart"
-            },
-            "isHidden": false
-         },
-         {
-            "name": "data",
-            "label": "Data",
-            "tier": "T2",
-            "fieldNames": [
-               "queryFilterJson",
-               "columnsJson",
-               "pivotTableJson"
-            ],
-            "icon": {
-               "name": "text_snippet"
-            },
-            "isHidden": true
-         },
-         {
-            "name": "hidden",
-            "label": "Hidden",
-            "tier": "T2",
-            "fieldNames": [
-               "inputFieldsJson",
-               "userId"
-            ],
-            "icon": {
-               "name": "text_snippet"
-            },
-            "isHidden": true
-         },
-         {
-            "name": "dates",
-            "label": "Dates",
-            "tier": "T3",
-            "fieldNames": [
-               "createDate",
-               "modifyDate"
-            ],
-            "icon": {
-               "name": "calendar_month"
-            },
-            "isHidden": false
-         }
-      ],
-      "exposedJoins": [],
-      "supplementalTableMetaData": {
-         "materialDashboard": {
-            "fieldRules": [
-               {
-                  "trigger": "ON_CHANGE",
-                  "sourceField": "tableName",
-                  "action": "CLEAR_TARGET_FIELD",
-                  "targetField": "queryFilterJson"
-               },
-               {
-                  "trigger": "ON_CHANGE",
-                  "sourceField": "tableName",
-                  "action": "CLEAR_TARGET_FIELD",
-                  "targetField": "columnsJson"
-               },
-               {
-                  "trigger": "ON_CHANGE",
-                  "sourceField": "tableName",
-                  "action": "CLEAR_TARGET_FIELD",
-                  "targetField": "pivotTableJson"
-               }
-            ],
-            "type": "materialDashboard"
-         }
-      },
-      "capabilities": [
-         "TABLE_COUNT",
-         "TABLE_GET",
-         "TABLE_QUERY",
-         "QUERY_STATS",
-         "TABLE_UPDATE",
-         "TABLE_INSERT",
-         "TABLE_DELETE"
-      ],
-      "readPermission": true,
-      "insertPermission": true,
-      "editPermission": true,
-      "deletePermission": true,
-      "usesVariants": false
-   }
-}
--- a/src/test/resources/fixtures/widget/pivotTableSetupWidget.json
+++ b/src/test/resources/fixtures/widget/pivotTableSetupWidget.json
@ -1 +0,0 @@
-{"type":"pivotTableSetup"}
--- a/src/test/resources/fixtures/widget/reportSetupWidget.json
+++ b/src/test/resources/fixtures/widget/reportSetupWidget.json
@ -1 +0,0 @@
-{"type":"reportSetup"}
Author	SHA1	Message	Date
Tim Chamberlain	f6286ba6b7	Merge branch 'feature/CE-1107-add-day-by-day-views-for-the' into integration/sprint-40	2024-04-17 23:09:17 -05:00
Darin Kelkhoff	3edb9cca6a	Merged feature/CE-881-create-basic-saved-reports into integration/sprint-40	2024-04-17 10:52:31 -05:00
Darin Kelkhoff	895791d9c9	Merged feature/CE-881-create-basic-saved-reports into integration/sprint-40	2024-04-16 20:39:49 -05:00
Darin Kelkhoff	d7f2ff9fc4	Merged feature/CE-1123-expose-access-lo-data-in into integration/sprint-40	2024-04-16 18:40:57 -05:00
Darin Kelkhoff	e05b5b247f	Update toalways deploy on integration branches, same as main	2024-04-16 11:40:37 -05:00
Darin Kelkhoff	74c85201ec	Merged feature/CE-881-create-basic-saved-reports into integration/sprint-40	2024-04-16 11:40:19 -05:00
Tim Chamberlain	6accca5fec	Merge branch 'feature/CE-1107-add-day-by-day-views-for-the' into integration/sprint-40	2024-04-15 21:38:16 -05:00
Darin Kelkhoff	13235c8aac	Merged feature/CE-1123-expose-access-lo-data-in into integration/sprint-40	2024-04-15 19:26:48 -05:00
Tim Chamberlain	3b3834c032	Merge branch 'feature/CE-1107-add-day-by-day-views-for-the' into integration/sprint-40	2024-04-15 11:41:17 -05:00
Darin Kelkhoff	82ffcfd659	Merged feature/CE-881-create-basic-saved-reports into integration/sprint-40	2024-04-15 08:52:14 -05:00
Tim Chamberlain	2587e9ee68	Merge branch 'feature/CE-1107-add-day-by-day-views-for-the' into integration/sprint-40	2024-04-12 15:00:46 -05:00
Darin Kelkhoff	0b77c8172c	Merged feature/CE-1123-expose-access-log-data-in into integration/sprint-40	2024-04-08 08:53:05 -05:00
Darin Kelkhoff	743137dc60	Try google tag js in index.html	2024-04-08 08:52:50 -05:00