@inventreedb/ui 0.0.3 → 0.0.5

package/dist/functions/Navigation.js

@@ -23,11 +23,19 @@ function getDetailUrl(model, pk, absolute) {
 }
 const navigateToLink = (link, navigate, event) => {
   cancelEvent(event);
+  const base = `/${getBaseUrl()}`;
   if ((event == null ? void 0 : event.ctrlKey) || (event == null ? void 0 : event.shiftKey)) {
-    const url = `/${getBaseUrl()}${link}`;
+    let url = link;
+    if (link.startsWith("/") && !link.startsWith(base)) {
+      url = `${base}${link}`;
+    }
     window.open(url, "_blank");
   } else {
-    navigate(link);
+    let url = link;
+    if (link.startsWith(base)) {
+      url = link.replace(base, "");
+    }
+    navigate(url);
   }
 };
 export {

package/dist/functions/Navigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Navigation.js","sources":["../../lib/functions/Navigation.tsx"],"sourcesContent":["import type { NavigateFunction } from 'react-router-dom';\nimport { ModelInformationDict } from '../enums/ModelInformation';\nimport type { ModelType } from '../enums/ModelType';\nimport { cancelEvent } from './Events';\n\nexport const getBaseUrl = (): string =>\n  (window as any).INVENTREE_SETTINGS?.base_url || 'web';\n\n/**\n * Returns the detail view URL for a given model type\n */\nexport function getDetailUrl(\n  model: ModelType,\n  pk: number | string,\n  absolute?: boolean\n): string {\n  const modelInfo = ModelInformationDict[model];\n\n  if (pk === undefined || pk === null) {\n    return '';\n  }\n\n  if (!!pk && modelInfo && modelInfo.url_detail) {\n    const url = modelInfo.url_detail.replace(':pk', pk.toString());\n    const base = getBaseUrl();\n\n    if (absolute && base) {\n      return `/${base}${url}`;\n    } else {\n      return url;\n    }\n  }\n\n  console.error(`No detail URL found for model ${model} <${pk}>`);\n  return '';\n}\n\n/*\n * Navigate to a provided link.\n * - If the link is to be opened externally, open it in a new tab.\n * - Otherwise, navigate using the provided navigate function.\n */\nexport const navigateToLink = (\n  link: string,\n  navigate: NavigateFunction,\n  event: any\n) => {\n  cancelEvent(event);\n\n  if (event?.ctrlKey || event?.shiftKey) {\n    // Open the link in a new tab\n    const url = `/${getBaseUrl()}${link}`;\n    window.open(url, '_blank');\n  } else {\n    // Navigate internally\n    navigate(link);\n  }\n};\n"],"names":["getBaseUrl","window","INVENTREE_SETTINGS","base_url","getDetailUrl","model","pk","absolute","modelInfo","ModelInformationDict","undefined","url_detail","url","replace","toString","base","console","error","navigateToLink","link","navigate","event","cancelEvent","ctrlKey","shiftKey","open"],"mappings":";;AAKO,MAAMA,aAAaA,MACvBC;;AAAAA,uBAAeC,uBAAfD,mBAAmCE,aAAY;AAAA;AAKlCC,SAAAA,aACdC,OACAC,IACAC,UACQ;AACFC,QAAAA,YAAYC,qBAAqBJ,KAAK;AAExCC,MAAAA,OAAOI,UAAaJ,OAAO,MAAM;AAC5B,WAAA;AAAA,EAAA;AAGT,MAAI,CAAC,CAACA,MAAME,aAAaA,UAAUG,YAAY;AAC7C,UAAMC,MAAMJ,UAAUG,WAAWE,QAAQ,OAAOP,GAAGQ,UAAU;AAC7D,UAAMC,OAAOf,WAAW;AAExB,QAAIO,YAAYQ,MAAM;AACb,aAAA,IAAIA,IAAI,GAAGH,GAAG;AAAA,IAAA,OAChB;AACEA,aAAAA;AAAAA,IAAAA;AAAAA,EACT;AAGFI,UAAQC,MAAM,iCAAiCZ,KAAK,KAAKC,EAAE,GAAG;AACvD,SAAA;AACT;AAOO,MAAMY,iBAAiBA,CAC5BC,MACAC,UACAC,UACG;AACHC,cAAYD,KAAK;AAEbA,OAAAA,+BAAOE,aAAWF,+BAAOG,WAAU;AAErC,UAAMZ,MAAM,IAAIZ,WAAW,CAAC,GAAGmB,IAAI;AAC5BM,WAAAA,KAAKb,KAAK,QAAQ;AAAA,EAAA,OACpB;AAELQ,aAASD,IAAI;AAAA,EAAA;AAEjB;"}
+{"version":3,"file":"Navigation.js","sources":["../../lib/functions/Navigation.tsx"],"sourcesContent":["import type { NavigateFunction } from 'react-router-dom';\nimport { ModelInformationDict } from '../enums/ModelInformation';\nimport type { ModelType } from '../enums/ModelType';\nimport { cancelEvent } from './Events';\n\nexport const getBaseUrl = (): string =>\n  (window as any).INVENTREE_SETTINGS?.base_url || 'web';\n\n/**\n * Returns the detail view URL for a given model type\n */\nexport function getDetailUrl(\n  model: ModelType,\n  pk: number | string,\n  absolute?: boolean\n): string {\n  const modelInfo = ModelInformationDict[model];\n\n  if (pk === undefined || pk === null) {\n    return '';\n  }\n\n  if (!!pk && modelInfo && modelInfo.url_detail) {\n    const url = modelInfo.url_detail.replace(':pk', pk.toString());\n    const base = getBaseUrl();\n\n    if (absolute && base) {\n      return `/${base}${url}`;\n    } else {\n      return url;\n    }\n  }\n\n  console.error(`No detail URL found for model ${model} <${pk}>`);\n  return '';\n}\n\n/*\n * Navigate to a provided link.\n * - If the link is to be opened externally, open it in a new tab.\n * - Otherwise, navigate using the provided navigate function.\n */\nexport const navigateToLink = (\n  link: string,\n  navigate: NavigateFunction,\n  event: any\n) => {\n  cancelEvent(event);\n\n  const base = `/${getBaseUrl()}`;\n\n  if (event?.ctrlKey || event?.shiftKey) {\n    // Open the link in a new tab\n    let url = link;\n    if (link.startsWith('/') && !link.startsWith(base)) {\n      url = `${base}${link}`;\n    }\n    window.open(url, '_blank');\n  } else {\n    // Navigate internally\n    let url = link;\n\n    if (link.startsWith(base)) {\n      // Strip the base URL from the link\n      url = link.replace(base, '');\n    }\n\n    navigate(url);\n  }\n};\n"],"names":["getBaseUrl","window","INVENTREE_SETTINGS","base_url","getDetailUrl","model","pk","absolute","modelInfo","ModelInformationDict","undefined","url_detail","url","replace","toString","base","console","error","navigateToLink","link","navigate","event","cancelEvent","ctrlKey","shiftKey","startsWith","open"],"mappings":";;AAKO,MAAMA,aAAaA,MACvBC;;AAAAA,uBAAeC,uBAAfD,mBAAmCE,aAAY;AAAA;AAKlCC,SAAAA,aACdC,OACAC,IACAC,UACQ;AACFC,QAAAA,YAAYC,qBAAqBJ,KAAK;AAExCC,MAAAA,OAAOI,UAAaJ,OAAO,MAAM;AAC5B,WAAA;AAAA,EAAA;AAGT,MAAI,CAAC,CAACA,MAAME,aAAaA,UAAUG,YAAY;AAC7C,UAAMC,MAAMJ,UAAUG,WAAWE,QAAQ,OAAOP,GAAGQ,UAAU;AAC7D,UAAMC,OAAOf,WAAW;AAExB,QAAIO,YAAYQ,MAAM;AACb,aAAA,IAAIA,IAAI,GAAGH,GAAG;AAAA,IAAA,OAChB;AACEA,aAAAA;AAAAA,IAAAA;AAAAA,EACT;AAGFI,UAAQC,MAAM,iCAAiCZ,KAAK,KAAKC,EAAE,GAAG;AACvD,SAAA;AACT;AAOO,MAAMY,iBAAiBA,CAC5BC,MACAC,UACAC,UACG;AACHC,cAAYD,KAAK;AAEXN,QAAAA,OAAO,IAAIf,WAAY,CAAA;AAEzBqB,OAAAA,+BAAOE,aAAWF,+BAAOG,WAAU;AAErC,QAAIZ,MAAMO;AACNA,QAAAA,KAAKM,WAAW,GAAG,KAAK,CAACN,KAAKM,WAAWV,IAAI,GAAG;AAC5C,YAAA,GAAGA,IAAI,GAAGI,IAAI;AAAA,IAAA;AAEfO,WAAAA,KAAKd,KAAK,QAAQ;AAAA,EAAA,OACpB;AAEL,QAAIA,MAAMO;AAENA,QAAAA,KAAKM,WAAWV,IAAI,GAAG;AAEnBI,YAAAA,KAAKN,QAAQE,MAAM,EAAE;AAAA,IAAA;AAG7BK,aAASR,GAAG;AAAA,EAAA;AAEhB;"}

package/dist/types/Plugins.js

@@ -1,4 +1,4 @@
-const INVENTREE_PLUGIN_VERSION = "0.0.3";
+const INVENTREE_PLUGIN_VERSION = "0.0.5";
 export {
   INVENTREE_PLUGIN_VERSION
 };

package/lib/functions/Navigation.tsx

@@ -47,12 +47,24 @@ export const navigateToLink = (
 ) => {
   cancelEvent(event);
 
+  const base = `/${getBaseUrl()}`;
+
   if (event?.ctrlKey || event?.shiftKey) {
     // Open the link in a new tab
-    const url = `/${getBaseUrl()}${link}`;
+    let url = link;
+    if (link.startsWith('/') && !link.startsWith(base)) {
+      url = `${base}${link}`;
+    }
     window.open(url, '_blank');
   } else {
     // Navigate internally
-    navigate(link);
+    let url = link;
+
+    if (link.startsWith(base)) {
+      // Strip the base URL from the link
+      url = link.replace(base, '');
+    }
+
+    navigate(url);
   }
 };

package/package.json

@@ -1,10 +1,13 @@
 {
     "name": "@inventreedb/ui",
     "description": "UI components for the InvenTree project",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "private": false,
     "type": "module",
     "license": "MIT",
+    "keywords": [
+        "inventree"
+    ],
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "exports": {