OD-19321 Fixed dirty form check

ishgroup · Sep 23, 2024 · a63f44f · a63f44f
1 parent 10229ae
commit a63f44f
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 25 deletions.
diff --git a/client-html/src/js/common/components/list-view/ListView.tsx b/client-html/src/js/common/components/list-view/ListView.tsx
@@ -785,8 +785,9 @@ class ListView extends React.PureComponent<Props & OwnProps & State["list"] & St
   };
 
   checkDirty = (handler, args, reset?: boolean) => {
-    const { isDirty, selection, creatingNew } = this.props;
-    if (isDirty) {
+    const { isDirty, selection, creatingNew, fullScreenEditView, records } = this.props;
+
+    if (isDirty && (records.layout === 'Two column' ? fullScreenEditView : true)) {
       this.showConfirm({
         onConfirm: () => {
           handler(...args);

diff --git a/...rc/js/common/components/list-view/components/full-screen-edit-view/FullScreenEditView.tsx b/...rc/js/common/components/list-view/components/full-screen-edit-view/FullScreenEditView.tsx
@@ -157,7 +157,6 @@ class FullScreenEditViewBase extends React.PureComponent<EditViewContainerProps,
       dispatch,
       rootEntity,
       isNested,
-      nestedIndex,
       nameCondition,
       showConfirm,
       manualLink,
@@ -246,7 +245,6 @@ class FullScreenEditViewBase extends React.PureComponent<EditViewContainerProps,
               manualLink={manualLink}
               rootEntity={rootEntity}
               isNested={isNested}
-              nestedIndex={nestedIndex}
               form={form}
               isNew={creatingNew}
               values={values}

diff --git a/client-html/src/js/containers/entities/articleProducts/components/ArticleProductEditView.tsx b/client-html/src/js/containers/entities/articleProducts/components/ArticleProductEditView.tsx
@@ -55,7 +55,6 @@ const ArticleProductEditView: React.FC<ArticleProductEditViewProps> = props => {
     dispatch,
     dirty,
     form,
-    nestedIndex,
     rootEntity,
     twoColumn,
     showConfirm,
@@ -83,7 +82,6 @@ const ArticleProductEditView: React.FC<ArticleProductEditViewProps> = props => {
         dispatch,
         dirty,
         form,
-        nestedIndex,
         rootEntity,
         twoColumn,
         showConfirm,

diff --git a/client-html/src/js/containers/entities/contacts/components/ContactEditView.tsx b/client-html/src/js/containers/entities/contacts/components/ContactEditView.tsx
@@ -101,7 +101,6 @@ const ContactEditView = (props: EditViewProps<Contact> & Props) => {
     dispatch,
     dirty,
     form,
-    nestedIndex,
     rootEntity,
     twoColumn,
     showConfirm,
@@ -170,7 +169,6 @@ const ContactEditView = (props: EditViewProps<Contact> & Props) => {
         dirty,
         invalid,
         form,
-        nestedIndex,
         rootEntity,
         twoColumn,
         showConfirm,

diff --git a/client-html/src/js/containers/entities/corporatePasses/components/CorporatePassEditView.tsx b/client-html/src/js/containers/entities/corporatePasses/components/CorporatePassEditView.tsx
@@ -24,7 +24,6 @@ const CorporatePassEditView = props => {
   const {
     isNew,
     isNested,
-    nestedIndex,
     values,
     classes,
     dispatch,
@@ -45,7 +44,6 @@ const CorporatePassEditView = props => {
         isNew,
         isNested,
         syncErrors,
-        nestedIndex,
         values,
         classes,
         dispatch,

diff --git a/client-html/src/js/containers/entities/courseClasses/components/CourseClassEditView.tsx b/client-html/src/js/containers/entities/courseClasses/components/CourseClassEditView.tsx
@@ -328,7 +328,6 @@ const BudgetAdornment: React.FC<BudgetAdornmentProps> = ({
 const CourseClassEditView: React.FC<Props> = ({
   isNew,
   isNested,
-  nestedIndex,
   values,
   dispatch,
   dirty,
@@ -554,7 +553,6 @@ const CourseClassEditView: React.FC<Props> = ({
       itemProps={{
         isNew,
         isNested,
-        nestedIndex,
         values,
         dispatch,
         dirty,

diff --git a/client-html/src/js/containers/entities/discounts/components/DiscountEditView.tsx b/client-html/src/js/containers/entities/discounts/components/DiscountEditView.tsx
@@ -50,7 +50,6 @@ const DiscountEditView = React.memo<any>(props => {
     dispatch,
     dirty,
     form,
-    nestedIndex,
     rootEntity,
     twoColumn,
     showConfirm,
@@ -76,7 +75,6 @@ const DiscountEditView = React.memo<any>(props => {
           dispatch,
           dirty,
           form,
-          nestedIndex,
           rootEntity,
           twoColumn,
           showConfirm,

diff --git a/client-html/src/js/containers/entities/enrolments/components/EnrolmentEditView.tsx b/client-html/src/js/containers/entities/enrolments/components/EnrolmentEditView.tsx
@@ -31,7 +31,6 @@ const EnrolmentEditView = props => {
   const {
     isNew,
     isNested,
-    nestedIndex,
     values,
     classes,
     dispatch,
@@ -65,7 +64,6 @@ const EnrolmentEditView = props => {
           dirty,
           invalid,
           form,
-          nestedIndex,
           rootEntity,
           twoColumn,
           submitSucceeded,

diff --git a/...ml/src/js/containers/entities/membershipProducts/components/MembershipProductEditView.tsx b/...ml/src/js/containers/entities/membershipProducts/components/MembershipProductEditView.tsx
@@ -58,7 +58,6 @@ const MembershipProductEditView: React.FC<MembershipProductEditViewProps> = prop
     dispatch,
     dirty,
     form,
-    nestedIndex,
     rootEntity,
     twoColumn,
     showConfirm,
@@ -86,7 +85,6 @@ const MembershipProductEditView: React.FC<MembershipProductEditViewProps> = prop
         dispatch,
         dirty,
         form,
-        nestedIndex,
         rootEntity,
         twoColumn,
         showConfirm,

diff --git a/client-html/src/js/containers/entities/messages/components/MessageEditView.tsx b/client-html/src/js/containers/entities/messages/components/MessageEditView.tsx
@@ -25,7 +25,6 @@ interface MessageEditViewProps {
   dispatch?: Dispatch<any>;
   dirty?: boolean;
   form?: string;
-  nestedIndex?: number;
   rootEntity?: string;
   twoColumn?: boolean;
   showConfirm?: any;

diff --git a/client-html/src/js/containers/entities/rooms/components/RoomEditView.tsx b/client-html/src/js/containers/entities/rooms/components/RoomEditView.tsx
@@ -32,7 +32,6 @@ const RoomEditView = props => {
   const {
     isNew,
     isNested,
-    nestedIndex,
     values,
     classes,
     dispatch,
@@ -54,7 +53,6 @@ const RoomEditView = props => {
       itemProps={{
         isNew,
         isNested,
-        nestedIndex,
         values,
         classes,
         dispatch,

diff --git a/client-html/src/js/containers/entities/voucherProducts/components/VoucherProductEditView.tsx b/client-html/src/js/containers/entities/voucherProducts/components/VoucherProductEditView.tsx
@@ -50,7 +50,6 @@ const VoucherProductEditView: React.FC<VoucherProductEditViewProps> = props => {
     dispatch,
     dirty,
     form,
-    nestedIndex,
     rootEntity,
     twoColumn,
     showConfirm,
@@ -77,7 +76,6 @@ const VoucherProductEditView: React.FC<VoucherProductEditViewProps> = props => {
         dispatch,
         dirty,
         form,
-        nestedIndex,
         rootEntity,
         twoColumn,
         showConfirm,

diff --git a/client-html/src/js/model/common/ListView.ts b/client-html/src/js/model/common/ListView.ts
@@ -98,7 +98,6 @@ export interface EditViewContainerProps<E = any> extends Partial<InjectedFormPro
   manualLink?: any;
   isNested?: boolean;
   match?: any;
-  nestedIndex?: number;
   nameCondition?: AnyArgFunction;
   updateCaption?: (arg: string) => React.Component;
   threeColumn?: boolean;
@@ -119,7 +118,6 @@ export interface EditViewProps<V = any> extends Partial<InjectedFormProps<V>> {
   onScroll?: AnyArgFunction;
   twoColumn?: boolean;
   isNested?: boolean;
-  nestedIndex?: number;
   onCloseClick?: AnyArgFunction;
   syncErrors?: FormErrors<V>;
   tabIndex?: number;