Update dependencies including angular 13 (#6)

b310-digital · Dec 17, 2021 · b253e37 · b253e37
1 parent fd5bff9
commit b253e37
Show file tree

Hide file tree

Showing 41 changed files with 28,472 additions and 37,235 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -24,4 +24,4 @@ mindmapper-frontend/LICENSE
 mindmapper-frontend/node_modules
 mindmapper-frontend/npm-debug.log
 mindmapper-frontend/README.md
-README.md
+README.md
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,5 @@ ca/*.crt
 ca/*.pem
 ca/*.key
 ca/*.req
+
+.env.prod
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.9.1-alpine3.14 as base
+FROM node:16.13.1-alpine3.14 as base
 # Ensuring that all npm packages and commands are executed with a non-root user
 USER node
 

diff --git a/mindmapper-backend/src/map/controllers/maps.gateway.ts b/mindmapper-backend/src/map/controllers/maps.gateway.ts
@@ -26,6 +26,7 @@ export class MapsGateway implements OnGatewayDisconnect {
 
   constructor(private mapsService: MapsService, @Inject(CACHE_MANAGER) private cacheManager: Cache) {}
 
+  @SubscribeMessage('leave')
   async handleDisconnect(client: Socket) {
     const mapId: string = await this.cacheManager.get(client.id);
     this.server

diff --git a/mindmapper-frontend/browserslist → mindmapper-frontend/.browserslistrc b/mindmapper-frontend/browserslist → mindmapper-frontend/.browserslistrc
@@ -2,11 +2,15 @@
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
 
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR
diff --git a/mindmapper-frontend/.gitignore b/mindmapper-frontend/.gitignore
@@ -34,6 +34,7 @@
 npm-debug.log
 testem.log
 /typings
+/.angular
 
 # e2e
 /e2e/*.js

diff --git a/mindmapper-frontend/angular.json b/mindmapper-frontend/angular.json
@@ -3,11 +3,11 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "mindmapp": {
+    "mindmapper": {
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
-      "prefix": "mindmapp",
+      "prefix": "mindmapper",
       "schematics": {
         "@schematics/angular:component": {
           "style": "scss"
@@ -47,7 +47,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -60,25 +59,37 @@
                   "maximumError": "5mb"
                 }
               ]
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
             }
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "mindmapp:build",
+            "browserTarget": "mindmapper:build",
             "proxyConfig": "src/proxy.conf.json"
           },
           "configurations": {
             "production": {
-              "browserTarget": "mindmapp:build:production"
+              "browserTarget": "mindmapper:build:production"
+            },
+            "development": {
+              "browserTarget": "mindmapper:build:development"
             }
-          }
+          },
+          "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "mindmapp:build"
+            "browserTarget": "mindmapper:build"
           }
         },
         "test": {
@@ -118,11 +129,11 @@
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "mindmapp:serve"
+            "devServerTarget": "mindmapper:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "mindmapp:serve:production"
+              "devServerTarget": "mindmapper:serve:production"
             }
           }
         },
@@ -133,7 +144,7 @@
       }
     }
   },
-  "defaultProject": "mindmapp",
+  "defaultProject": "mindmapper",
   "cli": {
     "analytics": false
   }

diff --git a/mindmapper-frontend/mmp/src/map/handlers/draw.ts b/mindmapper-frontend/mmp/src/map/handlers/draw.ts
@@ -335,15 +335,18 @@ export default class Draw {
      */
     private updateNodeNameContainer(node: Node) {
         const name = node.getNameDOM(),
-            foreignObject: SVGForeignObjectElement = name.parentNode as SVGForeignObjectElement
+              foreignObject: SVGForeignObjectElement = name?.parentNode as SVGForeignObjectElement
 
         const [width, height]: number[] = (() => {
-            if (name.offsetWidth !== 0) {
+            if (name?.offsetWidth !== 0) {
               return [name.clientWidth, name.clientHeight]
-            } else {
+            } else if(node?.name?.length > 0) {
               // More recent versions of firefox seem to render too late to actually fetch the width and height of the dom element.
               // In these cases, try to estimate height and width before rendering
               return [node.name.length * node.font.size / 1.9, node.font.size]
+            } else {
+              // default values if empty
+              return [20, 20]
             }
         })()