Merged in bcal-167-disabled-fields (pull request #6024)

BCAL-167: Fixing none api selects being required offline

Approved-by: Dennis Hernandez

Author: jtoliver-quoin

app/javascript/components/record-form/form/field-types/select-field-container.jsx

@@ -9,15 +9,14 @@ import { fetchReferralUsers } from "../../../record-actions/transitions/action-c
 import SearchableSelect from "../../../searchable-select";
 import { getUserFilters } from "../../../record-actions/transitions/components/utils";
 import { SERVICE_SECTION_FIELDS } from "../../../record-actions/transitions/components/referrals";
-import { buildOptions, getSelectFieldDefaultValue, handleChangeOnServiceUser, isFieldRequired } from "../utils";
+import { buildOptions, getSelectFieldDefaultValue, handleChangeOnServiceUser, asyncFieldOffline } from "../utils";
 import { useMemoizedSelector } from "../../../../libs";
 import { getOptionsAreLoading } from "../../selectors";
 import { getLoading } from "../../../record-list/selectors";
 import { REFERRAL_TYPE } from "../../../record-actions/transitions";
 import { OPTION_TYPES } from "../../../form";
 import useOptions from "../../../form/use-options";
 import { RECORD_TYPES } from "../../../../config";
-import { ASYNC_OPTIONS } from "../constants";
 
 const SelectFieldContainer = ({
   field,
@@ -46,8 +45,7 @@ const SelectFieldContainer = ({
     multi_select: multiSelect,
     selected_value: selectedDefaultValue,
     option_strings_source: optionStringsSource,
-    option_strings_text: optionStringsText,
-    required
+    option_strings_text: optionStringsText
   } = field;
   const option = optionStringsSource || optionStringsText;
   const fieldValue = typeof value === "boolean" ? String(value) : value;
@@ -110,8 +108,7 @@ const SelectFieldContainer = ({
     );
   };
 
-  const apiSelectOptionsOffline =
-    !isFieldRequired(online, option, required) && ASYNC_OPTIONS.includes(option) && required;
+  const apiSelectOptionsOffline = asyncFieldOffline(online, option);
 
   const inputHelperText = () => {
     if (error && touched) {

app/javascript/components/record-form/form/form-section-field.jsx

@@ -33,7 +33,7 @@ import AttachmentField from "./field-types/attachments";
 import LinkToForm from "./field-types/link-to-form";
 import TallyField from "./field-types/tally-field";
 import css from "./styles.css";
-import { isFieldRequired } from "./utils";
+import { asyncFieldOffline } from "./utils";
 
 const FormSectionField = ({
   name,
@@ -104,7 +104,7 @@ const FormSectionField = ({
     InputLabelProps: {
       htmlFor: name,
       shrink: true,
-      required: isFieldRequired(online, optionStringsSource, required),
+      required: asyncFieldOffline(online, optionStringsSource) ? false : required,
       classes: {
         root: css.inputLabel
       }

app/javascript/components/record-form/form/utils/async-field-offline.js

@@ -0,0 +1,11 @@
+import { ASYNC_OPTIONS } from "../constants";
+
+function asyncFieldOffline(online, option) {
+  if (!online && ASYNC_OPTIONS.includes(option)) {
+    return true;
+  }
+
+  return false;
+}
+
+export default asyncFieldOffline;

app/javascript/components/record-form/form/utils/async-field-offline.unit.test.js

@@ -0,0 +1,21 @@
+import { CUSTOM_STRINGS_SOURCE } from "../constants";
+
+import asyncFieldOffline from "./async-field-offline";
+
+describe("asyncFieldOffline", () => {
+  it("returns false when online and options uses endpoint", () => {
+    expect(asyncFieldOffline(true, CUSTOM_STRINGS_SOURCE.agency)).to.be.false;
+  });
+
+  it("returns true when not online and options uses endpoint", () => {
+    expect(asyncFieldOffline(false, CUSTOM_STRINGS_SOURCE.agency)).to.be.true;
+  });
+
+  it("returns false when online and options does not use endpoint", () => {
+    expect(asyncFieldOffline(true, "none-api-option-source")).to.be.false;
+  });
+
+  it("returns false when offline and options does not use endpoint and required true", () => {
+    expect(asyncFieldOffline(false, "none-api-option-source")).to.be.false;
+  });
+});

app/javascript/components/record-form/form/utils/index.js

@@ -24,4 +24,4 @@ export { default as serviceIsReferrable } from "./service-is-referrable";
 export { default as shouldFieldUpdate } from "./should-field-update";
 export { default as updateSubformEntries } from "./update-subform-entries";
 export { default as withStickyOption } from "./with-sticky-option";
-export { default as isFieldRequired } from "./is-field-required";
+export { default as asyncFieldOffline } from "./async-field-offline";

app/javascript/components/record-form/form/utils/is-field-required.js

@@ -14,19 +14,15 @@ import {
   TALLY_FIELD
 } from "../constants";
 
-import { isFieldRequired } from "./utils";
-import { ASYNC_OPTIONS } from "./constants";
+import { asyncFieldOffline } from "./utils";
 
 const MAX_PERMITTED_INTEGER = 2147483647;
 
 export const fieldValidations = (field, { i18n, online = false }) => {
   const { multi_select: multiSelect, name, type, required, option_strings_source: optionStringsSource } = field;
   const validations = {};
 
-  if (
-    field.visible === false ||
-    (!isFieldRequired(online, optionStringsSource, required, true) && ASYNC_OPTIONS.includes(optionStringsSource))
-  ) {
+  if (field.visible === false || asyncFieldOffline(online, optionStringsSource)) {
     return validations;
   }