Update displayName

saleor · Aug 9, 2021 · 33570c0 · 33570c0
1 parent cc0b3b8
commit 33570c0
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 42 deletions.
diff --git a/src/translations/components/TranslationsAttributesPage/TranslationsAttributesPage.tsx b/src/translations/components/TranslationsAttributesPage/TranslationsAttributesPage.tsx
@@ -112,7 +112,7 @@ const TranslationsAttributesPage: React.FC<TranslationsAttributesPageProps> = ({
         onSubmit={onSubmit}
       />
       <CardSpacer />
-      {withChoices && (
+      {data?.attribute?.choices.edges.length > 0 && withChoices && (
         <TranslationFields
           activeField={activeField}
           disabled={disabled}

diff --git a/src/translations/components/TranslationsPagesPage/TranslationsPagesPage.tsx b/src/translations/components/TranslationsPagesPage/TranslationsPagesPage.tsx
@@ -127,26 +127,39 @@ const TranslationsPagesPage: React.FC<TranslationsPagesPageProps> = ({
         onSubmit={onSubmit}
       />
       <CardSpacer />
-      <TranslationFields
-        activeField={activeField}
-        disabled={disabled}
-        initialState={true}
-        title={intl.formatMessage(commonMessages.translationAttributes)}
-        fields={
-          data?.attributeValues?.map(attrVal => ({
-            id: attrVal.attributeValue.id,
-            displayName: attrVal.name,
-            name: attrVal?.name,
-            translation: attrVal?.translation?.richText || null,
-            type: "rich" as "rich",
-            value: attrVal?.richText
-          })) || []
-        }
-        saveButtonState={saveButtonState}
-        onEdit={onEdit}
-        onDiscard={onDiscard}
-        onSubmit={onAttributeValueSubmit}
-      />
+      {data?.attributeValues?.length > 0 && (
+        <>
+          <TranslationFields
+            activeField={activeField}
+            disabled={disabled}
+            initialState={true}
+            title={intl.formatMessage(commonMessages.translationAttributes)}
+            fields={
+              data.attributeValues.map((attrVal, i) => ({
+                id: attrVal.attributeValue.id,
+                displayName: intl.formatMessage(
+                  {
+                    defaultMessage: "Attribute {number}",
+                    description: "attribute list"
+                  },
+                  {
+                    number: i + 1
+                  }
+                ),
+                name: attrVal?.name,
+                translation: attrVal?.translation?.richText || null,
+                type: "rich" as "rich",
+                value: attrVal?.richText
+              })) || []
+            }
+            saveButtonState={saveButtonState}
+            onEdit={onEdit}
+            onDiscard={onDiscard}
+            onSubmit={onAttributeValueSubmit}
+          />
+          <CardSpacer />
+        </>
+      )}
     </Container>
   );
 };

diff --git a/src/translations/components/TranslationsProductsPage/TranslationsProductsPage.tsx b/src/translations/components/TranslationsProductsPage/TranslationsProductsPage.tsx
@@ -126,27 +126,39 @@ const TranslationsProductsPage: React.FC<TranslationsProductsPageProps> = ({
         onSubmit={onSubmit}
       />
       <CardSpacer />
-      <TranslationFields
-        activeField={activeField}
-        disabled={disabled}
-        initialState={true}
-        title={intl.formatMessage(commonMessages.translationAttributes)}
-        fields={
-          data?.attributeValues?.map(attrVal => ({
-            id: attrVal.attributeValue.id,
-            displayName: attrVal.name,
-            name: attrVal?.name,
-            translation: attrVal?.translation?.richText || null,
-            type: "rich" as "rich",
-            value: attrVal?.richText
-          })) || []
-        }
-        saveButtonState={saveButtonState}
-        onEdit={onEdit}
-        onDiscard={onDiscard}
-        onSubmit={onAttributeValueSubmit}
-      />
-      <CardSpacer />
+      {data?.attributeValues?.length > 0 && (
+        <>
+          <TranslationFields
+            activeField={activeField}
+            disabled={disabled}
+            initialState={true}
+            title={intl.formatMessage(commonMessages.translationAttributes)}
+            fields={
+              data.attributeValues.map((attrVal, i) => ({
+                id: attrVal.attributeValue.id,
+                displayName: intl.formatMessage(
+                  {
+                    defaultMessage: "Attribute {number}",
+                    description: "attribute list"
+                  },
+                  {
+                    number: i + 1
+                  }
+                ),
+                name: attrVal?.name,
+                translation: attrVal?.translation?.richText || null,
+                type: "rich" as "rich",
+                value: attrVal?.richText
+              })) || []
+            }
+            saveButtonState={saveButtonState}
+            onEdit={onEdit}
+            onDiscard={onDiscard}
+            onSubmit={onAttributeValueSubmit}
+          />
+          <CardSpacer />
+        </>
+      )}
     </Container>
   );
 };