@progressive-development/pd-spa-helper 0.8.10-f → 0.8.12

package/dist/PdSpaHelper.d.ts

@@ -78,5 +78,6 @@ export declare abstract class PdSpaHelper extends LitElement {
     _createTemporaryToast(e: any): void;
     static _scrollToTop(): void;
     _scrollToContent(el: HTMLElement): void;
+    private _navigateToPage;
 }
 //# sourceMappingURL=PdSpaHelper.d.ts.map

package/dist/PdSpaHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PdSpaHelper.d.ts","sourceRoot":"","sources":["../src/PdSpaHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,cAAc,EACd,cAAc,EAEf,MAAM,KAAK,CAAC;AAGb,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAIpC,OAAO,0CAA0C,CAAC;AAClD,OAAO,4CAA4C,CAAC;AACpD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,8CAA8C,CAAC;AAStD,OAAO,EACL,gBAAgB,EAChB,MAAM,EAGN,cAAc,EACf,MAAM,8CAA8C,CAAC;AAItD,OAAO,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpE,OAAO,gCAAgC,CAAC;AACxC,OAAO,oCAAoC,CAAC;AAE5C,OAAO,sBAAsB,CAAC;AAC9B,OAAO,8BAA8B,CAAC;AAStC,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAyD3D;;;;;;;GAOG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,gBAAgB,SAgCjD,CAAC;AAIF;;GAEG;AACH,8BAAsB,WAAY,SAAQ,UAAU;IAGlD,KAAK,SAAe;IAEpB;;OAEG;IAEH,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAG3B,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC;IAG1B,aAAa,EAAE,YAAY,EAAE,CAAM;IAEnC;;;OAGG;IAEH,SAAS,CAAC,MAAM,SAAM;IAEtB;;OAEG;IAEH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE/C;;OAEG;IAEH,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE9C;;OAEG;IAEH,OAAO,CAAC,aAAa,CAAS;IAG9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAErC,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAS;IAG7C,aAAa,CAAC,EAAE,YAAY,CAAC;IAE7B,MAAM,CAAC,MAAM,EA+EN,cAAc,CAAC;;IA0CtB,iBAAiB,IAAI,IAAI;IAmBzB,oBAAoB,IAAI,IAAI;IAM5B,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAS7B;;OAEG;IAGH;;;OAGG;IACH,oBAAoB;IAgCpB,MAAM;IAuCN,OAAO,CAAC,aAAa;IAerB,WAAW,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO;IAsB3D,cAAc,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO;IAsB9D,aAAa,IAAI,cAAc,GAAG,MAAM;IAkBxC,aAAa;IAcb,SAAS,CAAC,QAAQ,CAAC,iBAAiB,IAAI,KAAK,CAAC,cAAc,CAAC;IAE7D,SAAS,CAAC,QAAQ,CAAC,UAAU,IAAI,MAAM;IAEvC,SAAS,CAAC,QAAQ,CAAC,WAAW,IAAI,cAAc;IAEhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,IAAI,GAAG;IAE3C,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAEnD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,IAAI,GAAG;IAE9C,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAE9D,SAAS,CAAC,aAAa,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI;IAkB7C,aAAa,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI;IASnC,qBAAqB,CAAC,CAAC,EAAE,GAAG;IAW5B,uBAAuB,CAAC,CAAC,EAAE,WAAW;IAYtC,iBAAiB,CAAC,CAAC,EAAE,GAAG;IAexB,qBAAqB,CAAC,CAAC,EAAE,GAAG;IAgB5B,MAAM,CAAC,YAAY;IAUnB,gBAAgB,CAAC,EAAE,EAAE,WAAW;CAUjC"}
+{"version":3,"file":"PdSpaHelper.d.ts","sourceRoot":"","sources":["../src/PdSpaHelper.ts"],"names":[],"mappings":"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"}

package/dist/PdSpaHelper.js

@@ -32,8 +32,14 @@ const MADE_BY = {
   email: "info@progressive-development.com"
 };
 const TOAST_DURATION = 6e3;
+let routeMap;
 let transformedRoutes;
 let navigationConfig;
+const getNavigationPage = (routeName) => {
+  const page = routeMap.get(routeName);
+  if (!page) throw new Error(`Navigation page not defined for: ${routeName}`);
+  return page;
+};
 const transformRoutes = () => {
   const routeDefs = [];
   navigationConfig.pages.forEach((page) => {
@@ -47,16 +53,6 @@ const transformRoutes = () => {
     };
     routeDefs.push(routeDef);
   });
-  routeDefs.push({
-    name: "unauthorized",
-    pattern: "/unauthorized",
-    auth: false
-  });
-  routeDefs.push({
-    name: "not-found",
-    pattern: "/:wildcard",
-    auth: false
-  });
   return routeDefs;
 };
 const spaLogger = createLogger("PdSpaHelper");
@@ -67,16 +63,29 @@ const startInit = (config) => {
     initializeStore(config.storeConfigParam);
   }
   initAppImpl(config);
-  if (config.navigationConfigParam.includeLogin) {
-    config.navigationConfigParam.pages.push({
+  navigationConfig = config.navigationConfigParam;
+  if (navigationConfig.includeLogin) {
+    navigationConfig.pages.push({
       name: "login",
-      menu: [{ key: "login", name: "Login" }],
+      menu: [],
       pattern: ["/login"],
       auth: false
     });
   }
-  navigationConfig = config.navigationConfigParam;
+  navigationConfig.pages.push({
+    name: "unauthorized",
+    menu: [],
+    pattern: ["/unauthorized"],
+    auth: false
+  });
+  navigationConfig.pages.push({
+    name: "not-found",
+    menu: [],
+    pattern: ["/:wildcard"],
+    auth: false
+  });
   transformedRoutes = transformRoutes();
+  routeMap = new Map(navigationConfig.pages.map((p) => [p.name, p]));
   pdRouterService.configureRoutes(transformedRoutes);
   document.dispatchEvent(new CustomEvent("init-app-event"));
   spaLogger.debug("Init done, init-app-event created");
@@ -183,9 +192,10 @@ const _PdSpaHelper = (_a = class extends LitElement {
     authStateChangedImpl(callback);
   }
   render() {
-    const pageConf = navigationConfig.pages.filter(
-      (p) => p.name === this._route
-    )[0];
+    if (this._route === "") {
+      return html`<p>Routing page...</p>`;
+    }
+    const pageConf = getNavigationPage(this._route);
     const hideTeaser = this._teaserClosed || !(pageConf == null ? void 0 : pageConf.withTeaser);
     return html`
       <header id="headerElementId" class="default-header">
@@ -312,16 +322,14 @@ const _PdSpaHelper = (_a = class extends LitElement {
     if (e.detail.el) {
       this._scrollToContent(e.detail.el);
     } else {
-      _a._scrollToTop();
-      pdRouterService.navigate(e.detail.route);
+      this._navigateToPage(e.detail.route);
     }
   }
   // eslint-disable-next-line class-methods-use-this
   _handleFooterRouteEvent(e) {
     const { linkObj } = e.detail;
     if (linkObj.link) {
-      _a._scrollToTop();
-      pdRouterService.navigate(linkObj.link);
+      this._navigateToPage(linkObj.link);
     }
     if (linkObj.action) {
       linkObj.action();
@@ -330,11 +338,9 @@ const _PdSpaHelper = (_a = class extends LitElement {
   // eslint-disable-next-line class-methods-use-this
   _initMenuSections(e) {
     var _a2;
-    const menRefConf = navigationConfig.pages.filter(
-      (p) => p.name === e.detail.name
-    )[0];
-    if (menRefConf) {
-      menRefConf.menu = (_a2 = menRefConf.menu) == null ? void 0 : _a2.map(
+    const pageConf = getNavigationPage(this._route);
+    if (pageConf) {
+      pageConf.menu = (_a2 = pageConf.menu) == null ? void 0 : _a2.map(
         (menuElement, index) => ({
           ...menuElement,
           ref: e.detail.menuRefs[index]
@@ -371,6 +377,10 @@ const _PdSpaHelper = (_a = class extends LitElement {
       });
     }
   }
+  _navigateToPage(routeURL) {
+    _a._scrollToTop();
+    pdRouterService.navigate(routeURL);
+  }
 }, _a.styles = // Ref: Additional use classmap to add custom classes in concrete impl
 css`
       :host {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progressive-development/pd-spa-helper",
-  "version": "0.8.10f",
+  "version": "0.8.12",
   "description": "Webcomponent pd-spa-helper following open-wc recommendations",
   "author": "PD Progressive Development",
   "license": "SEE LICENSE IN LICENSE",