@soleil-se/app-util 1.2.0 → 1.2.2

package/dist/index.js

@@ -1,6 +1,6 @@
 import PortletContextUtil from 'PortletContextUtil';
 import VersionUtil from 'VersionUtil';
-import app from 'app';
+import appInfo from 'appInfo';
 /* Underscore is provided by SiteVision */
 /* eslint-disable-next-line import/no-extraneous-dependencies */
 import _ from 'underscore';
@@ -8,7 +8,7 @@ import _ from 'underscore';
 /** If the webapp is running in offline mode or not. */
 export var isOffline = VersionUtil.getCurrentVersion() === VersionUtil.OFFLINE_VERSION;
 
-var portletId = app.portletId.replace('.', '_');
+var portletId = PortletContextUtil.getCurrentPortlet().getIdentifier().replace('.', '_');
 
 /**
  * Get URI for a resource.
@@ -16,7 +16,7 @@ var portletId = app.portletId.replace('.', '_');
  * @returns {String} URI for a resource.
  */
 export function getResourceUri(resource) {
-  return ("/webapp-files/" + (app.webAppId) + "/" + (app.webAppVersion) + "/" + resource);
+  return ("/webapp-files/" + (appInfo.appIdentifier) + "/" + (appInfo.appVersion) + "/" + resource);
 }
 
 /**
@@ -57,13 +57,13 @@ export function renderApp(name, data, ref) {
   var async = ref.async; if ( async === void 0 ) async = true;
   var defer = ref.defer; if ( defer === void 0 ) defer = false;
 
-  var options = Object.assign({}, {webapp: app, isOffline: isOffline}, data);
+  var options = Object.assign({}, data, {isOffline: isOffline});
   var clientUri = getResourceUri('client/index.js');
 
   if (isOffline) {
-    return ("\n<!-- Generated by WebappUtil." + (this.name) + "() -->\n<div data-portlet-id=\"" + portletId + "\">" + noScript + "</div>\n<script src=\"" + clientUri + "\"></script>\n<script>  \n  Soleil.webapps['" + name + "'].render('" + name + "', '" + selector + "', " + (JSON.stringify(options)) + ");\n</script>\n");
+    return ("\n<!-- Generated by WebappUtil.renderApp() -->\n<div data-portlet-id=\"" + portletId + "\">" + noScript + "</div>\n<script src=\"" + clientUri + "?" + (appInfo.appImportDate) + "\"></script>\n<script>  \n  Soleil.webapps['" + name + "'].render('" + name + "', '" + selector + "', " + (JSON.stringify(options)) + ");\n</script>\n");
   }
-  return ("\n<!-- Generated by WebappUtil." + (this.name) + "() -->\n<div data-portlet-id=\"" + portletId + "\">" + noScript + "</div>\n<script>\n  function renderApp" + portletId + "() {\n    Soleil.webapps['" + name + "'].render('" + name + "', '" + selector + "', " + (JSON.stringify(options)) + ");\n  }  \n</script>\n<script src=\"" + clientUri + "\" " + (async && !defer ? 'async' : '') + " " + (defer ? 'defer' : '') + " onload=\"renderApp" + portletId + "();\"></script>\n");
+  return ("\n<!-- Generated by WebappUtil.renderApp() -->\n<div data-portlet-id=\"" + portletId + "\">" + noScript + "</div>\n<script>\n  function renderApp" + portletId + "() {\n    Soleil.webapps['" + name + "'].render('" + name + "', '" + selector + "', " + (JSON.stringify(options)) + ");\n  }  \n</script>\n<script src=\"" + clientUri + "?" + (appInfo.appImportDate) + "\" " + (async && !defer ? 'async' : '') + " " + (defer ? 'defer' : '') + " onload=\"renderApp" + portletId + "();\"></script>\n");
 }
 
 /**
@@ -72,7 +72,7 @@ export function renderApp(name, data, ref) {
  * @returns {String} URI for route.
  */
 export function getRouteUri(route) {
-  var currentPageId = PortletContextUtil.getCurrentPage().getIdentifier();
+  var currentPageId = PortletContextUtil.getCurrentPage().getIdentifier().replace('_sitePage', '');
   var currentPortletId = PortletContextUtil.getCurrentPortlet().getIdentifier();
   return ("/appresource/" + currentPageId + "/" + currentPortletId + "/" + route).replace(/\/\//g, '/');
 }

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@soleil-se/app-util",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Utility functions for Webapps.",
   "main": "./dist/index.js",
   "author": "Soleil AB",
+  "contributors": [
+    "Kimmy Monassar"
+  ],
   "license": "UNLICENSED",
   "private": false,
   "homepage": "https://github.com/soleilit/server-monorepo/tree/master/packages/app-util",

package/src/index.js

@@ -1,6 +1,6 @@
 import PortletContextUtil from 'PortletContextUtil';
 import VersionUtil from 'VersionUtil';
-import app from 'app';
+import appInfo from 'appInfo';
 /* Underscore is provided by SiteVision */
 /* eslint-disable-next-line import/no-extraneous-dependencies */
 import _ from 'underscore';
@@ -8,7 +8,7 @@ import _ from 'underscore';
 /** If the webapp is running in offline mode or not. */
 export const isOffline = VersionUtil.getCurrentVersion() === VersionUtil.OFFLINE_VERSION;
 
-const portletId = app.portletId.replace('.', '_');
+const portletId = PortletContextUtil.getCurrentPortlet().getIdentifier().replace('.', '_');
 
 /**
  * Get URI for a resource.
@@ -16,7 +16,7 @@ const portletId = app.portletId.replace('.', '_');
  * @returns {String} URI for a resource.
  */
 export function getResourceUri(resource) {
-  return `/webapp-files/${app.webAppId}/${app.webAppVersion}/${resource}`;
+  return `/webapp-files/${appInfo.appIdentifier}/${appInfo.appVersion}/${resource}`;
 }
 
 /**
@@ -54,14 +54,14 @@ export function renderApp(name, data, {
   async = true,
   defer = false,
 } = {}) {
-  const options = { webapp: app, isOffline, ...data };
+  const options = { ...data, isOffline };
   const clientUri = getResourceUri('client/index.js');
 
   if (isOffline) {
     return `
 <!-- Generated by WebappUtil.renderApp() -->
 <div data-portlet-id="${portletId}">${noScript}</div>
-<script src="${clientUri}"></script>
+<script src="${clientUri}?${appInfo.appImportDate}"></script>
 <script>  
   Soleil.webapps['${name}'].render('${name}', '${selector}', ${JSON.stringify(options)});
 </script>
@@ -75,7 +75,7 @@ export function renderApp(name, data, {
     Soleil.webapps['${name}'].render('${name}', '${selector}', ${JSON.stringify(options)});
   }  
 </script>
-<script src="${clientUri}" ${async && !defer ? 'async' : ''} ${defer ? 'defer' : ''} onload="renderApp${portletId}();"></script>
+<script src="${clientUri}?${appInfo.appImportDate}" ${async && !defer ? 'async' : ''} ${defer ? 'defer' : ''} onload="renderApp${portletId}();"></script>
 `;
 }
 
@@ -85,7 +85,7 @@ export function renderApp(name, data, {
  * @returns {String} URI for route.
  */
 export function getRouteUri(route) {
-  const currentPageId = PortletContextUtil.getCurrentPage().getIdentifier();
+  const currentPageId = PortletContextUtil.getCurrentPage().getIdentifier().replace('_sitePage', '');
   const currentPortletId = PortletContextUtil.getCurrentPortlet().getIdentifier();
   return `/appresource/${currentPageId}/${currentPortletId}/${route}`.replace(/\/\//g, '/');
 }