@soleil-se/app-util 1.1.7 → 1.2.0

package/README.md

@@ -45,7 +45,7 @@ In `app_src/client/index.js`.
 import render from '@soleil-se/webapp-util/render-vue';
 import App from './App.vue';
 
-window.vueApps[App.name] = {
+window.Soleil.webapps[App.name] = {
   App,
   render,
 };

package/dist/index.js

@@ -1,4 +1,3 @@
-import PropertyUtil from 'PropertyUtil';
 import PortletContextUtil from 'PortletContextUtil';
 import VersionUtil from 'VersionUtil';
 import app from 'app';
@@ -73,13 +72,9 @@ export function renderApp(name, data, ref) {
  * @returns {String} URI for route.
  */
 export function getRouteUri(route) {
-  var currentPortlet = PortletContextUtil.getCurrentPortlet();
-  if (currentPortlet) {
-    var currentPortletId = currentPortlet.getIdentifier();
-    var currentPageUri = PropertyUtil.getString(PortletContextUtil.getCurrentPage(), 'URI');
-    return (currentPageUri + "?sv." + currentPortletId + ".route=" + (encodeURI(route)) + "&sv.target=" + currentPortletId);
-  }
-  return '';
+  var currentPageId = PortletContextUtil.getCurrentPage().getIdentifier();
+  var currentPortletId = PortletContextUtil.getCurrentPortlet().getIdentifier();
+  return ("/appresource/" + currentPageId + "/" + currentPortletId + "/" + route).replace(/\/\//g, '/');
 }
 
 export default {

package/package.json

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

package/src/index.js

@@ -1,4 +1,3 @@
-import PropertyUtil from 'PropertyUtil';
 import PortletContextUtil from 'PortletContextUtil';
 import VersionUtil from 'VersionUtil';
 import app from 'app';
@@ -60,7 +59,7 @@ export function renderApp(name, data, {
 
   if (isOffline) {
     return `
-<!-- Generated by WebappUtil.${this.name}() -->
+<!-- Generated by WebappUtil.renderApp() -->
 <div data-portlet-id="${portletId}">${noScript}</div>
 <script src="${clientUri}"></script>
 <script>  
@@ -69,7 +68,7 @@ export function renderApp(name, data, {
 `;
   }
   return `
-<!-- Generated by WebappUtil.${this.name}() -->
+<!-- Generated by WebappUtil.renderApp() -->
 <div data-portlet-id="${portletId}">${noScript}</div>
 <script>
   function renderApp${portletId}() {
@@ -86,13 +85,9 @@ export function renderApp(name, data, {
  * @returns {String} URI for route.
  */
 export function getRouteUri(route) {
-  const currentPortlet = PortletContextUtil.getCurrentPortlet();
-  if (currentPortlet) {
-    const currentPortletId = currentPortlet.getIdentifier();
-    const currentPageUri = PropertyUtil.getString(PortletContextUtil.getCurrentPage(), 'URI');
-    return `${currentPageUri}?sv.${currentPortletId}.route=${encodeURI(route)}&sv.target=${currentPortletId}`;
-  }
-  return '';
+  const currentPageId = PortletContextUtil.getCurrentPage().getIdentifier();
+  const currentPortletId = PortletContextUtil.getCurrentPortlet().getIdentifier();
+  return `/appresource/${currentPageId}/${currentPortletId}/${route}`.replace(/\/\//g, '/');
 }
 
 export default {