Issue #2407 - Update FileSaver.js dependency to the latest version

platform-pojo-bl/src/main/java/ua/com/fielden/platform/sample/domain/ui_actions/MakeCompletedAction.java

@@ -1,18 +1,15 @@
 package ua.com.fielden.platform.sample.domain.ui_actions;
 
-import static ua.com.fielden.platform.entity.NoKey.NO_KEY;
-import static ua.com.fielden.platform.reflection.TitlesDescsGetter.getEntityTitleAndDesc;
-
 import ua.com.fielden.platform.entity.AbstractFunctionalEntityWithCentreContext;
 import ua.com.fielden.platform.entity.NoKey;
-import ua.com.fielden.platform.entity.annotation.CompanionObject;
-import ua.com.fielden.platform.entity.annotation.IsProperty;
-import ua.com.fielden.platform.entity.annotation.KeyType;
-import ua.com.fielden.platform.entity.annotation.Observable;
-import ua.com.fielden.platform.entity.annotation.SkipEntityExistsValidation;
+import ua.com.fielden.platform.entity.annotation.*;
+import ua.com.fielden.platform.processors.metamodel.IConvertableToPath;
 import ua.com.fielden.platform.sample.domain.TgPersistentEntityWithProperties;
 import ua.com.fielden.platform.utils.Pair;
 
+import static ua.com.fielden.platform.entity.NoKey.NO_KEY;
+import static ua.com.fielden.platform.reflection.TitlesDescsGetter.getEntityTitleAndDesc;
+
 /**
  * Functional entity to make {@link TgPersistentEntityWithProperties} entity completed and save.
  * It applies all user modifications, sets 'completed' property and 'dateProp' and saves the instance.
@@ -34,6 +31,15 @@ public MakeCompletedAction() {
         setKey(NO_KEY);
     }
 
+    public enum Property implements IConvertableToPath {
+        masterEntity;
+
+        @Override
+        public String toPath() {
+            return name();
+        }
+    }
+
     @IsProperty
     @SkipEntityExistsValidation
     private TgPersistentEntityWithProperties masterEntity;

platform-web-resources/src/main/java/ua/com/fielden/platform/web/application/AbstractWebUiResources.java

@@ -22,6 +22,8 @@
 import ua.com.fielden.platform.web.resources.RestServerUtil;
 import ua.com.fielden.platform.web.security.DefaultWebResourceGuard;
 
+import static ua.com.fielden.platform.web.resources.webui.AppIndexResource.BINDING_PATH;
+
 /**
  * Represents a web application that is running on the server.
  * It is responsible for request routing and serving web resources.
@@ -105,7 +107,7 @@ public final Restlet createInboundRoot() {
         final RestServerUtil restUtil = injector.getInstance(RestServerUtil.class);
 
         // Attach main application resource.
-        guardedRouter.attach("/", new AppIndexResourceFactory(webResourceLoader, webApp, userProvider, deviceProvider, dates, injector.getInstance(ICriteriaGenerator.class)));
+        guardedRouter.attach(BINDING_PATH, new AppIndexResourceFactory(webResourceLoader, webApp, userProvider, deviceProvider, dates, injector.getInstance(ICriteriaGenerator.class)));
         guardedRouter.attach("/app/tg-app-config.js", new WebUiPreferencesResourceFactory(webResourceLoader, deviceProvider, dates));
         guardedRouter.attach("/app/tg-app.js", new MainWebUiComponentResourceFactory(webResourceLoader, deviceProvider, dates));
         // type meta info resource

platform-web-resources/src/main/java/ua/com/fielden/platform/web/ioc/WebResourceLoader.java

@@ -38,7 +38,9 @@
 import static ua.com.fielden.platform.utils.ResourceLoader.getStream;
 import static ua.com.fielden.platform.utils.ResourceLoader.getText;
 import static ua.com.fielden.platform.web.factories.webui.ResourceFactoryUtils.*;
+import static ua.com.fielden.platform.web.resources.webui.AppIndexResource.FILE_APP_INDEX_HTML;
 import static ua.com.fielden.platform.web.resources.webui.FileResource.generateFileName;
+import static ua.com.fielden.platform.web.resources.webui.LoginInitiateResetResource.FILE_APP_LOGIN_INITIATE_RESET_HTML;
 
 /**
  * {@link IWebResourceLoader} implementation.
@@ -77,11 +79,11 @@ public InputStream loadStream(final String resourceUri) {
     private Optional<String> getSource(final String resourceUri) {
         if ("/app/application-startup-resources.js".equalsIgnoreCase(resourceUri)) {
             return getApplicationStartupResourcesSource(webUiConfig);
-        } else if ("/app/tg-app-index.html".equalsIgnoreCase(resourceUri)) {
+        } else if (FILE_APP_INDEX_HTML.equalsIgnoreCase(resourceUri)) {
             return injectServiceWorkerScriptInto(webUiConfig.genAppIndex());
         } else if ("/app/logout.html".equalsIgnoreCase(resourceUri)) {
             return getFileSource("/resources/logout.html", webUiConfig.resourcePaths()).map(src -> StringUtils.replace(src, "@title", "Logout"));
-        } else if ("/app/login-initiate-reset.html".equalsIgnoreCase(resourceUri)) {
+        } else if (FILE_APP_LOGIN_INITIATE_RESET_HTML.equalsIgnoreCase(resourceUri)) {
             return getFileSource("/resources/login-initiate-reset.html", webUiConfig.resourcePaths()).map(src -> StringUtils.replace(src, "@title", "Login Reset Request"));
         } else if ("/app/tg-app-config.js".equalsIgnoreCase(resourceUri)) {
             return ofNullable(webUiConfig.genWebUiPreferences());
@@ -109,6 +111,11 @@ public Optional<String> checksum(final String resourceURI) {
         return webUiConfig.checksum(resourceURI);
     }
 
+    @Override
+    public SequencedSet<String> deploymentResourcePaths() {
+        return webUiConfig.deploymentResourcePaths();
+    }
+
     /**
      * Generates 'tg-reflector' resource with type table containing master configurations.
      *

platform-web-resources/src/main/java/ua/com/fielden/platform/web/resources/webui/AbstractWebUiConfig.java

@@ -17,7 +17,6 @@
 import ua.com.fielden.platform.types.tuples.T2;
 import ua.com.fielden.platform.ui.menu.MiWithConfigurationSupport;
 import ua.com.fielden.platform.utils.IDates;
-import ua.com.fielden.platform.utils.ResourceLoader;
 import ua.com.fielden.platform.web.action.CentreConfigurationWebUiConfig;
 import ua.com.fielden.platform.web.action.StandardMastersWebUiConfig;
 import ua.com.fielden.platform.web.app.IWebUiConfig;
@@ -32,6 +31,7 @@
 import ua.com.fielden.platform.web.ioc.exceptions.MissingWebResourceException;
 import ua.com.fielden.platform.web.menu.IMainMenuBuilder;
 import ua.com.fielden.platform.web.menu.impl.MainMenuBuilder;
+import ua.com.fielden.platform.web.minijs.CombinedJsImports;
 import ua.com.fielden.platform.web.minijs.JsCode;
 import ua.com.fielden.platform.web.ref_hierarchy.ReferenceHierarchyWebUiConfig;
 import ua.com.fielden.platform.web.resources.webui.exceptions.InvalidUiConfigException;
@@ -48,20 +48,25 @@
 
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
+import static java.util.Objects.requireNonNull;
 import static java.util.Optional.of;
 import static java.util.Optional.ofNullable;
+import static java.util.stream.Collectors.toCollection;
 import static org.apache.commons.validator.routines.UrlValidator.ALLOW_LOCAL_URLS;
 import static ua.com.fielden.platform.error.Result.failuref;
 import static ua.com.fielden.platform.error.Result.successful;
 import static ua.com.fielden.platform.types.Hyperlink.SupportedProtocols.HTTPS;
 import static ua.com.fielden.platform.types.tuples.T2.t2;
 import static ua.com.fielden.platform.utils.ResourceLoader.getStream;
+import static ua.com.fielden.platform.utils.ResourceLoader.getText;
 import static ua.com.fielden.platform.web.centre.CentreUpdater.getDefaultCentre;
 import static ua.com.fielden.platform.web.centre.api.actions.impl.EntityActionBuilder.action;
 import static ua.com.fielden.platform.web.centre.api.context.impl.EntityCentreContextSelector.context;
 import static ua.com.fielden.platform.web.minijs.JsCode.jsCode;
+import static ua.com.fielden.platform.web.resources.webui.AppIndexResource.FILE_APP_INDEX_HTML;
 import static ua.com.fielden.platform.web.resources.webui.CentreResourceUtils.SAVE_OWN_COPY_MSG;
 import static ua.com.fielden.platform.web.resources.webui.FileResource.generateFileName;
+import static ua.com.fielden.platform.web.resources.webui.LoginInitiateResetResource.FILE_APP_LOGIN_INITIATE_RESET_HTML;
 import static ua.com.fielden.platform.web.view.master.api.actions.impl.MasterActionOptions.ALL_OFF;
 
 /**
@@ -78,6 +83,8 @@ public abstract class AbstractWebUiConfig implements IWebUiConfig {
     private static final String ERR_IN_COMPOUND_EMITTER = "Event source compound emitter should have cought this error. Something went wrong in WebUiConfig.";
     private static final String CREATE_DEFAULT_CONFIG_INFO = "Creating default configurations for [%s]-typed centres (caching)...";
     private static final int DEFAULT_EXTERNAL_SITE_EXPIRY_DAYS = 183;
+    /// Name for a constant in generated `tg-app-template` containing imports from main menu actions.
+    private static final String MAIN_MENU_ACTION_IMPORTS = "mainMenuActionImports";
 
     private final String title;
     private final Optional<String> ideaUri;
@@ -97,7 +104,7 @@ public abstract class AbstractWebUiConfig implements IWebUiConfig {
      */
     private final List<String> resourcePaths;
     private final Workflows workflow;
-    private final Map<String, String> checksums;
+    private final SequencedMap<String, String> checksums;
     private final boolean independentTimeZone;
     private final MasterActionOptions masterActionOptions;
 
@@ -268,9 +275,18 @@ public final String genWebUiPreferences() {
         return webUiBuilder.genWebUiPrefComponent();
     }
 
+    /// [CombinedJsImports] from main menu actions on both desktop / mobile configurations.
+    private CombinedJsImports mainMenuActionImports() {
+        final var combinedImports = new CombinedJsImports();
+        combinedImports.addAll(desktopMainMenuConfig.mainMenuActionImports());
+        combinedImports.addAll(mobileMainMenuConfig.mainMenuActionImports());
+        return combinedImports;
+    }
+
     @Override
     public final String genMainWebUIComponent() {
-        final String mainWebUiComponent = ResourceLoader.getText("ua/com/fielden/platform/web/app/tg-app-template.js");
+        final String mainWebUiComponent = requireNonNull(getText("ua/com/fielden/platform/web/app/tg-app-template.js"))
+            .replace("@%s".formatted(MAIN_MENU_ACTION_IMPORTS), mainMenuActionImports().toStringWith(MAIN_MENU_ACTION_IMPORTS));
         if (Workflows.deployment == workflow || Workflows.vulcanizing == workflow) {
             return mainWebUiComponent.replace("//@use-empty-console.log", "console.log = () => {};\n");
         } else {
@@ -375,6 +391,20 @@ public Optional<String> checksum(final String resourceURI) {
         return ofNullable(checksums.get(resourceURI));
     }
 
+    @Override
+    public SequencedSet<String> deploymentResourcePaths() {
+        return checksums.keySet().stream()
+            .map(path -> switch (path) {
+                // Only two deployment resources are generated and have special binding paths.
+                // See `VulcanizingUtility.vulcanize` for full list.
+                // All generated paths start with `/app/...`, but only two of them is outside main vulcanised file.
+                case FILE_APP_INDEX_HTML -> AppIndexResource.BINDING_PATH;
+                case FILE_APP_LOGIN_INITIATE_RESET_HTML -> LoginInitiateResetResource.BINDING_PATH;
+                default -> path;
+            })
+            .collect(toCollection(LinkedHashSet::new));
+    }
+
     @Override
     public boolean independentTimeZone() {
         return independentTimeZone;

platform-web-resources/src/main/java/ua/com/fielden/platform/web/resources/webui/AppIndexResource.java

@@ -1,26 +1,29 @@
 package ua.com.fielden.platform.web.resources.webui;
 
-import static org.restlet.data.MediaType.TEXT_HTML;
-import static ua.com.fielden.platform.web.resources.webui.FileResource.createRepresentation;
-
-import java.lang.management.ManagementFactory;
-
 import org.restlet.Context;
 import org.restlet.Request;
 import org.restlet.Response;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;
-
 import ua.com.fielden.platform.basic.config.Workflows;
 import ua.com.fielden.platform.criteria.generator.ICriteriaGenerator;
-import ua.com.fielden.platform.criteria.generator.impl.CriteriaGenerator;
 import ua.com.fielden.platform.security.user.IUserProvider;
 import ua.com.fielden.platform.security.user.User;
 import ua.com.fielden.platform.utils.IDates;
 import ua.com.fielden.platform.web.app.IWebResourceLoader;
 import ua.com.fielden.platform.web.app.IWebUiConfig;
 import ua.com.fielden.platform.web.interfaces.IDeviceProvider;
 
+import java.io.ByteArrayInputStream;
+import java.lang.management.ManagementFactory;
+
+import static com.google.common.base.Charsets.UTF_8;
+import static java.lang.String.join;
+import static org.restlet.data.MediaType.TEXT_HTML;
+import static org.restlet.data.MediaType.TEXT_URI_LIST;
+import static ua.com.fielden.platform.web.resources.RestServerUtil.encodedRepresentation;
+import static ua.com.fielden.platform.web.resources.webui.FileResource.createRepresentation;
+
 /**
  * Responds to GET request with a generated application specific index resource (for desktop and mobile web apps).
  * <p>
@@ -30,6 +33,11 @@
  *
  */
 public class AppIndexResource extends AbstractWebResource {
+    public static final String BINDING_PATH = "/";
+    public static final String FILE_APP_INDEX_HTML = "/app/tg-app-index.html";
+    private static final String RESOURCES_URL_SUFFIX = "?resources=true";
+    private static final String RESOURCES_DELIMITER = "\n";
+
     private final IWebUiConfig webUiConfig;
     private final IUserProvider userProvider;
     private final IWebResourceLoader webResourceLoader;
@@ -69,7 +77,12 @@ public Representation get() {
             webUiConfig.clearConfiguration();
             webUiConfig.initConfiguration();
         }
-        return createRepresentation(webResourceLoader, TEXT_HTML, "/app/tg-app-index.html", getReference().getRemainingPart());
+        // Handle special Service Worker '?resources=true' GET request against `AppIndexResource` (aka '/').
+        if (getReference().getRemainingPart().endsWith(RESOURCES_URL_SUFFIX)) {
+            return encodedRepresentation(new ByteArrayInputStream(join(RESOURCES_DELIMITER, webResourceLoader.deploymentResourcePaths()).getBytes(UTF_8)), TEXT_URI_LIST);
+        }
+        // Handle actual `AppIndexResource` generated file (see 'index.html').
+        return createRepresentation(webResourceLoader, TEXT_HTML, FILE_APP_INDEX_HTML, getReference().getRemainingPart());
     }
 
     /**

platform-web-resources/src/main/java/ua/com/fielden/platform/web/resources/webui/FileResource.java

@@ -31,6 +31,7 @@
  *
  */
 public class FileResource extends AbstractWebResource {
+    public static final String CHECKSUM_URL_SUFFIX = "?checksum=true";
     private final List<String> resourcePaths;
     private final IWebResourceLoader webResourceLoader;
 
@@ -74,7 +75,7 @@ public Representation load() {
      * @return
      */
     private static Representation returnChecksumRepresentationOr(final Supplier<Representation> createRepresentation, final IWebResourceLoader webResourceLoader, final MediaType mediaType, final String path, final String remainingPart) {
-        if (remainingPart.endsWith("?checksum=true")) {
+        if (remainingPart.endsWith(CHECKSUM_URL_SUFFIX)) {
             return encodedRepresentation(new ByteArrayInputStream(webResourceLoader.checksum(path).orElse("").getBytes(UTF_8)), mediaType);
         } else {
             return createRepresentation.get();

platform-web-resources/src/main/java/ua/com/fielden/platform/web/resources/webui/UserRoleWebUiConfig.java

@@ -1,22 +1,6 @@
 package ua.com.fielden.platform.web.resources.webui;
 
-import static java.lang.String.format;
-import static java.util.Optional.empty;
-import static ua.com.fielden.platform.entity.AbstractEntity.DESC;
-import static ua.com.fielden.platform.entity.AbstractEntity.KEY;
-import static ua.com.fielden.platform.entity.ActivatableAbstractEntity.ACTIVE;
-import static ua.com.fielden.platform.web.PrefDim.mkDim;
-import static ua.com.fielden.platform.web.action.pre.ConfirmationPreAction.okCancel;
-import static ua.com.fielden.platform.web.centre.api.actions.impl.EntityActionBuilder.action;
-import static ua.com.fielden.platform.web.centre.api.context.impl.EntityCentreContextSelector.context;
-import static ua.com.fielden.platform.web.layout.api.impl.LayoutBuilder.cell;
-import static ua.com.fielden.platform.web.layout.api.impl.LayoutCellBuilder.layout;
-import static ua.com.fielden.platform.web.layout.api.impl.LayoutComposer.mkActionLayoutForMaster;
-
-import java.util.Optional;
-
 import com.google.inject.Injector;
-
 import ua.com.fielden.platform.entity.ActivatableAbstractEntity;
 import ua.com.fielden.platform.entity.EntityDeleteAction;
 import ua.com.fielden.platform.entity.EntityEditAction;
@@ -28,7 +12,6 @@
 import ua.com.fielden.platform.ui.menu.sample.MiUserRole;
 import ua.com.fielden.platform.web.PrefDim.Unit;
 import ua.com.fielden.platform.web.action.CentreConfigurationWebUiConfig.CentreConfigActions;
-import ua.com.fielden.platform.web.action.pre.EntityNavigationPreAction;
 import ua.com.fielden.platform.web.app.config.IWebUiBuilder;
 import ua.com.fielden.platform.web.centre.EntityCentre;
 import ua.com.fielden.platform.web.centre.api.actions.EntityActionConfig;
@@ -41,6 +24,22 @@
 import ua.com.fielden.platform.web.view.master.api.actions.MasterActions;
 import ua.com.fielden.platform.web.view.master.api.impl.SimpleMasterBuilder;
 
+import java.util.Optional;
+
+import static java.lang.String.format;
+import static java.util.Optional.empty;
+import static ua.com.fielden.platform.entity.AbstractEntity.DESC;
+import static ua.com.fielden.platform.entity.AbstractEntity.KEY;
+import static ua.com.fielden.platform.entity.ActivatableAbstractEntity.ACTIVE;
+import static ua.com.fielden.platform.web.PrefDim.mkDim;
+import static ua.com.fielden.platform.web.action.pre.PreActions.entityNavigation;
+import static ua.com.fielden.platform.web.action.pre.PreActions.okCancel;
+import static ua.com.fielden.platform.web.centre.api.actions.impl.EntityActionBuilder.action;
+import static ua.com.fielden.platform.web.centre.api.context.impl.EntityCentreContextSelector.context;
+import static ua.com.fielden.platform.web.layout.api.impl.LayoutBuilder.cell;
+import static ua.com.fielden.platform.web.layout.api.impl.LayoutCellBuilder.layout;
+import static ua.com.fielden.platform.web.layout.api.impl.LayoutComposer.mkActionLayoutForMaster;
+
 /**
  * {@link UserRole} Web UI configuration.
  *
@@ -177,7 +176,7 @@ public EntityActionConfig mkAction() {
             public EntityActionConfig mkAction() {
                 return action(EntityEditAction.class)
                         .withContext(context().withCurrentEntity().withSelectionCrit().build())
-                        .preAction(new EntityNavigationPreAction("User Role"))
+                        .preAction(entityNavigation("User Role"))
                         .icon("editor:mode-edit")
                         .shortDesc("Edit User Role")
                         .longDesc("Opens master for User Role editing.")