@teselagen/ui 0.5.23-beta.31 → 0.5.23-beta.32

package/DataTable/utils/index.d.ts

@@ -18,7 +18,6 @@ import { isBottomRightCornerOfRectangle } from './isBottomRightCornerOfRectangle
 import { isEntityClean } from './isEntityClean';
 import { PRIMARY_SELECTED_VAL } from './primarySelectedValue';
 import { removeCleanRows } from './removeCleanRows';
-import { useDeepEqualMemo } from './useDeepEqualMemo';
 import { useTableEntities } from './useTableEntities';
 
-export { defaultParsePaste, formatPasteData, getAllRows, getCellCopyText, getCellInfo, getEntityIdToEntity, getFieldPathToIndex, getFieldPathToField, getIdOrCodeOrIndex, getLastSelectedEntity, getNewEntToSelect, getNumberStrAtEnd, getRecordsFromIdMap, getRowCopyText, getSelectedRowsFromEntities, handleCopyColumn, handleCopyHelper, handleCopyRows, handleCopyTable, isBottomRightCornerOfRectangle, isEntityClean, PRIMARY_SELECTED_VAL, removeCleanRows, stripNumberAtEnd, useDeepEqualMemo, useTableEntities };
+export { defaultParsePaste, formatPasteData, getAllRows, getCellCopyText, getCellInfo, getEntityIdToEntity, getFieldPathToIndex, getFieldPathToField, getIdOrCodeOrIndex, getLastSelectedEntity, getNewEntToSelect, getNumberStrAtEnd, getRecordsFromIdMap, getRowCopyText, getSelectedRowsFromEntities, handleCopyColumn, handleCopyHelper, handleCopyRows, handleCopyTable, isBottomRightCornerOfRectangle, isEntityClean, PRIMARY_SELECTED_VAL, removeCleanRows, stripNumberAtEnd, useTableEntities };

package/index.cjs.js

@@ -17147,13 +17147,6 @@ const handleCopyTable = /* @__PURE__ */ __name((e2, opts) => {
   }
 }, "handleCopyTable");
 const PRIMARY_SELECTED_VAL = "main_cell";
-const useDeepEqualMemo = /* @__PURE__ */ __name((value) => {
-  const ref2 = React$1.useRef();
-  if (!isEqual(value, ref2.current)) {
-    ref2.current = value;
-  }
-  return ref2.current;
-}, "useDeepEqualMemo");
 const useTableEntities = /* @__PURE__ */ __name((tableFormName) => {
   const dispatch = reactRedux.useDispatch();
   const selectTableEntities = React$1.useCallback(
@@ -17189,6 +17182,13 @@ const useTableEntities = /* @__PURE__ */ __name((tableFormName) => {
   });
   return { selectTableEntities, allOrderedEntities, selectedEntities };
 }, "useTableEntities");
+const useDeepEqualMemo = /* @__PURE__ */ __name((value) => {
+  const ref2 = React$1.useRef();
+  if (!isEqual(value, ref2.current)) {
+    ref2.current = value;
+  }
+  return ref2.current;
+}, "useDeepEqualMemo");
 function rowClick(e2, rowInfo, entities, {
   reduxFormSelectedEntityIdMap,
   isSingleSelect,
@@ -31783,6 +31783,13 @@ const sortify = /* @__PURE__ */ __name((value, replacer, space2) => {
 }, "sortify");
 const REQUIRED_ERROR = "This field is required.";
 const fieldRequired = /* @__PURE__ */ __name((value) => !value || Array.isArray(value) && !value.length ? REQUIRED_ERROR : void 0, "fieldRequired");
+const useStableReference = /* @__PURE__ */ __name((value) => {
+  const ref2 = React$1.useRef();
+  React$1.useEffect(() => {
+    ref2.current = value;
+  }, [value]);
+  return ref2;
+}, "useStableReference");
 function getIntent({
   showErrorIfUntouched,
   meta: { touched, error, warning: warning2 }
@@ -31872,8 +31879,8 @@ const AbstractInput = /* @__PURE__ */ __name(({
   noFillField,
   noMarginBottom,
   noOuterLabel,
-  onDefaultValChanged,
-  onFieldSubmit,
+  onDefaultValChanged: _onDefaultValChanged,
+  onFieldSubmit: _onFieldSubmit,
   rightEl,
   secondaryLabel,
   setAssignDefaultsMode,
@@ -31885,11 +31892,13 @@ const AbstractInput = /* @__PURE__ */ __name(({
   tooltipProps
 }) => {
   const dispatch = reactRedux.useDispatch();
+  const onDefaultValChanged = useStableReference(_onDefaultValChanged);
+  const onFieldSubmit = useStableReference(_onFieldSubmit);
   React$1.useEffect(() => {
     if (defaultValue2 !== void 0) {
       dispatch(reduxForm.change(form, name, defaultValue2));
-      onDefaultValChanged && onDefaultValChanged(defaultValue2, name, form);
-      onFieldSubmit && onFieldSubmit(defaultValue2);
+      onDefaultValChanged.current && onDefaultValChanged.current(defaultValue2, name, form);
+      onFieldSubmit.current && onFieldSubmit.current(defaultValue2);
     }
   }, [defaultValue2, dispatch, form, name, onDefaultValChanged, onFieldSubmit]);
   const showError = (touched || showErrorIfUntouched) && error && !asyncValidating;

package/index.d.ts

@@ -15,6 +15,7 @@ export * from './utils/commandUtils';
 export * from './utils/commandControls';
 export * from './utils/useTraceUpdate';
 export { default as Uploader } from './FormComponents/Uploader';
+export { useDeepEqualMemo } from './utils/hooks';
 export { default as Loading } from './Loading';
 export { throwFormError } from './throwFormError';
 export { default as AdvancedOptions } from './AdvancedOptions';
@@ -57,6 +58,6 @@ export { mergeSchemas, default as convertSchema } from './DataTable/utils/conver
 export { getCurrentParamsFromUrl, setCurrentParamsOnUrl } from './DataTable/utils/queryParams';
 export { default as withSelectedEntities, getSelectedEntities } from './DataTable/utils/withSelectedEntities';
 export { default as DataTable, ConnectedPagingTool as PagingTool } from './DataTable';
-export { removeCleanRows, useTableEntities, getIdOrCodeOrIndex, useDeepEqualMemo } from './DataTable/utils';
+export { removeCleanRows, useTableEntities, getIdOrCodeOrIndex } from './DataTable/utils';
 export { default as withTableParams, useTableParams } from './DataTable/utils/withTableParams';
 export { default as Timeline, TimelineEvent } from './Timeline';

package/index.es.js

@@ -17129,13 +17129,6 @@ const handleCopyTable = /* @__PURE__ */ __name((e2, opts) => {
   }
 }, "handleCopyTable");
 const PRIMARY_SELECTED_VAL = "main_cell";
-const useDeepEqualMemo = /* @__PURE__ */ __name((value) => {
-  const ref2 = useRef();
-  if (!isEqual(value, ref2.current)) {
-    ref2.current = value;
-  }
-  return ref2.current;
-}, "useDeepEqualMemo");
 const useTableEntities = /* @__PURE__ */ __name((tableFormName) => {
   const dispatch = useDispatch();
   const selectTableEntities = useCallback(
@@ -17171,6 +17164,13 @@ const useTableEntities = /* @__PURE__ */ __name((tableFormName) => {
   });
   return { selectTableEntities, allOrderedEntities, selectedEntities };
 }, "useTableEntities");
+const useDeepEqualMemo = /* @__PURE__ */ __name((value) => {
+  const ref2 = useRef();
+  if (!isEqual(value, ref2.current)) {
+    ref2.current = value;
+  }
+  return ref2.current;
+}, "useDeepEqualMemo");
 function rowClick(e2, rowInfo, entities, {
   reduxFormSelectedEntityIdMap,
   isSingleSelect,
@@ -31765,6 +31765,13 @@ const sortify = /* @__PURE__ */ __name((value, replacer, space2) => {
 }, "sortify");
 const REQUIRED_ERROR = "This field is required.";
 const fieldRequired = /* @__PURE__ */ __name((value) => !value || Array.isArray(value) && !value.length ? REQUIRED_ERROR : void 0, "fieldRequired");
+const useStableReference = /* @__PURE__ */ __name((value) => {
+  const ref2 = useRef();
+  useEffect(() => {
+    ref2.current = value;
+  }, [value]);
+  return ref2;
+}, "useStableReference");
 function getIntent({
   showErrorIfUntouched,
   meta: { touched, error, warning: warning2 }
@@ -31854,8 +31861,8 @@ const AbstractInput = /* @__PURE__ */ __name(({
   noFillField,
   noMarginBottom,
   noOuterLabel,
-  onDefaultValChanged,
-  onFieldSubmit,
+  onDefaultValChanged: _onDefaultValChanged,
+  onFieldSubmit: _onFieldSubmit,
   rightEl,
   secondaryLabel,
   setAssignDefaultsMode,
@@ -31867,11 +31874,13 @@ const AbstractInput = /* @__PURE__ */ __name(({
   tooltipProps
 }) => {
   const dispatch = useDispatch();
+  const onDefaultValChanged = useStableReference(_onDefaultValChanged);
+  const onFieldSubmit = useStableReference(_onFieldSubmit);
   useEffect(() => {
     if (defaultValue2 !== void 0) {
       dispatch(change(form, name, defaultValue2));
-      onDefaultValChanged && onDefaultValChanged(defaultValue2, name, form);
-      onFieldSubmit && onFieldSubmit(defaultValue2);
+      onDefaultValChanged.current && onDefaultValChanged.current(defaultValue2, name, form);
+      onFieldSubmit.current && onFieldSubmit.current(defaultValue2);
     }
   }, [defaultValue2, dispatch, form, name, onDefaultValChanged, onFieldSubmit]);
   const showError = (touched || showErrorIfUntouched) && error && !asyncValidating;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.5.23-beta.31",
+  "version": "0.5.23-beta.32",
   "main": "./src/index.js",
   "exports": {
     ".": {

package/src/DataTable/EditabelCell.js

@@ -1,13 +1,13 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useRef, useState } from "react";
 
 export const EditableCell = ({
-  value,
-  setValue,
   cancelEdit,
   dataTest,
   finishEdit,
-  isNumeric
+  isNumeric,
+  initialValue
 }) => {
+  const [value, setValue] = useState(initialValue);
   const inputRef = useRef(null);
 
   useEffect(() => {

package/src/DataTable/index.js

@@ -67,9 +67,9 @@ import {
   handleCopyTable,
   isEntityClean,
   PRIMARY_SELECTED_VAL,
-  removeCleanRows,
-  useDeepEqualMemo
+  removeCleanRows
 } from "./utils";
+import { useDeepEqualMemo } from "../utils/hooks";
 import rowClick, {
   changeSelectedEntities,
   finalizeSelection

package/src/DataTable/utils/index.js

@@ -24,7 +24,6 @@ import { handleCopyColumn } from "./handleCopyColumn";
 import { isBottomRightCornerOfRectangle } from "./isBottomRightCornerOfRectangle";
 import { handleCopyTable } from "./handleCopyTable";
 import { PRIMARY_SELECTED_VAL } from "./primarySelectedValue";
-import { useDeepEqualMemo } from "./useDeepEqualMemo";
 import { useTableEntities } from "./useTableEntities";
 
 export {
@@ -52,6 +51,5 @@ export {
   PRIMARY_SELECTED_VAL,
   removeCleanRows,
   stripNumberAtEnd,
-  useDeepEqualMemo,
   useTableEntities
 };

package/src/DataTable/utils/useTableParams.js

@@ -352,7 +352,6 @@ export default function useTableParams(
     reduxFormSearchInput,
     onlyShowRowsWErrors,
     reduxFormCellValidation,
-    reduxFormEntities,
     reduxFormSelectedCells,
     reduxFormSelectedEntityIdMap,
     reduxFormQueryParams,

package/src/DataTable/utils/withTableParams.js

@@ -11,7 +11,7 @@ import {
 } from "./queryParams";
 import { withRouter } from "react-router-dom";
 import getTableConfigFromStorage from "./getTableConfigFromStorage";
-import { useDeepEqualMemo } from "./useDeepEqualMemo";
+import { useDeepEqualMemo } from "../../utils/hooks/useDeepEqualMemo";
 import { branch, compose } from "recompose";
 
 /**

package/src/FormComponents/index.js

@@ -46,6 +46,7 @@ import Uploader from "./Uploader";
 import sortify from "./sortify";
 import { fieldRequired } from "./utils";
 import { useDispatch } from "react-redux";
+import { useStableReference } from "../utils/hooks/useStableReference";
 
 export { fieldRequired };
 
@@ -147,8 +148,8 @@ const AbstractInput = ({
   noFillField,
   noMarginBottom,
   noOuterLabel,
-  onDefaultValChanged,
-  onFieldSubmit,
+  onDefaultValChanged: _onDefaultValChanged,
+  onFieldSubmit: _onFieldSubmit,
   rightEl,
   secondaryLabel,
   setAssignDefaultsMode,
@@ -160,13 +161,16 @@ const AbstractInput = ({
   tooltipProps
 }) => {
   const dispatch = useDispatch();
+  const onDefaultValChanged = useStableReference(_onDefaultValChanged);
+  const onFieldSubmit = useStableReference(_onFieldSubmit);
 
   // This only takes care that the default Value is changed when it is changed in the parent component
   useEffect(() => {
     if (defaultValue !== undefined) {
       dispatch(change(form, name, defaultValue));
-      onDefaultValChanged && onDefaultValChanged(defaultValue, name, form);
-      onFieldSubmit && onFieldSubmit(defaultValue);
+      onDefaultValChanged.current &&
+        onDefaultValChanged.current(defaultValue, name, form);
+      onFieldSubmit.current && onFieldSubmit.current(defaultValue);
     }
   }, [defaultValue, dispatch, form, name, onDefaultValChanged, onFieldSubmit]);
 

package/src/UploadCsvWizard.js

@@ -11,7 +11,8 @@ import { some } from "lodash-es";
 import { times } from "lodash-es";
 import DialogFooter from "./DialogFooter";
 import DataTable from "./DataTable";
-import { removeCleanRows, useDeepEqualMemo } from "./DataTable/utils";
+import { useDeepEqualMemo } from "./utils/hooks";
+import { removeCleanRows } from "./DataTable/utils";
 import wrapDialog from "./wrapDialog";
 import { omit } from "lodash-es";
 import { useDispatch, useSelector } from "react-redux";

package/src/index.js

@@ -22,7 +22,8 @@ export {
 } from "./DataTable";
 export { removeCleanRows, useTableEntities } from "./DataTable/utils";
 
-export { getIdOrCodeOrIndex, useDeepEqualMemo } from "./DataTable/utils";
+export { useDeepEqualMemo } from "./utils/hooks";
+export { getIdOrCodeOrIndex } from "./DataTable/utils";
 export { default as convertSchema } from "./DataTable/utils/convertSchema";
 export { default as Loading } from "./Loading";
 export { throwFormError } from "./throwFormError";

package/src/utils/hooks/index.js

@@ -0,0 +1 @@
+export { useDeepEqualMemo } from "./useDeepEqualMemo";

package/src/utils/hooks/useDeepEqualMemo.js

@@ -0,0 +1,10 @@
+import { isEqual } from "lodash-es";
+import { useRef } from "react";
+
+export const useDeepEqualMemo = value => {
+  const ref = useRef();
+  if (!isEqual(value, ref.current)) {
+    ref.current = value;
+  }
+  return ref.current;
+};

package/src/utils/hooks/useStableReference.js

@@ -0,0 +1,9 @@
+import { useEffect, useRef } from "react";
+
+export const useStableReference = value => {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = value;
+  }, [value]);
+  return ref;
+};

package/utils/hooks/index.d.ts

@@ -0,0 +1 @@
+export { useDeepEqualMemo } from './useDeepEqualMemo';

package/utils/hooks/useDeepEqualMemo.d.ts

@@ -0,0 +1 @@
+export function useDeepEqualMemo(value: any): undefined;

package/utils/hooks/useStableReference.d.ts

@@ -0,0 +1 @@
+export function useStableReference(value: any): import('../../../../../node_modules/react').MutableRefObject<undefined>;

package/FormComponents/AbstractField.d.ts

@@ -1 +0,0 @@
-export function withAbstractWrapper(ComponentToWrap: any, opts?: {}): (props: any) => import("react/jsx-runtime").JSX.Element;

package/src/FormComponents/AbstractField.js

@@ -1,388 +0,0 @@
-import { Button, FormGroup, Position, Tooltip } from "@blueprintjs/core";
-import { useCallback, useContext, useEffect, useRef, useState } from "react";
-import {
-  AssignDefaultsModeContext,
-  WorkflowDefaultParamsContext,
-  workflowDefaultParamsObj
-} from "../AssignDefaultsModeContext";
-import { difference, isEqual, kebabCase } from "lodash-es";
-import {
-  fakeWait,
-  getIntent,
-  getIntentClass,
-  LabelWithTooltipInfo
-} from "./utils";
-import useDeepCompareEffect from "use-deep-compare-effect";
-import { change } from "redux-form";
-import popoverOverflowModifiers from "../utils/popoverOverflowModifiers";
-import classNames from "classnames";
-
-const AbstractInput = props => {
-  const {
-    defaultValue,
-    meta: { dispatch, form, touched, error, warning },
-    onDefaultValChanged,
-    onFieldSubmit,
-    children,
-    tooltipProps,
-    tooltipError,
-    disabled,
-    intent,
-    tooltipInfo,
-    label,
-    inlineLabel,
-    isLabelTooltip,
-    secondaryLabel,
-    className,
-    showErrorIfUntouched,
-    asyncValidating,
-    containerStyle,
-    leftEl,
-    rightEl,
-    labelStyle,
-    noOuterLabel,
-    fileLimit,
-    noMarginBottom,
-    assignDefaultButton,
-    showGenerateDefaultDot,
-    setAssignDefaultsMode,
-    startAssigningDefault,
-    input,
-    noFillField,
-    isRequired,
-    isLoadingDefaultValue,
-    enableReinitialize,
-    defaultValCount
-  } = props;
-
-  const prevProps = useRef({ defaultValue, defaultValCount });
-
-  const updateDefaultValue = useCallback(() => {
-    dispatch(change(form, input.name, defaultValue));
-    onDefaultValChanged &&
-      onDefaultValChanged(defaultValue, input.name, form, props);
-    onFieldSubmit && onFieldSubmit(defaultValue);
-  }, [
-    defaultValue,
-    dispatch,
-    form,
-    input.name,
-    onDefaultValChanged,
-    onFieldSubmit,
-    props
-  ]);
-
-  useEffect(() => {
-    if (
-      ((input.value !== false && !input.value) || enableReinitialize) &&
-      defaultValue !== undefined
-    ) {
-      updateDefaultValue();
-    }
-  }, [defaultValue, enableReinitialize, input.value, updateDefaultValue]);
-
-  useEffect(() => {
-    const {
-      defaultValue: oldDefaultValue,
-      defaultValCount: oldDefaultValCount
-    } = prevProps.current;
-
-    if (
-      ((input.value !== false && !input.value) ||
-        enableReinitialize ||
-        defaultValCount !== oldDefaultValCount) &&
-      !isEqual(defaultValue, oldDefaultValue)
-    ) {
-      updateDefaultValue();
-    }
-
-    prevProps.current = { defaultValue, defaultValCount };
-  }, [
-    defaultValue,
-    defaultValCount,
-    enableReinitialize,
-    input.value,
-    updateDefaultValue
-  ]);
-
-  // if our custom field level validation is happening then we don't want to show the error visually
-  const showError =
-    (touched || showErrorIfUntouched) && error && !asyncValidating;
-  const showWarning = (touched || showErrorIfUntouched) && warning;
-  let componentToWrap =
-    isLabelTooltip || tooltipError ? (
-      <Tooltip
-        disabled={isLabelTooltip ? false : !showError}
-        intent={isLabelTooltip ? "none" : error ? "danger" : "warning"}
-        content={isLabelTooltip ? label : error || warning}
-        position={Position.TOP}
-        modifiers={popoverOverflowModifiers}
-        {...tooltipProps}
-      >
-        {children}
-      </Tooltip>
-    ) : (
-      children
-    );
-  const testClassName = "tg-test-" + kebabCase(input.name);
-  if (noFillField) {
-    componentToWrap = <div className="tg-no-fill-field">{componentToWrap}</div>;
-  }
-
-  let helperText;
-  if (!tooltipError) {
-    if (showError) {
-      helperText = error;
-    } else if (showWarning) {
-      helperText = warning;
-    }
-  }
-
-  // if in a cypress test show message so that inputs will not be interactable
-  if (window.Cypress && isLoadingDefaultValue) {
-    return "Loading default value...";
-  }
-
-  let labelInfo = secondaryLabel;
-
-  const hasOuterLabel = !noOuterLabel && !isLabelTooltip;
-  function getFileLimitInfo() {
-    if (!fileLimit) return "";
-    return `max ${fileLimit} file${fileLimit === 1 ? "" : "s"}`;
-  }
-
-  if (isRequired && hasOuterLabel && label && !labelInfo) {
-    labelInfo = `(required${fileLimit ? `, ${getFileLimitInfo()}` : ""})`;
-  } else if (!labelInfo && fileLimit) {
-    labelInfo = `(${getFileLimitInfo()})`;
-  }
-
-  return (
-    <FormGroup
-      className={classNames(className, testClassName, {
-        "tg-flex-form-content": leftEl || rightEl,
-        "tg-tooltipError": tooltipError,
-        "tg-has-error": showError && error
-      })}
-      disabled={disabled}
-      helperText={helperText}
-      intent={intent}
-      label={
-        hasOuterLabel && (
-          <LabelWithTooltipInfo
-            labelStyle={labelStyle}
-            label={label}
-            tooltipInfo={tooltipInfo}
-          />
-        )
-      }
-      inline={inlineLabel}
-      labelInfo={labelInfo}
-      style={{
-        ...(noMarginBottom && { marginBottom: 0 }),
-        ...containerStyle
-      }}
-    >
-      {showGenerateDefaultDot && (
-        <div style={{ zIndex: 10, position: "relative", height: 0, width: 0 }}>
-          <div style={{ position: "absolute", left: "0px", top: "0px" }}>
-            <Tooltip
-              modifiers={popoverOverflowModifiers}
-              content="Allows a Default to be Set. Click to Enter Set Default Mode (or press Shift+D when outside the input field)"
-            >
-              <div
-                onClick={() => {
-                  setAssignDefaultsMode(true);
-                  startAssigningDefault();
-                }}
-                className="generateDefaultDot"
-              ></div>
-            </Tooltip>
-          </div>
-        </div>
-      )}
-      {assignDefaultButton}
-      {leftEl} {componentToWrap} {rightEl}
-    </FormGroup>
-  );
-};
-
-export const withAbstractWrapper = (ComponentToWrap, opts = {}) => {
-  return props => {
-    const {
-      massageDefaultIdValue,
-      generateDefaultValue,
-      defaultValueByIdOverride,
-      defaultValue: defaultValueFromProps,
-      isRequired,
-      ...rest
-    } = props;
-
-    //get is assign defaults mode
-    //if assign default value mode then add on to the component
-    const [defaultValCount, setDefaultValCount] = useState(0);
-    const [defaultValueFromBackend, setDefault] = useState();
-    const [allowUserOverride, setUserOverride] = useState(true);
-    const [isLoadingDefaultValue, setLoadingDefaultValue] = useState(false);
-    const { inAssignDefaultsMode, setAssignDefaultsMode } = useContext(
-      AssignDefaultsModeContext
-    );
-    // tnr: we might want to grab this context object off the window in the future and have it live in lims by default
-    // there is no reason for those vals to live in TRC. Example code below:
-    // const workflowParams = useContext(window.__tgDefaultValParamsContext || defaultNullContext);
-    const workflowParams = useContext(WorkflowDefaultParamsContext);
-
-    const caresAboutToolContext = generateDefaultValue?.params?.toolName;
-
-    const customParamsToUse = {
-      ...(caresAboutToolContext
-        ? { ...workflowDefaultParamsObj, ...workflowParams }
-        : {}),
-      ...(generateDefaultValue ? generateDefaultValue.customParams : {})
-    };
-
-    async function triggerGetDefault() {
-      if (!defaultValueByIdOverride) {
-        //if defaultValueByIdOverride is passed, we can skip over getting the value from the backend straight to massaging the default value
-        if (!window.__triggerGetDefaultValueRequest) return;
-        if (!generateDefaultValue) return;
-        setLoadingDefaultValue(true);
-        //custom params should match params keys. if not throw an error
-        const doParamsMatch = isEqual(
-          Object.keys({
-            ...(caresAboutToolContext ? workflowDefaultParamsObj : {}), //we don't want to compare these keys so we just spread them here
-            ...(generateDefaultValue.params || {})
-          }).sort(),
-          Object.keys(customParamsToUse).sort()
-        );
-        if (!doParamsMatch) {
-          console.warn(
-            `Issue with generateDefaultValue. customParams don't match params`
-          );
-          console.warn(
-            `generateDefaultValue.params:`,
-            generateDefaultValue.params
-          );
-          console.warn(`generateDefaultValue.customParams:`, customParamsToUse);
-          throw new Error(
-            `Issue with generateDefaultValue code=${
-              generateDefaultValue.code
-            }: Difference detected with: ${difference(
-              Object.keys(generateDefaultValue.params || {}),
-              Object.keys(customParamsToUse || {})
-            ).join(
-              ", "
-            )}. customParams passed into the field should match params (as defined in defaultValueConstants.js). See console for more details.`
-          );
-        }
-      }
-
-      try {
-        let { defaultValue, allowUserOverride } = defaultValueByIdOverride
-          ? { defaultValue: defaultValueByIdOverride }
-          : await window.__triggerGetDefaultValueRequest(
-              generateDefaultValue.code,
-              customParamsToUse
-            );
-        if (massageDefaultIdValue) {
-          const massagedRes = await massageDefaultIdValue({
-            defaultValueById: defaultValue
-          });
-          if (massagedRes.defaultValue) {
-            defaultValue = massagedRes.defaultValue;
-          }
-          if (massagedRes.preventUserOverrideFromBeingDisabled) {
-            allowUserOverride = true;
-          }
-        }
-
-        // TODO:Add ths back in when we have a better way to determine if a field is a checkbox or switch
-        // if (
-        //   "false" === false
-        //   // ComponentToWrap === renderBlueprintCheckbox ||
-        //   // ComponentToWrap === renderBlueprintSwitch
-        // ) {
-        //   setDefault(defaultValue === "true");
-        // } else {
-        if (typeof defaultValue === "string") {
-          // remove double spaces and leading/trailing
-          defaultValue = defaultValue.replace(/\s+/g, " ").trim();
-        }
-        setDefault(defaultValue);
-        // }
-        setUserOverride(allowUserOverride);
-        setDefaultValCount(defaultValCount + 1);
-      } catch (error) {
-        console.error(`error aswf298f:`, error);
-      }
-      if (window.Cypress && window.Cypress.addFakeDefaultValueWait) {
-        await fakeWait();
-      }
-      setLoadingDefaultValue(false);
-    }
-    // if generateDefaultValue, hit the backend for that value
-    useDeepCompareEffect(() => {
-      // if the input already has a value we don't want to override with the default value request
-      if (rest.input.value) return;
-      triggerGetDefault();
-    }, [generateDefaultValue || {}]);
-    // const asyncValidating = props.asyncValidating;
-    const defaultProps = {
-      ...rest,
-      defaultValue: defaultValueFromBackend || defaultValueFromProps,
-      disabled: props.disabled || allowUserOverride === false,
-      readOnly: props.readOnly || isLoadingDefaultValue,
-      intent: getIntent(props),
-      intentClass: getIntentClass(props)
-    };
-
-    // don't show intent while async validating
-    // if (asyncValidating) {
-    //   delete defaultProps.intent;
-    //   delete defaultProps.intentClass;
-    // }
-
-    const startAssigningDefault = () =>
-      window.__showAssignDefaultValueModal &&
-      window.__showAssignDefaultValueModal({
-        ...props,
-        generateDefaultValue: {
-          ...props.generateDefaultValue,
-          customParams: customParamsToUse
-        },
-        onFinish: () => {
-          triggerGetDefault();
-        }
-      });
-
-    return (
-      <AbstractInput
-        {...{
-          ...opts,
-          defaultValCount,
-          isRequired,
-          ...defaultProps,
-          isLoadingDefaultValue,
-          showGenerateDefaultDot:
-            !inAssignDefaultsMode &&
-            window.__showGenerateDefaultDot &&
-            window.__showGenerateDefaultDot() &&
-            !!generateDefaultValue,
-          setAssignDefaultsMode,
-          startAssigningDefault,
-          assignDefaultButton: inAssignDefaultsMode && generateDefaultValue && (
-            <Button
-              onClick={startAssigningDefault}
-              small
-              style={{ background: "yellow", color: "black" }}
-            >
-              Assign Default
-            </Button>
-          )
-        }}
-      >
-        <ComponentToWrap {...defaultProps} />
-      </AbstractInput>
-    );
-  };
-};