Add names of attributes translations (saleor#2433)

* Add names of attributes translations * Support plain text attributes translation * Fix translation field type * Refactor attribute translations input data * Refactor translation fields code * Fix translation fields invalid skeleton display
aiworksla · Nov 4, 2022 · 7963836 · 7963836
1 parent dc5a6ac
commit 7963836
Show file tree

Hide file tree

Showing 16 changed files with 205 additions and 241 deletions.
diff --git a/introspection.json b/introspection.json
@@ -9357,6 +9357,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "attribute",
+            "description": "Represents a value of an attribute.",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "AttributeTranslatableContent",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "attributeValue",
             "description": "Represents a value of an attribute.",

diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
@@ -3460,10 +3460,6 @@
     "context": "window title",
     "string": "Create Product"
   },
-  "PajjqE": {
-    "context": "attribute list",
-    "string": "Attribute {number}"
-  },
   "PbQJY5": {
     "context": "section header",
     "string": "Saleor Apps"
@@ -7882,6 +7878,10 @@
     "context": "attribute type",
     "string": "Content Attribute"
   },
+  "zgqPGF": {
+    "context": "attribute list",
+    "string": "Attribute {name}"
+  },
   "zjHH6b": {
     "context": "sale start date",
     "string": "Started"

diff --git a/schema.graphql b/schema.graphql
@@ -1881,6 +1881,9 @@ type AttributeValueTranslatableContent implements Node {
     languageCode: LanguageCodeEnum!
   ): AttributeValueTranslation
 
+  """Represents an attribute."""
+  attribute: Attribute!
+
   """Represents a value of an attribute."""
   attributeValue: AttributeValue @deprecated(reason: "This field will be removed in Saleor 4.0. Get model fields from the root level queries.")
 }

diff --git a/src/fragments/translations.ts b/src/fragments/translations.ts
@@ -1,5 +1,31 @@
 import { gql } from "@apollo/client";
 
+export const attributeValueTranslatableFragment = gql`
+  fragment AttributeValueTranslatable on AttributeValueTranslatableContent {
+    id
+    name
+    plainText
+    richText
+    attributeValue {
+      id
+    }
+    attribute {
+      id
+      name
+    }
+    translation(languageCode: $language) {
+      id
+      name
+      plainText
+      richText
+      language {
+        code
+        language
+      }
+    }
+  }
+`;
+
 export const categoryTranslationFragment = gql`
   fragment CategoryTranslation on CategoryTranslatableContent {
     translation(languageCode: $language) {
@@ -64,21 +90,7 @@ export const productTranslationFragment = gql`
       }
     }
     attributeValues {
-      id
-      name
-      richText
-      attributeValue {
-        id
-      }
-      translation(languageCode: $language) {
-        id
-        name
-        richText
-        language {
-          code
-          language
-        }
-      }
+      ...AttributeValueTranslatable
     }
   }
 `;
@@ -98,21 +110,7 @@ export const productVariantTranslationFragment = gql`
       }
     }
     attributeValues {
-      id
-      name
-      richText
-      attributeValue {
-        id
-      }
-      translation(languageCode: $language) {
-        id
-        name
-        richText
-        language {
-          code
-          language
-        }
-      }
+      ...AttributeValueTranslatable
     }
   }
 `;
@@ -191,21 +189,7 @@ export const pageTranslationFragment = gql`
       }
     }
     attributeValues {
-      id
-      name
-      richText
-      attributeValue {
-        id
-      }
-      translation(languageCode: $language) {
-        id
-        name
-        richText
-        language {
-          code
-          language
-        }
-      }
+      ...AttributeValueTranslatable
     }
   }
 `;
@@ -240,11 +224,13 @@ export const attributeChoicesTranslationFragment = gql`
       node {
         id
         name
+        plainText
         richText
         inputType
         translation(languageCode: $language) {
           id
           name
+          plainText
           richText
         }
       }
@@ -291,28 +277,6 @@ export const attributeTranslationDetailsFragment = gql`
   }
 `;
 
-export const attributeValueTranslatableContentFragment = gql`
-  fragment AttributeValueTranslatableContent on AttributeTranslatableContent {
-    translation(languageCode: $language) {
-      id
-      name
-    }
-    attribute {
-      id
-      name
-      inputType
-      choices(
-        first: $firstValues
-        after: $afterValues
-        last: $lastValues
-        before: $beforeValues
-      ) {
-        ...AttributeChoicesTranslation
-      }
-    }
-  }
-`;
-
 export const menuItemTranslationFragment = gql`
   fragment MenuItemTranslation on MenuItemTranslatableContent {
     translation(languageCode: $language) {

diff --git a/src/graphql/hooks.generated.ts b/src/graphql/hooks.generated.ts
@@ -2437,6 +2437,31 @@ export const CollectionTranslationFragmentDoc = gql`
   }
 }
     `;
+export const AttributeValueTranslatableFragmentDoc = gql`
+    fragment AttributeValueTranslatable on AttributeValueTranslatableContent {
+  id
+  name
+  plainText
+  richText
+  attributeValue {
+    id
+  }
+  attribute {
+    id
+    name
+  }
+  translation(languageCode: $language) {
+    id
+    name
+    plainText
+    richText
+    language {
+      code
+      language
+    }
+  }
+}
+    `;
 export const ProductTranslationFragmentDoc = gql`
     fragment ProductTranslation on ProductTranslatableContent {
   product {
@@ -2458,24 +2483,10 @@ export const ProductTranslationFragmentDoc = gql`
     }
   }
   attributeValues {
-    id
-    name
-    richText
-    attributeValue {
-      id
-    }
-    translation(languageCode: $language) {
-      id
-      name
-      richText
-      language {
-        code
-        language
-      }
-    }
+    ...AttributeValueTranslatable
   }
 }
-    `;
+    ${AttributeValueTranslatableFragmentDoc}`;
 export const ProductVariantTranslationFragmentDoc = gql`
     fragment ProductVariantTranslation on ProductVariantTranslatableContent {
   productVariant {
@@ -2491,24 +2502,10 @@ export const ProductVariantTranslationFragmentDoc = gql`
     }
   }
   attributeValues {
-    id
-    name
-    richText
-    attributeValue {
-      id
-    }
-    translation(languageCode: $language) {
-      id
-      name
-      richText
-      language {
-        code
-        language
-      }
-    }
+    ...AttributeValueTranslatable
   }
 }
-    `;
+    ${AttributeValueTranslatableFragmentDoc}`;
 export const SaleTranslationFragmentDoc = gql`
     fragment SaleTranslation on SaleTranslatableContent {
   sale {
@@ -2582,24 +2579,10 @@ export const PageTranslationFragmentDoc = gql`
     }
   }
   attributeValues {
-    id
-    name
-    richText
-    attributeValue {
-      id
-    }
-    translation(languageCode: $language) {
-      id
-      name
-      richText
-      language {
-        code
-        language
-      }
-    }
+    ...AttributeValueTranslatable
   }
 }
-    `;
+    ${AttributeValueTranslatableFragmentDoc}`;
 export const PageTranslatableFragmentDoc = gql`
     fragment PageTranslatable on PageTranslatableContent {
   id
@@ -2645,11 +2628,13 @@ export const AttributeChoicesTranslationFragmentDoc = gql`
     node {
       id
       name
+      plainText
       richText
       inputType
       translation(languageCode: $language) {
         id
         name
+        plainText
         richText
       }
     }
@@ -2678,27 +2663,6 @@ export const AttributeTranslationDetailsFragmentDoc = gql`
   }
 }
     ${AttributeChoicesTranslationFragmentDoc}`;
-export const AttributeValueTranslatableContentFragmentDoc = gql`
-    fragment AttributeValueTranslatableContent on AttributeTranslatableContent {
-  translation(languageCode: $language) {
-    id
-    name
-  }
-  attribute {
-    id
-    name
-    inputType
-    choices(
-      first: $firstValues
-      after: $afterValues
-      last: $lastValues
-      before: $beforeValues
-    ) {
-      ...AttributeChoicesTranslation
-    }
-  }
-}
-    ${AttributeChoicesTranslationFragmentDoc}`;
 export const MenuItemTranslationFragmentDoc = gql`
     fragment MenuItemTranslation on MenuItemTranslatableContent {
   translation(languageCode: $language) {

diff --git a/src/graphql/typePolicies.generated.ts b/src/graphql/typePolicies.generated.ts
@@ -549,13 +549,14 @@ export type AttributeValueDeletedFieldPolicy = {
 	recipient?: FieldPolicy<any> | FieldReadFunction<any>,
 	attributeValue?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type AttributeValueTranslatableContentKeySpecifier = ('id' | 'name' | 'richText' | 'plainText' | 'translation' | 'attributeValue' | AttributeValueTranslatableContentKeySpecifier)[];
+export type AttributeValueTranslatableContentKeySpecifier = ('id' | 'name' | 'richText' | 'plainText' | 'translation' | 'attribute' | 'attributeValue' | AttributeValueTranslatableContentKeySpecifier)[];
 export type AttributeValueTranslatableContentFieldPolicy = {
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	richText?: FieldPolicy<any> | FieldReadFunction<any>,
 	plainText?: FieldPolicy<any> | FieldReadFunction<any>,
 	translation?: FieldPolicy<any> | FieldReadFunction<any>,
+	attribute?: FieldPolicy<any> | FieldReadFunction<any>,
 	attributeValue?: FieldPolicy<any> | FieldReadFunction<any>
 };
 export type AttributeValueTranslateKeySpecifier = ('translationErrors' | 'errors' | 'attributeValue' | AttributeValueTranslateKeySpecifier)[];