ish-ui_1.0.40_update (#1182)

* updated ish ui to latest * Resolved conflicts * fixed common form field props resolving * fixed tests
ishgroup · Mar 28, 2024 · 4e32ef4 · 4e32ef4
1 parent d78bc5b
commit 4e32ef4
Show file tree

Hide file tree

Showing 54 changed files with 99 additions and 138 deletions.
diff --git a/client-html/package-lock.json b/client-html/package-lock.json
diff --git a/client-html/package.json b/client-html/package.json
@@ -105,7 +105,7 @@
     "date-fns-tz": "1.3.7",
     "decimal.js-light": "2.*",
     "eslint-import-resolver-webpack": "0.*",
-    "ish-ui": "^1.0.36",
+    "ish-ui": "^1.0.47",
     "lodash.debounce": "4.*",
     "lodash.isempty": "4.*",
     "lodash.isequal": "4.*",

diff --git a/client-html/src/js/common/components/form/formFields/FormField.tsx b/client-html/src/js/common/components/form/formFields/FormField.tsx
@@ -21,7 +21,7 @@ const FormField = React.forwardRef<any, FormFieldWrapperProps>((props, ref) => {
   } = props;
 
   const tags = type === "tags" ? props.tags : [];
-  const required = type !== "stub" && type !== "color" ? props.required : false;
+  const required = type !== "stub" && type !== "color" && type !== "radio" ? props.required : false;
 
   const validateResolver = useMemo(() => {
     const result = [];
@@ -44,15 +44,11 @@ const FormField = React.forwardRef<any, FormFieldWrapperProps>((props, ref) => {
 
   return (
     <Field
+      ref={ref as any}
       type={type}
       name={name}
       component={FormFieldBase}
       validate={validateResolver}
-      props={{
-        ref,
-        format: rest.format,
-        placeholder: (props as any).placeholder || COMMON_PLACEHOLDER
-      }}
       {...rest}
     />
   );

diff --git a/client-html/src/js/common/components/form/formFields/FormFieldBase.tsx b/client-html/src/js/common/components/form/formFields/FormFieldBase.tsx
@@ -25,6 +25,7 @@ import {
 import debounce from "lodash.debounce";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form/lib/Field";
+import { COMMON_PLACEHOLDER } from "../../../../constants/Forms";
 import { AngelFormFieldProps } from "../../../../model/common/Fields";
 import { useAppSelector } from "../../../utils/hooks";
 import EditInPlaceQuerySelect from "./EditInPlaceQuerySelect";
@@ -36,7 +37,7 @@ const FormFieldBase = (props: AngelFormFieldProps) => {
 
   const { type, ...rest } = props;
 
-  const { input, format, debounced = true } = type !== "stub" && type !== "color"
+  const { input, format, debounced = true } = type !== "stub" && type !== "color" && type !== "radio"
     ? props
     : stubFieldMocks;
 
@@ -80,7 +81,8 @@ const FormFieldBase = (props: AngelFormFieldProps) => {
 
   const sharedProps = {
     ...rest,
-    ...debounced ? { input: inputProxy } : {}
+    ...debounced ? { input: inputProxy } : {},
+    placeholder: (rest as any).placeholder || COMMON_PLACEHOLDER
   };
 
   switch (type) {
@@ -158,7 +160,9 @@ const FormFieldBase = (props: AngelFormFieldProps) => {
       return <FormSwitch<WrappedFieldInputProps> {...sharedProps} />;
     case "checkbox":
       return <CheckboxField<WrappedFieldInputProps>
-        {...sharedProps} />;
+        {...sharedProps}
+        color={props.color as any}
+      />;
     case "multilineText":
       return <EditInPlaceField<WrappedFieldInputProps, WrappedFieldMetaProps>
         {...sharedProps} multiline/>;

diff --git a/client-html/src/js/common/components/form/nestedList/components/SearchInput.tsx b/client-html/src/js/common/components/form/nestedList/components/SearchInput.tsx
@@ -7,9 +7,8 @@ import Close from "@mui/icons-material/Close";
 import Button from "@mui/material/Button";
 import IconButton from "@mui/material/IconButton";
 import Input from "@mui/material/Input";
-import { EditInPlaceSearchSelect, stubFunction } from "ish-ui";
+import { EditInPlaceSearchSelect, mapSelectItems, stubFunction } from "ish-ui";
 import React, { useMemo } from "react";
-import { mapSelectItems } from "../../../../utils/common";
 import EditInPlaceQuerySelect from "../../formFields/EditInPlaceQuerySelect";
 
 const getAqlLabel = entity => {

diff --git a/client-html/src/js/common/components/list-view/components/bulk-edit/utils/index.ts b/client-html/src/js/common/components/list-view/components/bulk-edit/utils/index.ts
@@ -7,9 +7,9 @@
  */
 
 import { CourseEnrolmentType, CourseStatus, DeliveryMode, OutcomeStatus } from "@api/model";
+import { mapSelectItems, SelectItemDefault } from "ish-ui";
 import { fundingSourceValues } from "../../../../../../containers/entities/courseClasses/constants";
-import { EntityName, SelectItemDefault } from "../../../../../../model/entities/common";
-import { mapSelectItems } from "../../../../../utils/common";
+import { EntityName } from "../../../../../../model/entities/common";
 import {
   validateFundingSourse,
   validatePurchasingContractScheduleIdentifier,

diff --git a/...html/src/js/common/utils/common/index.tsx → ...-html/src/js/common/utils/common/index.ts b/...html/src/js/common/utils/common/index.tsx → ...-html/src/js/common/utils/common/index.ts
@@ -5,9 +5,7 @@
 
 import { DataRow } from "@api/model";
 import { format as formatDateTime } from "date-fns";
-import React from "react";
 import history from "../../../constants/History";
-import { SelectItemDefault } from "../../../model/entities/common";
 
 export const updateHistory = (params, url) => {
   const paramsString = decodeURIComponent(params.toString());
@@ -52,11 +50,6 @@ export const getDeepValue = (source, path) => {
   return source[path];
 };
 
-export const sortDefaultSelectItems = (a: SelectItemDefault, b: SelectItemDefault) =>
-  (a.label[0].toLowerCase() > b.label[0].toLowerCase() ? 1 : -1);
-
-export const mapSelectItems = (i): SelectItemDefault => ({ label: i, value: i });
-
 export const getCustomColumnsMap = (columns: string): (dataRow: DataRow) => any => {
   const colArr: string[] = columns.split(",");
   const booleanArr = ["true", "false"];

diff --git a/client-html/src/js/containers/automation/components/Bindings.tsx b/client-html/src/js/containers/automation/components/Bindings.tsx
@@ -11,13 +11,12 @@ import IconButton from "@mui/material/IconButton";
 import Typography from "@mui/material/Typography";
 import { makeStyles } from "@mui/styles";
 import clsx from "clsx";
-import { AddButton, AppTheme, useHoverShowStyles, YYYY_MM_DD_MINUSED } from "ish-ui";
+import { AddButton, AppTheme, SelectItemDefault, useHoverShowStyles, YYYY_MM_DD_MINUSED } from "ish-ui";
 import React, { useCallback, useMemo } from "react";
 import { Dispatch } from "redux";
 import { arrayPush, arrayRemove, Field, FieldArray } from "redux-form";
 import DataTypeRenderer from "../../../common/components/form/DataTypeRenderer";
 import { CatalogItemType } from "../../../model/common/Catalog";
-import { SelectItemDefault } from "../../../model/entities/common";
 import { IMPORT_TEMPLATES_FORM_NAME } from "../containers/import-templates/ImportTemplates";
 import { SCRIPT_EDIT_VIEW_FORM_NAME } from "../containers/scripts/constants";
 import { renderAutomationItems } from "../utils";

diff --git a/client-html/src/js/containers/automation/constants/index.ts b/client-html/src/js/containers/automation/constants/index.ts
@@ -1,6 +1,5 @@
 import * as Entities from "@aql/queryLanguageModel";
-import { StringValueType } from "ish-ui";
-import { mapSelectItems } from "../../../common/utils/common";
+import { mapSelectItems, StringValueType } from "ish-ui";
 import { stringLiterals } from "../../../common/utils/stringLiteral";
 
 export const AQL_ENTITIES = Object

diff --git a/...src/js/containers/automation/containers/email-templates/containers/EmailTemplatesForm.tsx b/...src/js/containers/automation/containers/email-templates/containers/EmailTemplatesForm.tsx
@@ -13,15 +13,14 @@ import { Grid, Grow } from "@mui/material";
 import IconButton from "@mui/material/IconButton";
 import Tooltip from "@mui/material/Tooltip";
 import Typography from "@mui/material/Typography";
-import { InfoPill, NumberArgFunction, usePrevious } from "ish-ui";
+import { InfoPill, mapSelectItems, NumberArgFunction, usePrevious } from "ish-ui";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { Dispatch } from "redux";
 import { FieldArray, Form, initialize, InjectedFormProps } from "redux-form";
 import AppBarActions from "../../../../../common/components/appBar/AppBarActions";
 import RouteChangeConfirm from "../../../../../common/components/dialog/RouteChangeConfirm";
 import FormField from "../../../../../common/components/form/formFields/FormField";
 import AppBarContainer from "../../../../../common/components/layout/AppBarContainer";
-import { mapSelectItems } from "../../../../../common/utils/common";
 import { getManualLink } from "../../../../../common/utils/getManualLink";
 import { validateSingleMandatoryField } from "../../../../../common/utils/validation";
 import { CatalogItemType } from "../../../../../model/common/Catalog";

diff --git a/...c/js/containers/automation/containers/export-templates/containers/ExportTemplatesForm.tsx b/...c/js/containers/automation/containers/export-templates/containers/ExportTemplatesForm.tsx
@@ -14,15 +14,14 @@ import Grow from "@mui/material/Grow";
 import IconButton from "@mui/material/IconButton";
 import Tooltip from "@mui/material/Tooltip";
 import Typography from "@mui/material/Typography";
-import { InfoPill, NumberArgFunction, usePrevious } from "ish-ui";
+import { InfoPill, mapSelectItems, NumberArgFunction, usePrevious } from "ish-ui";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { Dispatch } from "redux";
 import { FieldArray, Form, initialize, InjectedFormProps } from "redux-form";
 import AppBarActions from "../../../../../common/components/appBar/AppBarActions";
 import RouteChangeConfirm from "../../../../../common/components/dialog/RouteChangeConfirm";
 import FormField from "../../../../../common/components/form/formFields/FormField";
 import AppBarContainer from "../../../../../common/components/layout/AppBarContainer";
-import { mapSelectItems } from "../../../../../common/utils/common";
 import { getManualLink } from "../../../../../common/utils/getManualLink";
 import { CatalogItemType } from "../../../../../model/common/Catalog";
 import { EntityItems, EntityName } from "../../../../../model/entities/common";

diff --git a/client-html/src/js/containers/automation/containers/scripts/Scripts.tsx b/client-html/src/js/containers/automation/containers/scripts/Scripts.tsx
@@ -4,13 +4,13 @@
  */
 
 import { ScheduleType, Script } from "@api/model";
+import { mapSelectItems } from "ish-ui";
 import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import { Dispatch } from "redux";
 import { getFormInitialValues, getFormSyncErrors, getFormValues, initialize, reduxForm } from "redux-form";
 import { showConfirm } from "../../../../common/actions";
-import { mapSelectItems } from "../../../../common/utils/common";
 import { onSubmitFail } from "../../../../common/utils/highlightFormErrors";
 import { State } from "../../../../reducers/state";
 import { createScriptItem, deleteScriptItem, getScriptItem, saveScriptItem } from "./actions";

diff --git a/...tml/src/js/containers/automation/containers/scripts/components/cards/QueryCardContent.tsx b/...tml/src/js/containers/automation/containers/scripts/components/cards/QueryCardContent.tsx
@@ -6,11 +6,11 @@
 import * as Entities from "@aql/queryLanguageModel";
 import { CircularProgress, Grid, Typography } from "@mui/material";
 import Collapse from "@mui/material/Collapse";
+import { mapSelectItems } from "ish-ui";
 import debounce from "lodash.debounce";
 import React, { useCallback, useEffect, useState } from "react";
 import FormField from "../../../../../../common/components/form/formFields/FormField";
 import EntityService from "../../../../../../common/services/EntityService";
-import { mapSelectItems } from "../../../../../../common/utils/common";
 import { getPluralSuffix } from "../../../../../../common/utils/strings";
 import { PLAIN_LIST_MAX_PAGE_SIZE } from "../../../../../../constants/Config";
 

diff --git a/...l/src/js/containers/automation/containers/scripts/components/cards/TriggerCardContent.tsx b/...l/src/js/containers/automation/containers/scripts/components/cards/TriggerCardContent.tsx
@@ -7,19 +7,17 @@ import { Script, TagRequirementType, TriggerType } from "@api/model";
 import * as Entities from "@aql/queryLanguageModel";
 import Help from "@mui/icons-material/Help";
 import IconButton from "@mui/material/IconButton";
-import { TagInputList } from "ish-ui";
+import { mapSelectItems, SelectItemDefault, TagInputList } from "ish-ui";
 import React, { useEffect, useState } from "react";
 import { Dispatch } from "redux";
 import { change } from "redux-form";
 import instantFetchErrorHandler from "../../../../../../common/api/fetch-errors-handlers/InstantFetchErrorHandler";
 import FormField from "../../../../../../common/components/form/formFields/FormField";
-import { mapSelectItems } from "../../../../../../common/utils/common";
+import { useAppSelector } from "../../../../../../common/utils/hooks";
 import { CatalogItemType } from "../../../../../../model/common/Catalog";
-import { SelectItemDefault } from "../../../../../../model/entities/common";
+import { getEntityTags } from "../../../../../tags/actions";
 import TagsService from "../../../../../tags/services/TagsService";
 import { AQL_ENTITY_ITEMS } from "../../../../constants";
-import { getEntityTags } from "../../../../../tags/actions";
-import { useAppSelector } from "../../../../../../common/utils/hooks";
 
 // Filter AbstractInvoice and include Quote
 const AllEntities = [

diff --git a/client-html/src/js/containers/automation/containers/scripts/containers/ScriptsForm.tsx b/client-html/src/js/containers/automation/containers/scripts/containers/ScriptsForm.tsx
@@ -13,8 +13,8 @@ import CodeIcon from '@mui/icons-material/Code';
 import DeleteForever from "@mui/icons-material/DeleteForever";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import FileCopy from "@mui/icons-material/FileCopy";
-import UploadIcon from "@mui/icons-material/Upload";
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
+import UploadIcon from "@mui/icons-material/Upload";
 import ViewAgendaIcon from '@mui/icons-material/ViewAgenda';
 import { Divider, Grid } from "@mui/material";
 import Accordion from "@mui/material/Accordion";
@@ -30,6 +30,7 @@ import {
   DD_MMM_YYYY_AT_HH_MM_AAAA_SPECIAL,
   formatRelativeDate,
   InfoPill,
+  mapSelectItems,
   ShowConfirmCaller,
   usePrevious
 } from "ish-ui";
@@ -41,7 +42,6 @@ import AppBarActions from "../../../../../common/components/appBar/AppBarActions
 import RouteChangeConfirm from "../../../../../common/components/dialog/RouteChangeConfirm";
 import FormField from "../../../../../common/components/form/formFields/FormField";
 import AppBarContainer from "../../../../../common/components/layout/AppBarContainer";
-import { mapSelectItems } from "../../../../../common/utils/common";
 import { getManualLink } from "../../../../../common/utils/getManualLink";
 import { ApiMethods } from "../../../../../model/common/apiHandlers";
 import { CatalogItemType } from "../../../../../model/common/Catalog";

diff --git a/...ml/src/js/containers/checkout/components/summary/components/SummaryExpandableClassRow.tsx b/...ml/src/js/containers/checkout/components/summary/components/SummaryExpandableClassRow.tsx
@@ -19,15 +19,14 @@ import Grid from "@mui/material/Grid";
 import IconButton from "@mui/material/IconButton";
 import Typography from "@mui/material/Typography";
 import clsx from "clsx";
-import { formatCurrency, StyledCheckbox } from "ish-ui";
+import { formatCurrency, mapSelectItems, StyledCheckbox } from "ish-ui";
 import debounce from "lodash.debounce";
 import React from "react";
 import { Dispatch } from "redux";
 import { change } from "redux-form";
 import { showConfirm } from "../../../../../common/actions";
 import FormField from "../../../../../common/components/form/formFields/FormField";
 import Uneditable from "../../../../../common/components/form/formFields/Uneditable";
-import { mapSelectItems } from "../../../../../common/utils/common";
 import { CheckoutCourse } from "../../../../../model/checkout";
 import { checkoutChangeSummaryItemField, checkoutUpdateSummaryItem } from "../../../actions/checkoutSummary";
 import { CHECKOUT_SUMMARY_FORM as summmaryForm } from "../CheckoutSummaryList";

diff --git a/client-html/src/js/containers/entities/contacts/components/ContactDetails.tsx b/client-html/src/js/containers/entities/contacts/components/ContactDetails.tsx
@@ -13,13 +13,12 @@ import Checkbox from "@mui/material/Checkbox";
 import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import Typography from "@mui/material/Typography";
-import { openInternalLink, SettingsAdornment } from "ish-ui";
+import { mapSelectItems, openInternalLink, SettingsAdornment } from "ish-ui";
 import React, { useCallback, useState } from "react";
 import { connect } from "react-redux";
 import { change } from "redux-form";
 import FormField from "../../../../common/components/form/formFields/FormField";
 import ExpandableContainer from "../../../../common/components/layout/expandable/ExpandableContainer";
-import { mapSelectItems } from "../../../../common/utils/common";
 import { greaterThanNullValidation, validateEmail, validatePhoneNumber } from "../../../../common/utils/validation";
 import { EditViewProps } from "../../../../model/common/ListView";
 import { State } from "../../../../reducers/state";

diff --git a/client-html/src/js/containers/entities/contacts/components/ContactsTutor.tsx b/client-html/src/js/containers/entities/contacts/components/ContactsTutor.tsx
@@ -6,14 +6,13 @@
 import { Contact, PayslipPayType, WorkingWithChildrenStatus } from "@api/model";
 import { Grid } from "@mui/material";
 import Typography from "@mui/material/Typography";
-import { makeAppStyles, Switch } from "ish-ui";
+import { makeAppStyles, mapSelectItems, Switch } from "ish-ui";
 import React, { useEffect, useState } from "react";
 import NumberFormat from "react-number-format";
 import { change } from "redux-form";
 import FormField from "../../../../common/components/form/formFields/FormField";
 import ExpandableContainer from "../../../../common/components/layout/expandable/ExpandableContainer";
 import { LIST_EDIT_VIEW_FORM_NAME } from "../../../../common/components/list-view/constants";
-import { mapSelectItems } from "../../../../common/utils/common";
 import { formatTFN, parseTFN, validateTFN } from "../../../../common/utils/validation/tfnValidation";
 import { EditViewProps } from "../../../../model/common/ListView";
 import CustomFields from "../../customFieldTypes/components/CustomFieldsTypes";

diff --git a/client-html/src/js/containers/entities/contacts/components/ContactsVET.tsx b/client-html/src/js/containers/entities/contacts/components/ContactsVET.tsx
@@ -26,14 +26,13 @@ import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import createStyles from "@mui/styles/createStyles";
 import withStyles from "@mui/styles/withStyles";
-import { SettingsAdornment, usePrevious } from "ish-ui";
+import { mapSelectItems, SettingsAdornment, usePrevious } from "ish-ui";
 import React, { useCallback, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { Dispatch } from "redux";
 import { change } from "redux-form";
 import FormField from "../../../../common/components/form/formFields/FormField";
 import ExpandableContainer from "../../../../common/components/layout/expandable/ExpandableContainer";
-import { mapSelectItems } from "../../../../common/utils/common";
 import { validateNonNegative } from "../../../../common/utils/validation";
 import { formatTFN, parseTFN, validateTFN } from "../../../../common/utils/validation/tfnValidation";
 import { EditViewProps } from "../../../../model/common/ListView";

diff --git a/...html/src/js/containers/entities/courseClasses/components/budget/modal/BudgetCostModal.tsx b/...html/src/js/containers/entities/courseClasses/components/budget/modal/BudgetCostModal.tsx
@@ -4,15 +4,13 @@
  */
 
 import { Account, ClassCostRepetitionType, Tax } from "@api/model";
+import { Dialog, DialogActions, DialogTitle } from "@mui/material";
 import Button from "@mui/material/Button";
-import Dialog from "@mui/material/Dialog";
-import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
-import DialogTitle from "@mui/material/DialogTitle";
+import { mapSelectItems } from "ish-ui";
 import React, { useCallback, useMemo } from "react";
 import { connect } from "react-redux";
 import { getFormValues, InjectedFormProps, reduxForm, submit } from "redux-form";
-import { mapSelectItems } from "../../../../../../common/utils/common";
 import { valiadateSelectItemAvailable } from "../../../../../../common/utils/validation";
 import { ClassCostExtended, CourseClassExtended } from "../../../../../../model/entities/CourseClass";
 import { State } from "../../../../../../reducers/state";

diff --git a/...-html/src/js/containers/entities/courseClasses/components/timetable/CopySessionDialog.tsx b/...-html/src/js/containers/entities/courseClasses/components/timetable/CopySessionDialog.tsx
@@ -12,12 +12,11 @@ import Paper from "@mui/material/Paper";
 import Popper from "@mui/material/Popper";
 import Typography from "@mui/material/Typography";
 import { createStyles, withStyles } from "@mui/styles";
-import { normalizeNumberToPositive } from "ish-ui";
+import { mapSelectItems, normalizeNumberToPositive } from "ish-ui";
 import React, { useCallback } from "react";
 import { connect } from "react-redux";
 import { getFormValues, reduxForm } from "redux-form";
 import FormField from "../../../../../common/components/form/formFields/FormField";
-import { mapSelectItems } from "../../../../../common/utils/common";
 import { SessionRepeatTypes } from "../../../../../model/entities/CourseClass";
 
 const styles = createStyles(theme => ({