Merge pull request #16 from vtex-apps/fix/xVtexTenant

Use defaultLocale as xVtexTenant

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Bulk Upload of product translations
+
+### Fixed
+- Use `defaultLocale` from tenant API as `xVtexTenant`.
 
 ## [1.1.0] - 2021-08-02
 

node/package.json

@@ -4,7 +4,7 @@
   "main": "index.ts",
   "license": "UNLICENSED",
   "dependencies": {
-    "@vtex/api": "6.44.0",
+    "@vtex/api": "6.45.4",
     "JSONStream": "^1.3.5"
   },
   "devDependencies": {

node/yarn.lock

@@ -122,10 +122,10 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
-"@vtex/api@6.44.0":
-  version "6.44.0"
-  resolved "https://registry.yarnpkg.com/@vtex/api/-/api-6.44.0.tgz#8dc2a27c37635278117310bcc5cd16203c0a5849"
-  integrity sha512-7nPIwzQz55Mu0E1BOoW1noObZet9J34iKmeAJU3TRL7iiGmPZB0McSjC6KgDHkfqYgim2JGrnCsa1978ffbwKQ==
+"@vtex/api@6.45.4":
+  version "6.45.4"
+  resolved "https://registry.yarnpkg.com/@vtex/api/-/api-6.45.4.tgz#58be7497c0c0f91a388fabd42149e48cb95e271d"
+  integrity sha512-DVAJr5BkSjXupjn2h5Z1In8C3Li9kZwCXPwRQbpIgyS7s9dN2ZEFQc6nQlJm6ZoDCoyYBg62LgD7Kurvz9jc3w==
   dependencies:
     "@types/koa" "^2.11.0"
     "@types/koa-compose" "^3.2.3"

react/components/LocaleSelector.tsx

@@ -36,11 +36,11 @@ const BindingProvider: FC = ({ children }) => {
   useEffect(() => {
     // eslint-disable-next-line vtex/prefer-early-return
     if (bindingData) {
-      const fetchedLocales = bindingData.tenantInfo.bindings
-      const filteredLocales = filterLocales(fetchedLocales)
+      const { defaultLocale, bindings: fetchedLocales } = bindingData.tenantInfo
+      const filteredLocales = filterLocales(fetchedLocales, defaultLocale)
       setBindings(filteredLocales)
-      setSelectedLocale(filteredLocales[0].defaultLocale)
-      setXVtexTenant(filteredLocales[0].defaultLocale)
+      setSelectedLocale(defaultLocale)
+      setXVtexTenant(defaultLocale)
     }
   }, [bindingData])
 

react/graphql/accountLocales.gql

@@ -1,5 +1,6 @@
 query accountLocales {
   tenantInfo @context(provider: "vtex.tenant-graphql") {
+    defaultLocale
     bindings {
       id
       defaultLocale

react/typings/bindings.d.ts

@@ -6,6 +6,7 @@ interface Binding {
 
 interface BindingsData {
   tenantInfo: {
+    defaultLocale: string
     bindings: Binding[]
   }
 }

react/utils/index.ts

@@ -3,14 +3,35 @@ import { Translation } from 'vtex.messages'
 export * from './fileParsers'
 export * from './sanitizeImportJSON'
 
+/**
+ * Keep the xVtexTenant in the top of the dropdown button
+ */
+const sortBindings = (bindings: Binding[], xVtexTenant: string): Binding[] => {
+  const xVtexTenantBinding = []
+  const otherBindings = []
+
+  for (const binding of bindings) {
+    if (binding.defaultLocale === xVtexTenant) {
+      xVtexTenantBinding.push(binding)
+    } else {
+      otherBindings.push(binding)
+    }
+  }
+
+  return [...xVtexTenantBinding, ...otherBindings]
+}
+
 /**
  * Returns all the unique binding locales, excluding the first one provided by the api (admin)
  *
  * @param {array} Array received from api graphql
  * @return {array} Array with only unique locales and without the admin binding.
  */
 
-export const filterLocales = (bindings: Binding[]): Binding[] => {
+export const filterLocales = (
+  bindings: Binding[],
+  xVtexTenant: string
+): Binding[] => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [admin, ...otherBindings] = bindings
   const uniqueBindings: { [id: string]: boolean } = {}
@@ -37,7 +58,7 @@ export const filterLocales = (bindings: Binding[]): Binding[] => {
     }
   }
 
-  return filteredBindings
+  return sortBindings(filteredBindings, xVtexTenant)
 }
 
 /**