PR review fixes

Author: pmi

modules/app/src/main/resources/admin/widgets/preview-site-engine/preview-site-engine.js

@@ -37,10 +37,11 @@ exports.get = function (req) {
         if (params.mode === 'inline' || params.mode === 'edit') {
             // we handle that on the client in inline and edit modes
             return widgetLib.widgetResponse(200, data);
-        } else {
-            // in other modes we leave it to browser to handle the redirect
-            return widgetLib.redirectResponse(url, data);
         }
+
+        // in other modes we leave it to browser to handle the redirect
+        return widgetLib.redirectResponse(url, data);
+
     } catch (e) {
         log.error(`Site [${req.method}] error: ${e.message}`);
         return widgetLib.widgetResponse(500);
@@ -55,11 +56,7 @@ exports.canRender = function (req) {
         return false;
     }
 
-    if (params.type === SHORTCUT_TYPE || params.archive) {
-        return false;
-    }
-
-    return true;
+    return params.type !== SHORTCUT_TYPE && !params.archive;
 }
 
 function createUrl(req, params) {
@@ -76,8 +73,7 @@ function collectResponseData(req, params, url) {
     const messages = [];
     const i18n = widgetLib.i18nFn(req);
 
-    const appsMissing = hasMissingApps(appKeys);
-    if (appsMissing) {
+    if (hasMissingApps(appKeys)) {
         messages.push(i18n('field.preview.missing.description'));
     }
 
@@ -88,7 +84,7 @@ function collectResponseData(req, params, url) {
 
     return {
         messages: messages.length ? messages : undefined,
-        hasControllers: /*!params.auto &&*/ hasControllers,
+        hasControllers,
         hasPage: isPageOrFragment,
         redirect: url
     }
@@ -111,32 +107,6 @@ function hasAvailableControllers(params, appKeys) {
     });
 }
 
-function hasSupportingTemplates(site, params) {
-    if (!site) {
-        return false;
-    }
-
-    return widgetLib.queryContent(params, {
-        contentTypes: [TEMPLATE_TYPE],
-        query: '_path LIKE "/content' + site._path + '*"',
-        count: 3,
-        filters: {
-            boolean: {
-                must: [
-                    {
-                        hasValue: {
-                            field: "data.supports",
-                            values: [
-                                params.type
-                            ]
-                        }
-                    }
-                ]
-            }
-        }
-    }).total > 0;
-}
-
 function hasPageOrFragment(params) {
     const content = widgetLib.fetchContent(params.repository, params.branch, params.id || params.path, params.archive);
 

modules/app/src/main/resources/lib/export/widget.js

@@ -122,9 +122,10 @@ function fetchSite(repository, branch, key, archive) {
         try {
             if (key) {
                 return contentLib.getSite({key});
-            } else {
-                return portalLib.getSite();
             }
+
+            return portalLib.getSite();
+
         } catch (e) {
             log.error(`Failed to fetch site: ${e.message}`);
             return null;

modules/lib/src/main/resources/assets/js/app/event/ViewWidgetEvent.ts

@@ -5,7 +5,7 @@ import {Widget} from '@enonic/lib-admin-ui/content/Widget';
 export class ViewWidgetEvent
     extends Event {
 
-    private widget: Widget;
+    private readonly widget: Widget;
 
     constructor(widget: Widget) {
         super();

modules/lib/src/main/resources/assets/js/app/view/ContentItemPreviewPanel.ts

@@ -93,7 +93,7 @@ export class ContentItemPreviewPanel
         const contentSummary = item.getContentSummary();
         const widget = (this.toolbar as ContentItemPreviewToolbar).getWidgetSelector().getSelectedWidget();
 
-        return this.widgetRenderingHandler.renderWithWidget(contentSummary, widget);
+        return this.widgetRenderingHandler.render(contentSummary, widget);
     }
 
     public isItemRenderable(): Q.Promise<boolean> {