chore(#158): update multilingual support

druxt · Jan 19, 2022 · 8cd9a2e · 8cd9a2e
1 parent c1eb068
commit 8cd9a2e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/packages/druxt/src/client.js b/packages/druxt/src/client.js
@@ -334,8 +334,8 @@ class DruxtClient {
  return this.index[resource] ? this.index[resource] : false
  }
 
- const url = this.options.endpoint
- const { data } = await this.get(prefix + url)
+ const url = prefix + this.options.endpoint
+ const { data } = await this.get(url)
  let index = data.links
 
  // Throw error if index is invalid.
@@ -401,12 +401,12 @@ class DruxtClient {
  *
  * @returns {object} The related JSON:API resource(s).
  */
- async getRelated(type, id, related, query) {
+ async getRelated(type, id, related, query, prefix = '') {
  if (!id || !type || !related) {
  return false
  }
 
- let { href } = await this.getIndex(type)
+ let { href } = await this.getIndex(type, prefix)
  if (!href) {
  href = this.options.endpoint + '/' + type.replace('--', '/')
  }

diff --git a/packages/menu/src/menu.js b/packages/menu/src/menu.js
@@ -82,7 +82,7 @@ class DruxtMenu {
  * @param {string} menuName - The menu name.
  * @param {object} settings - The Druxt Menu query settings object.
  */
- async get(menuName, settings, prefix) {
+ async get(menuName, settings, prefix = '') {
  if (this.options.menu.jsonApiMenuItems) {
  return this.getJsonApiMenuItems(menuName, settings, prefix)
  }
@@ -102,7 +102,7 @@ class DruxtMenu {
  * @param {string} menuName - The menu name.
  * @param {object} settings - The Druxt Menu query settings object.
  */
- async getMenuLinkContent(menuName, settings) {
+ async getMenuLinkContent(menuName, settings, prefix) {
  const resource = 'menu_link_content--menu_link_content'
  const requiredFields = ['bundle', 'link', 'menu_name', 'parent', 'title', 'weight']
 

diff --git a/packages/router/src/router.js b/packages/router/src/router.js
@@ -317,12 +317,11 @@ class DruxtRouter {
  isHomePath: data.isHomePath,
  jsonapi: data.jsonapi,
  label: data.label,
+ prefix: langcode,
  props: false,
  redirect: data.redirect,
  resolvedPath: Url(data.resolved).pathname,
- prefix: langcode,
  entity: data.entity
-
  }
 
  // Determine route type by configuration.