@teselagen/ui 0.5.21-beta.1 → 0.5.21-beta.2

package/FormComponents/AbstractField.d.ts

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

package/index.cjs.js

@@ -32903,9 +32903,7 @@ const withAbstractWrapper = /* @__PURE__ */ __name((ComponentToWrap, opts = {})
   };
 }, "withAbstractWrapper");
 const InputField = generateField(RenderBlueprintInput);
-const FileUploadField = generateField(renderFileUpload, {
-  showErrorIfUntouched: true
-});
+const FileUploadField = generateField(renderFileUpload);
 const DateInputField = generateField(renderBlueprintDateInput);
 const DateRangeInputField = generateField(renderBlueprintDateRangeInput);
 const CheckboxField = generateField(renderBlueprintCheckbox, {
@@ -53030,35 +53028,37 @@ const PreviewCsvData = /* @__PURE__ */ __name((props) => {
     userSchema = exampleData,
     entities
   } = props;
-  const data = userSchema.userData && userSchema.userData.length && userSchema.userData.map((row, i) => {
-    const toRet = {
-      _isClean: row._isClean
-    };
-    validateAgainstSchema.fields.forEach(({ path: path2, defaultValue: defaultValue2 }) => {
-      const matchingKey = matchedHeaders == null ? void 0 : matchedHeaders[path2];
-      if (!matchingKey) {
-        toRet[path2] = defaultValue2 === void 0 ? defaultValue2 : "";
-      } else {
-        toRet[path2] = row[matchingKey];
-      }
-      if (toRet[path2] === void 0 || toRet[path2] === "") {
-        if (defaultValue2) {
-          if (isFunction$4(defaultValue2)) {
-            toRet[path2] = defaultValue2(i, row);
-          } else
-            toRet[path2] = defaultValue2;
+  const data = React$1.useMemo(() => {
+    return userSchema.userData && userSchema.userData.length && userSchema.userData.map((row, i) => {
+      const toRet = {
+        _isClean: row._isClean
+      };
+      validateAgainstSchema.fields.forEach(({ path: path2, defaultValue: defaultValue2 }) => {
+        const matchingKey = matchedHeaders == null ? void 0 : matchedHeaders[path2];
+        if (!matchingKey) {
+          toRet[path2] = defaultValue2 === void 0 ? defaultValue2 : "";
         } else {
-          toRet[path2] = "";
+          toRet[path2] = row[matchingKey];
         }
+        if (toRet[path2] === void 0 || toRet[path2] === "") {
+          if (defaultValue2) {
+            if (isFunction$4(defaultValue2)) {
+              toRet[path2] = defaultValue2(i, row);
+            } else
+              toRet[path2] = defaultValue2;
+          } else {
+            toRet[path2] = "";
+          }
+        }
+      });
+      if (row.id === void 0) {
+        toRet.id = nanoid();
+      } else {
+        toRet.id = row.id;
       }
+      return toRet;
     });
-    if (row.id === void 0) {
-      toRet.id = nanoid();
-    } else {
-      toRet.id = row.id;
-    }
-    return toRet;
-  });
+  }, [matchedHeaders, userSchema, validateAgainstSchema.fields]);
   return /* @__PURE__ */ React$1.createElement("div", { style: { minWidth: 400 } }, /* @__PURE__ */ React$1.createElement(core.Callout, { style: { marginBottom: 5 }, intent: "primary" }, headerMessage || (showDoesDataLookCorrectMsg ? "Does this data look correct? Edit it as needed." : `${isEditingExistingFile ? "Edit" : "Input"} your data here. Hover table headers for additional instructions.`)), validateAgainstSchema.description && /* @__PURE__ */ React$1.createElement(core.Callout, null, validateAgainstSchema.description), /* @__PURE__ */ React$1.createElement(
     "div",
     {
@@ -53102,13 +53102,15 @@ const SimpleInsertDataDialog = compose(
   showDoesDataLookCorrectMsg,
   submitting,
   userSchema,
-  validateAgainstSchema
+  validateAgainstSchema,
+  initialValues
 }) => {
+  var _a;
   const dispatch = reactRedux.useDispatch();
   const _reduxFormEntities = reactRedux.useSelector(
     (state) => {
-      var _a, _b;
-      return (_b = (_a = state.form) == null ? void 0 : _a[dataTableForm]) == null ? void 0 : _b.values.reduxFormEntities;
+      var _a2, _b;
+      return (_b = (_a2 = state.form) == null ? void 0 : _a2[dataTableForm]) == null ? void 0 : _b.values.reduxFormEntities;
     }
   );
   const reduxFormEntities = useDeepEqualMemo(_reduxFormEntities);
@@ -53117,8 +53119,8 @@ const SimpleInsertDataDialog = compose(
   }, [dataTableForm, dispatch]);
   const _reduxFormCellValidation = reactRedux.useSelector(
     (state) => {
-      var _a, _b;
-      return (_b = (_a = state.form) == null ? void 0 : _a[dataTableForm]) == null ? void 0 : _b.values.reduxFormCellValidation;
+      var _a2, _b;
+      return (_b = (_a2 = state.form) == null ? void 0 : _a2[dataTableForm]) == null ? void 0 : _b.values.reduxFormCellValidation;
     }
   );
   const reduxFormCellValidation = useDeepEqualMemo(_reduxFormCellValidation);
@@ -53133,7 +53135,7 @@ const SimpleInsertDataDialog = compose(
       rightElement: /* @__PURE__ */ React$1.createElement("div", { style: { paddingTop: 6, paddingRight: 5 } }, ".csv"),
       inlineLabel: true,
       label: "File Name:",
-      defaultValue: "manual_data_entry",
+      defaultValue: (_a = initialValues == null ? void 0 : initialValues.fileName) != null ? _a : "manual_data_entry",
       name: "fileName"
     }
   ), /* @__PURE__ */ React$1.createElement(
@@ -53317,6 +53319,7 @@ const MultipleFileDialog = /* @__PURE__ */ __name(({
   steps,
   hasSubmittedOuter
 }) => {
+  console.log({ filesWIssues, finishedFiles });
   const tabs = /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(core.Callout, { style: { marginBottom: 10, flexGrow: 0 }, intent: "warning" }, /* @__PURE__ */ React$1.createElement("div", null, "Please look over each of the following files and correct any issues.")), /* @__PURE__ */ React$1.createElement(
     core.Tabs,
     {
@@ -53492,6 +53495,7 @@ const UploadCsvWizardDialog = compose(
     if (_filesWIssues.length > 0) {
       const reduxFormEntitiesArray2 = [];
       const finishedFiles2 = _filesWIssues.map((f2, i) => {
+        console.log("aa");
         const { reduxFormEntities, reduxFormCellValidation } = reduxForm.formValueSelector(`editableCellTable-${i}`)(
           state,
           "reduxFormEntities",
@@ -53505,12 +53509,13 @@ const UploadCsvWizardDialog = compose(
         return entsToUse && entsToUse.length && !some(validationToUse, (v2) => v2) && entsToUse;
       });
       return {
-        reduxFormEntitiesArray: reduxFormEntitiesArray2,
-        finishedFiles: finishedFiles2
+        _reduxFormEntitiesArray: reduxFormEntitiesArray2,
+        _finishedFiles: finishedFiles2
       };
     }
   });
   const reduxFormEntitiesArray = useDeepEqualMemo(_reduxFormEntitiesArray);
+  console.log({ _finishedFiles });
   const finishedFiles = useDeepEqualMemo(_finishedFiles);
   const [hasSubmittedOuter, setSubmittedOuter] = React$1.useState();
   const [steps, setSteps] = React$1.useState(getInitialSteps(true));

package/index.es.js

@@ -32885,9 +32885,7 @@ const withAbstractWrapper = /* @__PURE__ */ __name((ComponentToWrap, opts = {})
   };
 }, "withAbstractWrapper");
 const InputField = generateField(RenderBlueprintInput);
-const FileUploadField = generateField(renderFileUpload, {
-  showErrorIfUntouched: true
-});
+const FileUploadField = generateField(renderFileUpload);
 const DateInputField = generateField(renderBlueprintDateInput);
 const DateRangeInputField = generateField(renderBlueprintDateRangeInput);
 const CheckboxField = generateField(renderBlueprintCheckbox, {
@@ -53012,35 +53010,37 @@ const PreviewCsvData = /* @__PURE__ */ __name((props) => {
     userSchema = exampleData,
     entities
   } = props;
-  const data = userSchema.userData && userSchema.userData.length && userSchema.userData.map((row, i) => {
-    const toRet = {
-      _isClean: row._isClean
-    };
-    validateAgainstSchema.fields.forEach(({ path: path2, defaultValue: defaultValue2 }) => {
-      const matchingKey = matchedHeaders == null ? void 0 : matchedHeaders[path2];
-      if (!matchingKey) {
-        toRet[path2] = defaultValue2 === void 0 ? defaultValue2 : "";
-      } else {
-        toRet[path2] = row[matchingKey];
-      }
-      if (toRet[path2] === void 0 || toRet[path2] === "") {
-        if (defaultValue2) {
-          if (isFunction$4(defaultValue2)) {
-            toRet[path2] = defaultValue2(i, row);
-          } else
-            toRet[path2] = defaultValue2;
+  const data = useMemo(() => {
+    return userSchema.userData && userSchema.userData.length && userSchema.userData.map((row, i) => {
+      const toRet = {
+        _isClean: row._isClean
+      };
+      validateAgainstSchema.fields.forEach(({ path: path2, defaultValue: defaultValue2 }) => {
+        const matchingKey = matchedHeaders == null ? void 0 : matchedHeaders[path2];
+        if (!matchingKey) {
+          toRet[path2] = defaultValue2 === void 0 ? defaultValue2 : "";
         } else {
-          toRet[path2] = "";
+          toRet[path2] = row[matchingKey];
         }
+        if (toRet[path2] === void 0 || toRet[path2] === "") {
+          if (defaultValue2) {
+            if (isFunction$4(defaultValue2)) {
+              toRet[path2] = defaultValue2(i, row);
+            } else
+              toRet[path2] = defaultValue2;
+          } else {
+            toRet[path2] = "";
+          }
+        }
+      });
+      if (row.id === void 0) {
+        toRet.id = nanoid();
+      } else {
+        toRet.id = row.id;
       }
+      return toRet;
     });
-    if (row.id === void 0) {
-      toRet.id = nanoid();
-    } else {
-      toRet.id = row.id;
-    }
-    return toRet;
-  });
+  }, [matchedHeaders, userSchema, validateAgainstSchema.fields]);
   return /* @__PURE__ */ React__default.createElement("div", { style: { minWidth: 400 } }, /* @__PURE__ */ React__default.createElement(Callout, { style: { marginBottom: 5 }, intent: "primary" }, headerMessage || (showDoesDataLookCorrectMsg ? "Does this data look correct? Edit it as needed." : `${isEditingExistingFile ? "Edit" : "Input"} your data here. Hover table headers for additional instructions.`)), validateAgainstSchema.description && /* @__PURE__ */ React__default.createElement(Callout, null, validateAgainstSchema.description), /* @__PURE__ */ React__default.createElement(
     "div",
     {
@@ -53084,13 +53084,15 @@ const SimpleInsertDataDialog = compose(
   showDoesDataLookCorrectMsg,
   submitting,
   userSchema,
-  validateAgainstSchema
+  validateAgainstSchema,
+  initialValues
 }) => {
+  var _a;
   const dispatch = useDispatch();
   const _reduxFormEntities = useSelector(
     (state) => {
-      var _a, _b;
-      return (_b = (_a = state.form) == null ? void 0 : _a[dataTableForm]) == null ? void 0 : _b.values.reduxFormEntities;
+      var _a2, _b;
+      return (_b = (_a2 = state.form) == null ? void 0 : _a2[dataTableForm]) == null ? void 0 : _b.values.reduxFormEntities;
     }
   );
   const reduxFormEntities = useDeepEqualMemo(_reduxFormEntities);
@@ -53099,8 +53101,8 @@ const SimpleInsertDataDialog = compose(
   }, [dataTableForm, dispatch]);
   const _reduxFormCellValidation = useSelector(
     (state) => {
-      var _a, _b;
-      return (_b = (_a = state.form) == null ? void 0 : _a[dataTableForm]) == null ? void 0 : _b.values.reduxFormCellValidation;
+      var _a2, _b;
+      return (_b = (_a2 = state.form) == null ? void 0 : _a2[dataTableForm]) == null ? void 0 : _b.values.reduxFormCellValidation;
     }
   );
   const reduxFormCellValidation = useDeepEqualMemo(_reduxFormCellValidation);
@@ -53115,7 +53117,7 @@ const SimpleInsertDataDialog = compose(
       rightElement: /* @__PURE__ */ React__default.createElement("div", { style: { paddingTop: 6, paddingRight: 5 } }, ".csv"),
       inlineLabel: true,
       label: "File Name:",
-      defaultValue: "manual_data_entry",
+      defaultValue: (_a = initialValues == null ? void 0 : initialValues.fileName) != null ? _a : "manual_data_entry",
       name: "fileName"
     }
   ), /* @__PURE__ */ React__default.createElement(
@@ -53299,6 +53301,7 @@ const MultipleFileDialog = /* @__PURE__ */ __name(({
   steps,
   hasSubmittedOuter
 }) => {
+  console.log({ filesWIssues, finishedFiles });
   const tabs = /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(Callout, { style: { marginBottom: 10, flexGrow: 0 }, intent: "warning" }, /* @__PURE__ */ React__default.createElement("div", null, "Please look over each of the following files and correct any issues.")), /* @__PURE__ */ React__default.createElement(
     Tabs,
     {
@@ -53474,6 +53477,7 @@ const UploadCsvWizardDialog = compose(
     if (_filesWIssues.length > 0) {
       const reduxFormEntitiesArray2 = [];
       const finishedFiles2 = _filesWIssues.map((f2, i) => {
+        console.log("aa");
         const { reduxFormEntities, reduxFormCellValidation } = formValueSelector(`editableCellTable-${i}`)(
           state,
           "reduxFormEntities",
@@ -53487,12 +53491,13 @@ const UploadCsvWizardDialog = compose(
         return entsToUse && entsToUse.length && !some(validationToUse, (v2) => v2) && entsToUse;
       });
       return {
-        reduxFormEntitiesArray: reduxFormEntitiesArray2,
-        finishedFiles: finishedFiles2
+        _reduxFormEntitiesArray: reduxFormEntitiesArray2,
+        _finishedFiles: finishedFiles2
       };
     }
   });
   const reduxFormEntitiesArray = useDeepEqualMemo(_reduxFormEntitiesArray);
+  console.log({ _finishedFiles });
   const finishedFiles = useDeepEqualMemo(_finishedFiles);
   const [hasSubmittedOuter, setSubmittedOuter] = useState();
   const [steps, setSteps] = useState(getInitialSteps(true));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.5.21-beta.1",
+  "version": "0.5.21-beta.2",
   "main": "./src/index.js",
   "exports": {
     ".": {
@@ -12,6 +12,10 @@
   "dependencies": {
     "@teselagen/file-utils": "0.3.16",
     "@teselagen/bounce-loader": "0.3.11",
+    "@blueprintjs/core": "3.52.0",
+    "@blueprintjs/datetime": "3.23.19",
+    "@blueprintjs/icons": "3.33.0",
+    "@blueprintjs/select": "3.18.11",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/modifiers": "^7.0.0",
     "@dnd-kit/sortable": "^8.0.0",

package/src/DataTable/utils/useTableParams.js

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

package/src/FormComponents/AbstractField.js

@@ -0,0 +1,388 @@
+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>
+    );
+  };
+};

package/src/FormComponents/index.js

@@ -1199,9 +1199,7 @@ export const withAbstractWrapper = (ComponentToWrap, opts = {}) => {
 };
 
 export const InputField = generateField(RenderBlueprintInput);
-export const FileUploadField = generateField(renderFileUpload, {
-  showErrorIfUntouched: true
-});
+export const FileUploadField = generateField(renderFileUpload);
 export const DateInputField = generateField(renderBlueprintDateInput);
 export const DateRangeInputField = generateField(renderBlueprintDateRangeInput);
 export const CheckboxField = generateField(renderBlueprintCheckbox, {

package/src/UploadCsvWizard.js

@@ -69,46 +69,50 @@ export const PreviewCsvData = props => {
     userSchema = exampleData,
     entities
   } = props;
-  const data =
-    userSchema.userData &&
-    userSchema.userData.length &&
-    userSchema.userData.map((row, i) => {
-      const toRet = {
-        _isClean: row._isClean
-      };
-      validateAgainstSchema.fields.forEach(({ path, defaultValue }) => {
-        const matchingKey = matchedHeaders?.[path];
-        if (!matchingKey) {
-          toRet[path] = defaultValue === undefined ? defaultValue : "";
-        } else {
-          toRet[path] = row[matchingKey];
-        }
-        if (toRet[path] === undefined || toRet[path] === "") {
-          if (defaultValue) {
-            if (isFunction(defaultValue)) {
-              toRet[path] = defaultValue(i, row);
-            } else toRet[path] = defaultValue;
+
+  const data = useMemo(() => {
+    return (
+      userSchema.userData &&
+      userSchema.userData.length &&
+      userSchema.userData.map((row, i) => {
+        const toRet = {
+          _isClean: row._isClean
+        };
+        validateAgainstSchema.fields.forEach(({ path, defaultValue }) => {
+          const matchingKey = matchedHeaders?.[path];
+          if (!matchingKey) {
+            toRet[path] = defaultValue === undefined ? defaultValue : "";
           } else {
-            // const exampleToUse = isArray(example) //this means that the row was not added by a user
-            //   ? example[i1]
-            //   : i1 === 0 && example;
-            toRet[path] = "";
-            // if (useExampleData && exampleToUse) {
-            //   toRet[path] = exampleToUse;
-            //   delete toRet._isClean;
-            // } else {
-            // }
+            toRet[path] = row[matchingKey];
           }
-        }
-      });
+          if (toRet[path] === undefined || toRet[path] === "") {
+            if (defaultValue) {
+              if (isFunction(defaultValue)) {
+                toRet[path] = defaultValue(i, row);
+              } else toRet[path] = defaultValue;
+            } else {
+              // const exampleToUse = isArray(example) //this means that the row was not added by a user
+              //   ? example[i1]
+              //   : i1 === 0 && example;
+              toRet[path] = "";
+              // if (useExampleData && exampleToUse) {
+              //   toRet[path] = exampleToUse;
+              //   delete toRet._isClean;
+              // } else {
+              // }
+            }
+          }
+        });
 
-      if (row.id === undefined) {
-        toRet.id = nanoid();
-      } else {
-        toRet.id = row.id;
-      }
-      return toRet;
-    });
+        if (row.id === undefined) {
+          toRet.id = nanoid();
+        } else {
+          toRet.id = row.id;
+        }
+        return toRet;
+      })
+    );
+  }, [matchedHeaders, userSchema, validateAgainstSchema.fields]);
 
   return (
     <div style={{ minWidth: 400 }}>
@@ -167,7 +171,8 @@ export const SimpleInsertDataDialog = compose(
   showDoesDataLookCorrectMsg,
   submitting,
   userSchema,
-  validateAgainstSchema
+  validateAgainstSchema,
+  initialValues
 }) => {
   const dispatch = useDispatch();
   const _reduxFormEntities = useSelector(
@@ -197,7 +202,7 @@ export const SimpleInsertDataDialog = compose(
           }
           inlineLabel
           label="File Name:"
-          defaultValue={"manual_data_entry"}
+          defaultValue={initialValues?.fileName ?? "manual_data_entry"}
           name="fileName"
         />
         <PreviewCsvData
@@ -413,6 +418,7 @@ const MultipleFileDialog = ({
   steps,
   hasSubmittedOuter
 }) => {
+  console.log({ filesWIssues, finishedFiles });
   const tabs = (
     <>
       <Callout style={{ marginBottom: 10, flexGrow: 0 }} intent="warning">
@@ -628,6 +634,7 @@ const UploadCsvWizardDialog = compose(
     if (_filesWIssues.length > 0) {
       const reduxFormEntitiesArray = [];
       const finishedFiles = _filesWIssues.map((f, i) => {
+        console.log("aa");
         const { reduxFormEntities, reduxFormCellValidation } =
           formValueSelector(`editableCellTable-${i}`)(
             state,
@@ -647,12 +654,13 @@ const UploadCsvWizardDialog = compose(
         );
       });
       return {
-        reduxFormEntitiesArray,
-        finishedFiles
+        _reduxFormEntitiesArray: reduxFormEntitiesArray,
+        _finishedFiles: finishedFiles
       };
     }
   });
   const reduxFormEntitiesArray = useDeepEqualMemo(_reduxFormEntitiesArray);
+  console.log({ _finishedFiles });
   const finishedFiles = useDeepEqualMemo(_finishedFiles);
 
   const [hasSubmittedOuter, setSubmittedOuter] = useState();