@defra/lis-infra-ui-services 0.4.0 → 0.5.0-lreg-387.alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/lis-infra-ui-services",
-  "version": "0.4.0",
+  "version": "0.5.0-lreg-387.alpha.3",
   "description": "UI-Services shared definitions for the livestock taxonomy topology.",
   "main": "src/index.js",
   "repository": {

package/src/index.js

@@ -69,8 +69,6 @@ export const SPOKES = [
   {
     id: 'cattle-register',
     label: 'Register for Cattle',
-    path: '/cattle/register',
-    port: 3201,
     taxonomy: {
       id: 'register',
       label: 'Register'
@@ -83,8 +81,6 @@ export const SPOKES = [
   {
     id: 'camlid-register',
     label: 'Register for Camlid',
-    path: '/camlid/register',
-    port: 3202,
     taxonomy: {
       id: 'register',
       label: 'Register'
@@ -97,8 +93,6 @@ export const SPOKES = [
   {
     id: 'chicken-register',
     label: 'Register for Chicken',
-    path: '/chicken/register',
-    port: 3203,
     taxonomy: {
       id: 'register',
       label: 'Register'
@@ -111,8 +105,6 @@ export const SPOKES = [
   {
     id: 'sheep-register',
     label: 'Register for Sheep',
-    path: '/sheep/register',
-    port: 3213,
     taxonomy: {
       id: 'register',
       label: 'Register'
@@ -125,8 +117,6 @@ export const SPOKES = [
   {
     id: 'goat-register',
     label: 'Register for Goat',
-    path: '/goat/register',
-    port: 3214,
     taxonomy: {
       id: 'register',
       label: 'Register'
@@ -139,8 +129,6 @@ export const SPOKES = [
   {
     id: 'cattle-move',
     label: 'Move for Cattle',
-    path: '/cattle/move',
-    port: 3204,
     taxonomy: {
       id: 'move',
       label: 'Move'
@@ -153,8 +141,6 @@ export const SPOKES = [
   {
     id: 'camlid-move',
     label: 'Move for Camlid',
-    path: '/camlid/move',
-    port: 3205,
     taxonomy: {
       id: 'move',
       label: 'Move'
@@ -167,8 +153,6 @@ export const SPOKES = [
   {
     id: 'chicken-move',
     label: 'Move for Chicken',
-    path: '/chicken/move',
-    port: 3206,
     taxonomy: {
       id: 'move',
       label: 'Move'
@@ -181,8 +165,6 @@ export const SPOKES = [
   {
     id: 'sheep-move',
     label: 'Move for Sheep',
-    path: '/sheep/move',
-    port: 3215,
     taxonomy: {
       id: 'move',
       label: 'Move'
@@ -195,8 +177,6 @@ export const SPOKES = [
   {
     id: 'goat-move',
     label: 'Move for Goat',
-    path: '/goat/move',
-    port: 3216,
     taxonomy: {
       id: 'move',
       label: 'Move'
@@ -209,8 +189,6 @@ export const SPOKES = [
   {
     id: 'cattle-death',
     label: 'Death for Cattle',
-    path: '/cattle/death',
-    port: 3207,
     taxonomy: {
       id: 'death',
       label: 'Death'
@@ -223,8 +201,6 @@ export const SPOKES = [
   {
     id: 'camlid-death',
     label: 'Death for Camlid',
-    path: '/camlid/death',
-    port: 3208,
     taxonomy: {
       id: 'death',
       label: 'Death'
@@ -237,8 +213,6 @@ export const SPOKES = [
   {
     id: 'chicken-death',
     label: 'Death for Chicken',
-    path: '/chicken/death',
-    port: 3209,
     taxonomy: {
       id: 'death',
       label: 'Death'
@@ -251,8 +225,6 @@ export const SPOKES = [
   {
     id: 'sheep-death',
     label: 'Death for Sheep',
-    path: '/sheep/death',
-    port: 3217,
     taxonomy: {
       id: 'death',
       label: 'Death'
@@ -265,8 +237,6 @@ export const SPOKES = [
   {
     id: 'goat-death',
     label: 'Death for Goat',
-    path: '/goat/death',
-    port: 3218,
     taxonomy: {
       id: 'death',
       label: 'Death'
@@ -279,8 +249,6 @@ export const SPOKES = [
   {
     id: 'cattle-status',
     label: 'Status for Cattle',
-    path: '/cattle/status',
-    port: 3210,
     taxonomy: {
       id: 'status',
       label: 'Status'
@@ -293,8 +261,6 @@ export const SPOKES = [
   {
     id: 'camlid-status',
     label: 'Status for Camlid',
-    path: '/camlid/status',
-    port: 3211,
     taxonomy: {
       id: 'status',
       label: 'Status'
@@ -307,8 +273,6 @@ export const SPOKES = [
   {
     id: 'chicken-status',
     label: 'Status for Chicken',
-    path: '/chicken/status',
-    port: 3212,
     taxonomy: {
       id: 'status',
       label: 'Status'
@@ -321,8 +285,6 @@ export const SPOKES = [
   {
     id: 'sheep-status',
     label: 'Status for Sheep',
-    path: '/sheep/status',
-    port: 3219,
     taxonomy: {
       id: 'status',
       label: 'Status'
@@ -335,8 +297,6 @@ export const SPOKES = [
   {
     id: 'goat-status',
     label: 'Status for Goat',
-    path: '/goat/status',
-    port: 3220,
     taxonomy: {
       id: 'status',
       label: 'Status'
@@ -349,8 +309,6 @@ export const SPOKES = [
   {
     id: 'cattle-home',
     label: 'Home for Cattle',
-    path: '/cattle/home',
-    port: 3221,
     taxonomy: {
       id: 'home',
       label: 'Home'
@@ -363,8 +321,6 @@ export const SPOKES = [
   {
     id: 'camlid-home',
     label: 'Home for Camlid',
-    path: '/camlid/home',
-    port: 3222,
     taxonomy: {
       id: 'home',
       label: 'Home'
@@ -377,8 +333,6 @@ export const SPOKES = [
   {
     id: 'chicken-home',
     label: 'Home for Chicken',
-    path: '/chicken/home',
-    port: 3223,
     taxonomy: {
       id: 'home',
       label: 'Home'
@@ -391,8 +345,6 @@ export const SPOKES = [
   {
     id: 'sheep-home',
     label: 'Home for Sheep',
-    path: '/sheep/home',
-    port: 3224,
     taxonomy: {
       id: 'home',
       label: 'Home'
@@ -405,8 +357,6 @@ export const SPOKES = [
   {
     id: 'goat-home',
     label: 'Home for Goat',
-    path: '/goat/home',
-    port: 3225,
     taxonomy: {
       id: 'home',
       label: 'Home'

package/src/nunjucks/build-navigation.js

@@ -1,20 +1,17 @@
-import { SPOKES, SUPPORTED_SPECIES, SUPPORTED_TAXONOMIES } from '../index.js'
+import { MODULES } from '@defra/lis-hubs-infra-registry'
+import { SUPPORTED_SPECIES, SUPPORTED_TAXONOMIES } from '../index.js'
 
 /** @import { Request } from '@hapi/hapi' */
 
 /**
- * @param {{ request: Request, basePath?: string, hubOrigin?: string }} options
+ * @param {{ request: Request, basePath?: string }} options
  * @returns {object[]}
  */
-export function buildPrimaryNavigation({
-  request,
-  basePath = '',
-  hubOrigin = ''
-}) {
+export function buildPrimaryNavigation({ request, basePath = '' }) {
   const currentSpecies = getCurrentSpecies({ request, basePath })
   const profileItem = {
     text: 'Profile',
-    href: buildHubHref(hubOrigin, '/profile'),
+    href: '/profile',
     current: request?.path === '/profile' && !currentSpecies?.id
   }
   const permittedSpecies = request?.app?.authorizedSpecies
@@ -26,7 +23,7 @@ export function buildPrimaryNavigation({
   return [
     ...permittedSpecies.map((species) => ({
       text: species.label,
-      href: buildHubHref(hubOrigin, getSpeciesHomePath(species)),
+      href: getSpeciesHomePath(species),
       current: species.id === currentSpecies?.id
     })),
     profileItem
@@ -34,13 +31,10 @@ export function buildPrimaryNavigation({
 }
 
 function getSpeciesHomePath(species) {
-  return (
-    SPOKES.find(
-      (spoke) =>
-        spoke.taxonomy.id === 'home' &&
-        (spoke.species.id === species.id || spoke.species.id === species.slug)
-    )?.path ?? `/${species.slug ?? species.id}/home`
-  )
+  const speciesId = species.slug ?? species.id
+  const homeModule = MODULES.find((module) => module.id === `${speciesId}-home`)
+
+  return homeModule?.path ?? `/${speciesId}/home`
 }
 
 function getCurrentSpecies({ request, basePath }) {
@@ -64,11 +58,3 @@ function getCurrentSpecies({ request, basePath }) {
 
   return null
 }
-
-function buildHubHref(hubOrigin, routePath) {
-  if (!hubOrigin) {
-    return routePath
-  }
-
-  return new URL(routePath, hubOrigin).toString()
-}

package/src/nunjucks/plugin.js

@@ -186,8 +186,7 @@ export function createNunjucksConfig({
   const buildNavigation = (request) =>
     buildPrimaryNavigation({
       request,
-      basePath,
-      hubOrigin: request?.app?.hubOrigin ?? ''
+      basePath
     })
 
   const context = createNunjucksContextBuilder({