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-22 07:08:44 +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
10 changed files with 42 additions and 627 deletions
--- 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.97",
+      "@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,10 +664,10 @@ export default function App()
   const [dotMenuOpen, setDotMenuOpen] = useState(false);
   const [keyboardHelpOpen, setKeyboardHelpOpen] = useState(false);
   const [helpHelpActive] = useState(queryParams.has("helpHelp"));
   const [userId] = useState(user.email);
   const [googleAnalyticsUtils] = useState(new GoogleAnalyticsUtils());
   /*******************************************************************************
    **
    *******************************************************************************/
@ -689,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/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;
+   fieldName: string;
   possibleValueSourceName?: 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))))
-
+   const {inputBorderColor} = colors;
   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]);
   ////////////////////////////////////////////////////////////////////////////////////////////////
   // 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/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/sharing/ShareModal.tsx
+++ b/src/qqq/components/sharing/ShareModal.tsx
@ -1,481 +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 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();
 /*******************************************************************************
 ** 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 [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 [, forceUpdate] = useReducer((x) => x + 1, 0);
   /////////////////////////////////////////////////////////
   // 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(event: React.SyntheticEvent, 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);
         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);
      }
   }
   // todo - need this to be real
   const audienceOptions = [
      {id: "user:1", label: "Darin Kelkhoff"},
      {id: "user:2", label: "Tom Chutterloin"},
      {id: "user:3", label: "Tylers Ample"},
      {id: "user:4", label: "Mames Mames"},
      {id: "group:2", label: "Cold Track Engineering"}
   ];
   /*******************************************************************************
    **
    *******************************************************************************/
   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)
   {
      return (
         <Autocomplete
            id={id}
            disabled={id == "new-share-scope" && submitting}
            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={autocompleteSX}
         />
      );
   }
   //////////////////////
   // 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}&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}>
                        <Autocomplete
                           id="new-share-audience"
                           disabled={submitting}
                           renderInput={(params) => (<TextField {...params} label="User or Group" variant="outlined" autoComplete="off" type="search" InputProps={{...params.InputProps}} />)}
                           options={audienceOptions}
                           onChange={handleAudienceChange}
                           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={autocompleteSX}
                        />
                     </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: "auto"}} height="180px" pt="0.5rem">
                        {
                           currentShares.map((share) => (
                              <Box key={share.shareId} display="flex" justifyContent="space-between" alignItems="center" p="0.25rem" 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>
               {/* 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 autocompleteSX =
   {
      "& .MuiAutocomplete-input": {padding: "0.125rem 0.5rem !important"},
      "& .MuiOutlinedInput-root": {borderRadius: "0.75rem !important"}
   };
 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/pages/records/query/RecordQuery.tsx
+++ b/src/qqq/pages/records/query/RecordQuery.tsx
@ -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... //
--- a/src/qqq/pages/records/view/RecordView.tsx
+++ b/src/qqq/pages/records/view/RecordView.tsx
@ -49,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";
@ -84,10 +82,6 @@ RecordView.defaultProps =
 const TABLE_VARIANT_LOCAL_STORAGE_KEY_ROOT = "qqq.tableVariant";
 /*******************************************************************************
 ** Record View Screen component.
 *******************************************************************************/
 function RecordView({table, launchProcess}: Props): JSX.Element
 {
   const {id} = useParams();
@ -123,9 +117,6 @@ 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);
@ -631,7 +622,6 @@ function RecordView({table, launchProcess}: Props): JSX.Element
   const handleClickDeleteButton = () =>
   {
      setDeleteConfirmationOpen(true);
      setIsDeleteSubmitting(false);
   };
   const handleDeleteConfirmClose = () =>
@ -641,7 +631,6 @@ function RecordView({table, launchProcess}: Props): JSX.Element
   const handleDelete = (event: { preventDefault: () => void }) =>
   {
      setIsDeleteSubmitting(true);
      event?.preventDefault();
      (async () =>
      {
@ -650,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);
@ -772,44 +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.name == "savedReport" || tableMetaData.name == "savedView")) // todo - not just based on name
      {
         const shareDisabled = false; // todo - only share if you're the owner?  or do that in the modal?
         return (<Box width={standardWidth} mr={3}>
            <MDButton id="shareButton" type="button" color="info" size="small" onClick={() => openShareModal()} fullWidth startIcon={<Icon>share</Icon>} disabled={shareDisabled}>
               Share
            </MDButton>
         </Box>);
      }
      return (<React.Fragment />);
   };
   const openModalProcess = (process: QProcessMetaData = null) =>
   {
      navigate(process.name);
@ -965,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}
@ -1014,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>
@ -1062,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/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"));
   }
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