saleor · maarcingebala · May 15, 2019 · May 14, 2019 · May 14, 2019 · May 14, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable, unreleased changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- Fix translation discard button - #4109 by @benekex2
+
 ...
 
 ## 2.6.0

diff --git a/saleor/static/dashboard-next/translations/components/TranslationFields/TranslationFields.tsx b/saleor/static/dashboard-next/translations/components/TranslationFields/TranslationFields.tsx
@@ -12,7 +12,6 @@ import Typography from "@material-ui/core/Typography";
 import ArrowIcon from "@material-ui/icons/ArrowDropDown";
 import classNames from "classnames";
 import * as React from "react";
-
 import CardTitle from "../../../components/CardTitle";
 import { ConfirmButtonTransitionState } from "../../../components/ConfirmButton";
 import Grid from "../../../components/Grid";
@@ -39,6 +38,7 @@ export interface TranslationFieldsProps {
   initialState: boolean;
   saveButtonState: ConfirmButtonTransitionState;
   onEdit: (field: string) => void;
+  onDiscard: () => void;
   onSubmit: (field: string, data: string) => void;
 }
 
@@ -115,6 +115,7 @@ const TranslationFields = withStyles(styles, { name: "TranslationFields" })(
     title,
     saveButtonState,
     onEdit,
+    onDiscard,
     onSubmit
   }: TranslationFieldsProps & WithStyles<typeof styles>) => {
     const [expanded, setExpandedState] = React.useState(initialState);
@@ -163,6 +164,7 @@ const TranslationFields = withStyles(styles, { name: "TranslationFields" })(
                           edit={false}
                           initial={field.value}
                           saveButtonState="default"
+                          onDiscard={onDiscard}
                           onSubmit={undefined}
                         />
                       ) : field.type === "long" ? (
@@ -171,6 +173,7 @@ const TranslationFields = withStyles(styles, { name: "TranslationFields" })(
                           edit={false}
                           initial={field.value}
                           saveButtonState="default"
+                          onDiscard={onDiscard}
                           onSubmit={undefined}
                         />
                       ) : (
@@ -179,6 +182,7 @@ const TranslationFields = withStyles(styles, { name: "TranslationFields" })(
                           edit={false}
                           initial={field.value}
                           saveButtonState="default"
+                          onDiscard={onDiscard}
                           onSubmit={undefined}
                         />
                       )
@@ -194,6 +198,7 @@ const TranslationFields = withStyles(styles, { name: "TranslationFields" })(
                           edit={activeField === field.name}
                           initial={field.translation}
                           saveButtonState={saveButtonState}
+                          onDiscard={onDiscard}
                           onSubmit={data => onSubmit(field.name, data)}
                         />
                       ) : field.type === "long" ? (
@@ -202,6 +207,7 @@ const TranslationFields = withStyles(styles, { name: "TranslationFields" })(
                           edit={activeField === field.name}
                           initial={field.translation}
                           saveButtonState={saveButtonState}
+                          onDiscard={onDiscard}
                           onSubmit={data => onSubmit(field.name, data)}
                         />
                       ) : (
@@ -210,6 +216,7 @@ const TranslationFields = withStyles(styles, { name: "TranslationFields" })(
                           edit={activeField === field.name}
                           initial={field.translation}
                           saveButtonState={saveButtonState}
+                          onDiscard={onDiscard}
                           onSubmit={data => onSubmit(field.name, data)}
                         />
                       )

diff --git a/...static/dashboard-next/translations/components/TranslationFields/TranslationFieldsLong.tsx b/...static/dashboard-next/translations/components/TranslationFields/TranslationFieldsLong.tsx
@@ -12,6 +12,7 @@ interface TranslationFieldsLongProps {
   edit: boolean;
   initial: string;
   saveButtonState: ConfirmButtonTransitionState;
+  onDiscard: () => void;
   onSubmit: (data: string) => void;
 }
 
@@ -20,14 +21,15 @@ const TranslationFieldsLong: React.FC<TranslationFieldsLongProps> = ({
   edit,
   initial,
   saveButtonState,
+  onDiscard,
   onSubmit
 }) =>
   edit ? (
     <Form
       initial={{ translation: initial }}
       onSubmit={data => onSubmit(data.translation)}
     >
-      {({ change, data, reset, submit }) => (
+      {({ change, data, submit }) => (
         <div>
           <TextField
             disabled={disabled}
@@ -40,7 +42,7 @@ const TranslationFieldsLong: React.FC<TranslationFieldsLongProps> = ({
           />
           <TranslationFieldsSave
             saveButtonState={saveButtonState}
-            onDiscard={reset}
+            onDiscard={onDiscard}
             onSave={submit}
           />
         </div>

diff --git a/...static/dashboard-next/translations/components/TranslationFields/TranslationFieldsRich.tsx b/...static/dashboard-next/translations/components/TranslationFields/TranslationFieldsRich.tsx
@@ -13,6 +13,7 @@ interface TranslationFieldsRichProps {
   edit: boolean;
   initial: string;
   saveButtonState: ConfirmButtonTransitionState;
+  onDiscard: () => void;
   onSubmit: (data: string) => void;
 }
 
@@ -21,14 +22,15 @@ const TranslationFieldsRich: React.FC<TranslationFieldsRichProps> = ({
   edit,
   initial,
   saveButtonState,
+  onDiscard,
   onSubmit
 }) =>
   edit ? (
     <Form
       initial={{ translation: initial }}
       onSubmit={data => onSubmit(data.translation)}
     >
-      {({ change, reset, submit }) => (
+      {({ change, submit }) => (
         <div>
           <RichTextEditor
             disabled={disabled}
@@ -42,7 +44,7 @@ const TranslationFieldsRich: React.FC<TranslationFieldsRichProps> = ({
           />
           <TranslationFieldsSave
             saveButtonState={saveButtonState}
-            onDiscard={reset}
+            onDiscard={onDiscard}
             onSave={submit}
           />
         </div>

diff --git a/...static/dashboard-next/translations/components/TranslationFields/TranslationFieldsSave.tsx b/...static/dashboard-next/translations/components/TranslationFields/TranslationFieldsSave.tsx
@@ -47,7 +47,7 @@ const TranslationFieldsSave = withStyles(styles, {
       >
         {i18n.t("Save")}
       </ConfirmButton>
-      <Button onClick={onDiscard}>{i18n.t("Discard Changes")}</Button>
+      <Button onClick={onDiscard}>{i18n.t("Discard")}</Button>
     </div>
   )
 );

diff --git a/...tatic/dashboard-next/translations/components/TranslationFields/TranslationFieldsShort.tsx b/...tatic/dashboard-next/translations/components/TranslationFields/TranslationFieldsShort.tsx
@@ -12,6 +12,7 @@ interface TranslationFieldsShortProps {
   edit: boolean;
   initial: string;
   saveButtonState: ConfirmButtonTransitionState;
+  onDiscard: () => void;
   onSubmit: (data: string) => void;
 }
 
@@ -20,14 +21,15 @@ const TranslationFieldsShort: React.FC<TranslationFieldsShortProps> = ({
   edit,
   initial,
   saveButtonState,
+  onDiscard,
   onSubmit
 }) =>
   edit ? (
     <Form
       initial={{ translation: initial }}
       onSubmit={data => onSubmit(data.translation)}
     >
-      {({ change, data, reset, submit }) => (
+      {({ change, data, submit }) => (
         <div>
           <TextField
             disabled={disabled}
@@ -39,7 +41,7 @@ const TranslationFieldsShort: React.FC<TranslationFieldsShortProps> = ({
           />
           <TranslationFieldsSave
             saveButtonState={saveButtonState}
-            onDiscard={reset}
+            onDiscard={onDiscard}
             onSave={submit}
           />
         </div>

diff --git a/...rd-next/translations/components/TranslationsCategoriesPage/TranslationsCategoriesPage.tsx b/...rd-next/translations/components/TranslationsCategoriesPage/TranslationsCategoriesPage.tsx
@@ -34,6 +34,7 @@ const TranslationsCategoriesPage: React.StatelessComponent<
   category,
   saveButtonState,
   onBack,
+  onDiscard,
   onEdit,
   onLanguageChange,
   onSubmit
@@ -83,6 +84,7 @@ const TranslationsCategoriesPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
     <CardSpacer />
@@ -113,6 +115,7 @@ const TranslationsCategoriesPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
   </Container>

diff --git a/...-next/translations/components/TranslationsCollectionsPage/TranslationsCollectionsPage.tsx b/...-next/translations/components/TranslationsCollectionsPage/TranslationsCollectionsPage.tsx
@@ -34,6 +34,7 @@ const TranslationsCollectionsPage: React.StatelessComponent<
   collection,
   saveButtonState,
   onBack,
+  onDiscard,
   onEdit,
   onLanguageChange,
   onSubmit
@@ -85,6 +86,7 @@ const TranslationsCollectionsPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
     <CardSpacer />
@@ -117,6 +119,7 @@ const TranslationsCollectionsPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
   </Container>

diff --git a/...ic/dashboard-next/translations/components/TranslationsPagesPage/TranslationsPagesPage.tsx b/...ic/dashboard-next/translations/components/TranslationsPagesPage/TranslationsPagesPage.tsx
@@ -34,6 +34,7 @@ const TranslationsPagesPage: React.StatelessComponent<
   page,
   saveButtonState,
   onBack,
+  onDiscard,
   onEdit,
   onLanguageChange,
   onSubmit
@@ -80,6 +81,7 @@ const TranslationsPagesPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
     <CardSpacer />
@@ -110,6 +112,7 @@ const TranslationsPagesPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
   </Container>

diff --git a/...ext/translations/components/TranslationsProductTypesPage/TranslationsProductTypesPage.tsx b/...ext/translations/components/TranslationsProductTypesPage/TranslationsProductTypesPage.tsx
@@ -32,6 +32,7 @@ const TranslationsProductTypesPage: React.StatelessComponent<
   productType,
   saveButtonState,
   onBack,
+  onDiscard,
   onEdit,
   onLanguageChange,
   onSubmit
@@ -92,6 +93,7 @@ const TranslationsProductTypesPage: React.StatelessComponent<
             ]}
             saveButtonState={saveButtonState}
             onEdit={onEdit}
+            onDiscard={onDiscard}
             onSubmit={onSubmit}
           />
           {attributeIndex < productType.productAttributes.length - 1 && (
@@ -141,6 +143,7 @@ const TranslationsProductTypesPage: React.StatelessComponent<
                 ]}
                 saveButtonState={saveButtonState}
                 onEdit={onEdit}
+                onDiscard={onDiscard}
                 onSubmit={onSubmit}
               />
               {attributeIndex < productType.variantAttributes.length - 1 && (

diff --git a/...hboard-next/translations/components/TranslationsProductsPage/TranslationsProductsPage.tsx b/...hboard-next/translations/components/TranslationsProductsPage/TranslationsProductsPage.tsx
@@ -34,6 +34,7 @@ const TranslationsProductsPage: React.StatelessComponent<
   product,
   saveButtonState,
   onBack,
+  onDiscard,
   onEdit,
   onLanguageChange,
   onSubmit
@@ -83,6 +84,7 @@ const TranslationsProductsPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
     <CardSpacer />
@@ -113,6 +115,7 @@ const TranslationsProductsPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
   </Container>

diff --git a/...ic/dashboard-next/translations/components/TranslationsSalesPage/TranslationsSalesPage.tsx b/...ic/dashboard-next/translations/components/TranslationsSalesPage/TranslationsSalesPage.tsx
@@ -30,6 +30,7 @@ const TranslationsSalesPage: React.StatelessComponent<
   sale,
   saveButtonState,
   onBack,
+  onDiscard,
   onEdit,
   onLanguageChange,
   onSubmit
@@ -67,6 +68,7 @@ const TranslationsSalesPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
   </Container>

diff --git a/...hboard-next/translations/components/TranslationsVouchersPage/TranslationsVouchersPage.tsx b/...hboard-next/translations/components/TranslationsVouchersPage/TranslationsVouchersPage.tsx
@@ -30,6 +30,7 @@ const TranslationsVouchersPage: React.StatelessComponent<
   voucher,
   saveButtonState,
   onBack,
+  onDiscard,
   onEdit,
   onLanguageChange,
   onSubmit
@@ -70,6 +71,7 @@ const TranslationsVouchersPage: React.StatelessComponent<
       ]}
       saveButtonState={saveButtonState}
       onEdit={onEdit}
+      onDiscard={onDiscard}
       onSubmit={onSubmit}
     />
   </Container>

diff --git a/saleor/static/dashboard-next/translations/types/TranslationsEntitiesPage.ts b/saleor/static/dashboard-next/translations/types/TranslationsEntitiesPage.ts
@@ -9,6 +9,7 @@ export interface TranslationsEntitiesPageProps {
   saveButtonState: ConfirmButtonTransitionState;
   onBack: () => void;
   onEdit: (field: string) => void;
+  onDiscard: () => void;
   onLanguageChange: (lang: string) => void;
   onSubmit: (field: string, data: string) => void;
 }
diff --git a/saleor/static/dashboard-next/translations/views/TranslationsCategories.tsx b/saleor/static/dashboard-next/translations/views/TranslationsCategories.tsx
@@ -53,6 +53,9 @@ const TranslationsCategories: React.FC<TranslationsCategoriesProps> = ({
       navigate("?", true);
     }
   };
+  const onDiscard = () => {
+    navigate("?", true);
+  };
 
   return (
     <TypedCategoryTranslationDetails variables={{ id, language: languageCode }}>
@@ -106,6 +109,7 @@ const TranslationsCategories: React.FC<TranslationsCategoriesProps> = ({
                   )
                 }
                 onEdit={onEdit}
+                onDiscard={onDiscard}
                 onLanguageChange={lang =>
                   navigate(
                     languageEntityUrl(lang, TranslatableEntities.categories, id)

diff --git a/saleor/static/dashboard-next/translations/views/TranslationsCollections.tsx b/saleor/static/dashboard-next/translations/views/TranslationsCollections.tsx
@@ -53,6 +53,9 @@ const TranslationsCollections: React.FC<TranslationsCollectionsProps> = ({
       navigate("?", true);
     }
   };
+  const onDiscard = () => {
+    navigate("?", true);
+  };
 
   return (
     <TypedCollectionTranslationDetails
@@ -101,6 +104,7 @@ const TranslationsCollections: React.FC<TranslationsCollectionsProps> = ({
                 languages={maybe(() => shop.languages, [])}
                 saveButtonState={saveButtonState}
                 onEdit={onEdit}
+                onDiscard={onDiscard}
                 onBack={() =>
                   navigate(
                     languageEntitiesUrl(