@soleil-se/app-util 2.3.0 → 2.4.0

package/CHANGELOG.md

@@ -4,12 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.0] - 2020-05-26
+### Fixed
+- `getViewUri` returns correct URI when in offline mode and in the Addons view.
+
 ## [2.3.0] - 2020-05-22
 ### Added
 - `renderApp` now accepts `req` as a setting to opimize script loading when multiple instances of the app exists. If `req` is present the script will only be loaded once in all browsers except IE11 that needs a unique script src for the currentScript polyfill to work. 
 
 ### Fixed
-- ´noScript` in `renderApp` was not wrapped in a `<noscript>` tag.
+- `noScript` in `renderApp` was not wrapped in a `<noscript>` tag.
 
 ## [2.2.0] - 2020-05-20
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soleil-se/app-util",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Utility functions for Webapps.",
   "main": "./src/index.js",
   "author": "Soleil AB",

package/src/index.js

@@ -102,9 +102,13 @@ export function renderApp(data, {
  * @returns {String} URI for route.
  */
 export function getRouteUri(route) {
-  const currentPageId = PortletContextUtil.getCurrentPage().getIdentifier().replace('_sitePage', '');
-  const currentPortletId = PortletContextUtil.getCurrentPortlet().getIdentifier();
-  return `/appresource/${currentPageId}/${currentPortletId}/${route}`.replace(/\/\//g, '/');
+  const currentPage = PortletContextUtil.getCurrentPage();
+  if (currentPage && currentPortlet) {
+    const currentPageId = currentPage.getIdentifier().replace('_sitePage', '');
+    const currentPortletId = currentPortlet.getIdentifier();
+    return `/appresource/${currentPageId}/${currentPortletId}/${route}`.replace(/\/\//g, '/');
+  }
+  return '/';
 }
 
 /**
@@ -113,9 +117,18 @@ export function getRouteUri(route) {
  * @returns {String} URI for view.
  */
 export function getViewUri(route) {
-  const currentPageUri = PropertyUtil.getString(PortletContextUtil.getCurrentPage(), 'URI');
-  const currentPortletId = PortletContextUtil.getCurrentPortlet().getIdentifier();
-  return `${currentPageUri}?sv.target=${currentPortletId}&sv.${currentPortletId}.route=${encodeURI(route)}`;
+  const currentPage = PortletContextUtil.getCurrentPage();
+  if (currentPage && currentPortlet) {
+    const currentPageId = currentPage.getIdentifier().replace('_sitePage', '');
+    const currentPageUri = PropertyUtil.getString(currentPage, 'URI');
+    const currentPortletId = PortletContextUtil.getCurrentPortlet().getIdentifier();
+    if (isOffline) {
+      return `/edit-offline/${currentPageId}?sv.target=${currentPortletId}&sv.${currentPortletId}.route=${encodeURI(route)}`;
+    }
+    return `${currentPageUri}?sv.target=${currentPortletId}&sv.${currentPortletId}.route=${encodeURI(route)}`;
+  }
+  const addonId = appInfo['jcr:uuid'];
+  return `/edit-web-app-offline/${addonId}?sv.target=${addonId}&sv.${addonId}.route=${encodeURI(route)}`;
 }
 
 export default {