Secondary entry points to allow better dead-code elimination

.github/CODEOWNERS

@@ -1,5 +1,4 @@
 * @jmacura @FilipLeitner
 **/package*.json @jmacura
 ./projects/hslayers-server/** @fzadrazil
-./projects/hslayers-material/** @SLeitgeb
-./projects/hslayers-material-app/** @SLeitgeb
+

.gitignore

@@ -29,4 +29,5 @@ hslayers-server.db
 projects/hslayers-server/data/hsl-share.db
 cypress/videos
 cypress/screenshots
+cypress/downloads/*
 cypress/tests/__image_snapshots__

angular.json

@@ -70,8 +70,8 @@
                 }
               ],
               "optimization": true,
-              "sourceMap": true,
-              "namedChunks": false,
+              "sourceMap": false,
+              "namedChunks": true,
               "extractLicenses": true,
               "vendorChunk": true,
               "buildOptimizer": true,
@@ -163,6 +163,7 @@
             "sourceMap": true,
             "vendorChunk": true,
             "optimization": false,
+            "namedChunks": true,
             "outputPath": "dist/test-app",
             "index": "projects/test-app/src/index.html",
             "main": "projects/test-app/src/main.ts",
@@ -362,7 +363,7 @@
             "production": {
               "optimization": true,
               "sourceMap": true,
-              "namedChunks": false,
+              "namedChunks": true,
               "extractLicenses": true,
               "vendorChunk": true,
               "buildOptimizer": true,
@@ -783,155 +784,6 @@
           }
         }
       }
-    },
-    "hslayers-material": {
-      "projectType": "library",
-      "root": "projects/hslayers-material",
-      "sourceRoot": "projects/hslayers-material/src",
-      "prefix": "lib",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:ng-packagr",
-          "options": {
-            "tsConfig": "projects/hslayers-material/tsconfig.lib.json",
-            "project": "projects/hslayers-material/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "projects/hslayers-material/tsconfig.lib.prod.json"
-            }
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "projects/hslayers-material/src/test.ts",
-            "tsConfig": "projects/hslayers-material/tsconfig.spec.json",
-            "karmaConfig": "projects/hslayers-material/karma.conf.js"
-          }
-        },
-        "lint": {
-          "builder": "@angular-eslint/builder:lint",
-          "options": {
-            "lintFilePatterns": [
-              "projects/hslayers-material/**/*.ts",
-              "projects/hslayers-material/**/*.html"
-            ]
-          }
-        }
-      }
-    },
-    "hslayers-material-app": {
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "projects/hslayers-material-app",
-      "sourceRoot": "projects/hslayers-material-app/src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "dist/hslayers-material-app",
-            "index": "projects/hslayers-material-app/src/index.html",
-            "main": "projects/hslayers-material-app/src/main.ts",
-            "polyfills": "projects/hslayers-material-app/src/polyfills.ts",
-            "tsConfig": "projects/hslayers-material-app/tsconfig.app.json",
-            "assets": [
-              "projects/hslayers-material-app/src/favicon.ico",
-              "projects/hslayers-material-app/src/assets"
-            ],
-            "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-              "projects/hslayers-material-app/src/styles.scss"
-            ],
-            "scripts": [],
-            "vendorChunk": true,
-            "extractLicenses": false,
-            "buildOptimizer": false,
-            "sourceMap": true,
-            "optimization": false,
-            "namedChunks": true
-          },
-          "configurations": {
-            "production": {
-              "fileReplacements": [
-                {
-                  "replace": "projects/hslayers-material-app/src/environments/environment.ts",
-                  "with": "projects/hslayers-material-app/src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "200kb",
-                  "maximumError": "300kb"
-                }
-              ]
-            }
-          },
-          "defaultConfiguration": ""
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "hslayers-material-app:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "hslayers-material-app:build:production"
-            }
-          }
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "hslayers-material-app:build"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "projects/hslayers-material-app/src/test.ts",
-            "polyfills": "projects/hslayers-material-app/src/polyfills.ts",
-            "tsConfig": "projects/hslayers-material-app/tsconfig.spec.json",
-            "karmaConfig": "projects/hslayers-material-app/karma.conf.js",
-            "assets": [
-              "projects/hslayers-material-app/src/favicon.ico",
-              "projects/hslayers-material-app/src/assets"
-            ],
-            "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-              "projects/hslayers-material-app/src/styles.scss"
-            ],
-            "scripts": []
-          }
-        },
-        "lint": {
-          "builder": "@angular-eslint/builder:lint",
-          "options": {
-            "lintFilePatterns": [
-              "projects/hslayers-material-app/**/*.ts",
-              "projects/hslayers-material-app/**/*.html"
-            ]
-          }
-        }
-      }
     }
   },
   "cli": {

cypress/tests/add-data-catalogue.cy.ts

@@ -70,22 +70,39 @@ describe('Hslayers application', () => {
     );
   });
 
-  it('Should be possible to add layer as WMS', () => {
+  it('Should be possible to add layer', () => {
     cy.wait(2000);
     cy.get(
       'hs-add-data-catalogue .list-group hs-catalogue-list-item:first',
     ).click();
-    cy.get('.hs-catalogue-item-body a:first span:not(.hs-loader)')
+    cy.get('.hs-catalogue-item-body div div.btn-group span:not(.hs-loader)')
       .should('have.html', 'Add to map')
       .click();
+    //Should switch to Layermanager
+    cy.get(
+      '.hs-main-panel:not([hidden]) hs-panel-header[name*="layerManager"]',
+    ).should('exist');
+  });
+
+  it('Should be possible to add layer as WMST/WMTS/WFS', () => {
+    cy.wait(2000);
+    cy.get(
+      'hs-add-data-catalogue .list-group hs-catalogue-list-item:first',
+    ).click();
+    cy.get('.hs-catalogue-item-body div div button.dropdown-toggle').click();
+
     cy.get('[title*="What does it mean?"]:first').should('exist').click();
+    cy.get('hs-catalogue-list-item div[data-toggle="buttons"] label').should(
+      'have.length',
+      3,
+    );
     cy.get(
-      'hs-catalogue-list-item div[data-toggle="buttons"]:first label:first',
+      'hs-catalogue-list-item div[data-toggle="buttons"] label:first',
     ).click();
 
-    //Should switch to Layermanager
+    // //Should switch to Layermanager
     cy.get(
-      '.hs-main-panel:not([hidden]) hs-panel-header[name*="layermanager"]',
+      '.hs-main-panel:not([hidden]) hs-panel-header[name*="layerManager"]',
     ).should('exist');
   });
 });

cypress/tests/add-data-url.cy.ts

@@ -1,9 +1,9 @@
 function checkIfLayerAdded(layerName) {
-  cy.get(`hs-panel-header[name="layermanager"]`).should('be.visible');
+  cy.get(`hs-panel-header[name="layerManager"]`).should('be.visible');
   cy.get(
-    'hs-layermanager-layer-list li:first .d-flex button.hs-lm-item-visibility',
+    'hs-layer-manager-layer-list:first li:last .d-flex button.hs-lm-item-visibility',
   ).should('have.class', 'hs-checkmark');
-  cy.get('hs-layermanager-layer-list li:first .hs-lm-item-title').should(
+  cy.get('hs-layer-manager-layer-list:first li:last .hs-lm-item-title').should(
     'have.text',
     ` ${layerName} `, //Extra padding around title
   );
@@ -15,7 +15,7 @@ function addLayerAndCheckIfAdded() {
 
   //it('Layer should be added', () => {
   cy.get('hs-layer-table table tr:first input[type="checkbox"]').click();
-  cy.get('hs-layer-table table tr td:nth-child(2n) span').then(($td) => {
+  cy.get('hs-layer-table table tr:first td:nth-child(2n) span').then(($td) => {
     const layerName = $td.html();
     cy.get('button[title="Add selected layers to the map"').click();
     checkIfLayerAdded(layerName);
@@ -29,17 +29,17 @@ function openPanelAndTypeTab(index) {
   ).click();
   cy.get(`hs-panel-header[name="addData"]`).should('be.visible');
   //Open corresponding type tab
-  cy.get('hs-add-data ul[role="tablist"] li:nth-child(2n) a').click();
+  cy.get('hs-add-data ul li:nth-child(2n) a').click();
   cy.get(`hs-add-data-url>.d-flex>.container>.row>button`).eq(index).click();
 }
 
 describe('Hslayers application', () => {
   beforeEach(() => {
     cy.visit('/');
     //Open layer manager
-    cy.get('.hs-sidebar-item[data-cy="layermanager"]').click();
+    cy.get('.hs-sidebar-item[data-cy="layerManager"]').click();
     //Turn off all layers
-    cy.get('hs-layermanager-layer-list li .d-flex button.hs-checkmark').each(
+    cy.get('hs-layer-manager-layer-list li .d-flex button.hs-checkmark').each(
       (button) => {
         cy.wrap(button).click();
       },
@@ -54,9 +54,6 @@ describe('Hslayers application', () => {
     );
     cy.get(`hs-url-wms hs-common-url input + button`).click();
     addLayerAndCheckIfAdded();
-    //it('Layer should be visible on map', () => {
-    cy.wait(3000); //Need to wait for failed layman request error toast to disappear if HsConfig.errorToastDuration is large
-    cy.get('.hs-ol-map').matchImage();
   });
 
   it('WMTS layer should be visible on map', () => {
@@ -67,9 +64,6 @@ describe('Hslayers application', () => {
     );
     cy.get(`hs-url-wmts hs-common-url input + button`).click();
     addLayerAndCheckIfAdded();
-    //it('Layer should be visible on map', () => {
-    cy.wait(2000);
-    cy.get('.hs-ol-map').matchImage();
   });
 
   it('WFS layer should be visible on map', () => {
@@ -81,9 +75,6 @@ describe('Hslayers application', () => {
     );
     cy.get(`hs-url-wfs hs-common-url input + button`).click();
     addLayerAndCheckIfAdded();
-    //it('Layer should be visible on map', () => {
-    cy.wait(2000);
-    cy.get('.hs-ol-map').matchImage();
   });
 
   it('geoJSON layer should be visible on map', () => {
@@ -97,14 +88,8 @@ describe('Hslayers application', () => {
 
     const layerName = 'Added geojson layer';
     cy.get(`input.form-control[name="name"]`).type(layerName);
-    cy.get('.form-horizontal > :nth-child(2) > .btn-primary').should(
-      'not.have.attr',
-      'disabled',
-    );
-    cy.get('.form-horizontal > :nth-child(2) > .btn-primary').click();
+    cy.get('hs-add-to-map .btn-primary').should('not.have.attr', 'disabled');
+    cy.get('hs-add-to-map .btn-primary').click();
     checkIfLayerAdded(layerName);
-    //it('Layer should be visible on map', () => {
-    cy.wait(2000);
-    cy.get('.hs-ol-map').matchImage();
   });
 });

cypress/tests/external.cy.ts

@@ -2,7 +2,7 @@ describe('Hslayers application', () => {
   beforeEach(() => {
     cy.visit('/');
     //Open layer manager
-    cy.get('.hs-sidebar-item[data-cy="layermanager"]').click();
+    cy.get('.hs-sidebar-item[data-cy="layerManager"]').click();
   });
 
   it('Should zoom to feature', () => {

cypress/tests/language.cy.ts

@@ -6,12 +6,7 @@ describe('Hslayers application', () => {
       'hs-mini-sidebar .hs-sidebar-item.hs-panel-hidden[data-cy="language"]',
     ).click();
     cy.get('hs-language .list-group .btn:last').click();
-    cy.get('hs-language hs-panel-header').should(
-      'have.attr',
-      'ng-reflect-title',
-      'Linguam mutare',
-    );
-    cy.get('hs-language hs-panel-header span').should(
+    cy.get('hs-language hs-panel-header a.nav-link').should(
       'contain.text',
       'Linguam mutare',
     );
@@ -20,8 +15,9 @@ describe('Hslayers application', () => {
   it('App should open with a language other than the default', () => {
     cy.visit('/?hs-lang=cs');
 
-    cy.get(
-      'hs-some-panel > .card > hs-panel-header > .card-header > .flex-grow-1',
-    ).should('contain.text', 'Můj úžasný panel');
+    cy.get('hs-some-panel hs-panel-header a.nav-link').should(
+      'contain.text',
+      'Můj úžasný panel',
+    );
   });
 });