Merge pull request #1590 from josehernandezfintecheandomx/enhancement/upgrade_angular13

Upgrade Angular 13

.github/workflows/build.yml

@@ -29,13 +29,13 @@ jobs:
           # lts/gallium node v16.15.1 (npm v8.11.0)
           node-version: '16.15.1'
       - name: Angular CLI install
-        run : npm install -g --silent @angular/cli@12.2.17
+        run : npm install -g --silent @angular/cli@13.3.10
 
       - name: Npm install
         run: npm install
 
-      - name: Run lint
-        run : ng lint
+      - name: Run tslint
+        run : npx tslint src/**/*.ts
 
       - name: Run build
         run : npm run build:prod

.gitignore

@@ -1,5 +1,6 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 .env
+.angular/*
 
 # Compiled output
 /dist

Dockerfile

@@ -27,7 +27,7 @@ RUN npm cache clear --force
 RUN npm config set fetch-retry-maxtimeout 120000
 RUN npm config set registry $NPM_REGISTRY_URL --location=global
 
-RUN npm install --location=global @angular/cli@12.2.17
+RUN npm install --location=global @angular/cli@13.3.10
 
 RUN npm install
 

README.md

@@ -20,7 +20,7 @@ The latest code is continuously deployed at https://openmf.github.io/web-app/ wh
 
 2. Install [angular-cli](https://github.com/angular/angular-cli) globally.
 ```
-npm install -g @angular/cli@9.1.12
+npm install -g @angular/cli@13.3.10
 ```
 
 3. Clone the project locally into your system.

package.json

@@ -29,22 +29,22 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "^14.0.4",
-    "@angular/animations": "^12.2.16",
-    "@angular/cdk": "12.2.13",
-    "@angular/common": "12.2.16",
-    "@angular/compiler": "12.2.16",
-    "@angular/core": "12.2.16",
-    "@angular/flex-layout": "12.0.0-beta.35",
-    "@angular/forms": "12.2.16",
-    "@angular/localize": "12.2.16",
-    "@angular/material": "12.2.13",
-    "@angular/platform-browser": "12.2.16",
-    "@angular/platform-browser-dynamic": "12.2.16",
-    "@angular/router": "12.2.16",
-    "@angular/service-worker": "12.2.16",
+    "@angular/animations": "^13.3.12",
+    "@angular/cdk": "13.3.9",
+    "@angular/common": "13.3.12",
+    "@angular/compiler": "13.3.12",
+    "@angular/core": "13.3.12",
+    "@angular/flex-layout": "13.0.0-beta.38",
+    "@angular/forms": "13.3.12",
+    "@angular/localize": "13.3.12",
+    "@angular/material": "13.3.9",
+    "@angular/platform-browser": "13.3.12",
+    "@angular/platform-browser-dynamic": "13.3.12",
+    "@angular/router": "13.3.12",
+    "@angular/service-worker": "13.3.12",
     "@ckeditor/ckeditor5-angular": "1.2.3",
     "@ckeditor/ckeditor5-build-classic": "21.0.0",
-    "@fortawesome/angular-fontawesome": "^0.9.0",
+    "@fortawesome/angular-fontawesome": "^0.10.2",
     "@fortawesome/fontawesome-svg-core": "^1.2.32",
     "@fortawesome/free-solid-svg-icons": "5.8.2",
     "@ngx-translate/core": "13.0.0",
@@ -63,10 +63,10 @@
     "zone.js": "0.11.6"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "12.2.18",
-    "@angular/cli": "12.2.17",
-    "@angular/compiler-cli": "12.2.16",
-    "@angular/language-service": "12.2.16",
+    "@angular-devkit/build-angular": "13.3.10",
+    "@angular/cli": "13.3.10",
+    "@angular/compiler-cli": "13.3.12",
+    "@angular/language-service": "13.3.12",
     "@biesbjerg/ngx-translate-extract": "^7.0.4",
     "@cypress/schematic": "^1.7.0",
     "@ngx-rocket/scripts": "3.0.3",
@@ -102,7 +102,7 @@
     "stylelint-scss": "3.6.1",
     "ts-node": "8.2.0",
     "tslint": "~6.1.0",
-    "typescript": "4.3.5"
+    "typescript": "4.6.4"
   },
   "repository": {
     "type": "git",

src/app/centers/centers-view/centers-view.component-theme.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin centers-view-component-theme($theme) {
   $primary: map-get($theme, primary);

src/app/clients/clients-view/clients-view.component-theme.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin clients-view-component-theme($theme) {
   $primary: map-get($theme, primary);

src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component-theme.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin fixed-deposits-account-view-component-theme($theme) {
   $primary: map-get($theme, primary);
@@ -12,5 +12,5 @@
         color: mat.get-contrast-color-from-palette($primary, 500);
       }
     }
-  } 
+  }
 }

src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component-theme.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin recurring-deposits-account-view-component-theme($theme) {
   $primary: map-get($theme, primary);

src/app/groups/groups-view/groups-view.component-theme.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin groups-view-component-theme($theme) {
   $primary: map-get($theme, primary);
@@ -8,5 +8,5 @@
         background-color: mat.get-color-from-palette($primary, 500);
       }
     }
-  } 
+  }
 }

src/app/home/dashboard/dashboard.component-theme.scss

@@ -1,10 +1,10 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin dashboard-component-theme($theme) {
   $primary: map-get($theme, primary);
-  
+
   mifosx-dashboard {
-    
+
     .recent-activities, .frequent-activities {
       .header {
         background-color: mat.get-color-from-palette($primary, 500);

src/app/loans/loans-view/loans-view.component-theme.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin loans-view-component-theme($theme) {
   $primary: map-get($theme, primary);

src/app/savings/savings-account-view/savings-account-view.component-theme.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin savings-account-view-component-theme($theme) {
   $primary: map-get($theme, primary);
@@ -12,5 +12,5 @@
         color: mat.get-contrast-color-from-palette($primary, 500);
       }
     }
-  } 
+  }
 }

src/app/shares/shares-account-view/shares-account-view.component-theme.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 @mixin shares-account-view-component-theme($theme) {
   $primary: map-get($theme, primary);
@@ -12,5 +12,5 @@
         color: mat.get-contrast-color-from-palette($primary, 500);
       }
     }
-  } 
+  }
 }

src/environments/.env.ts

@@ -3,7 +3,7 @@
 export default {
   'mifos_x': {
     'version': '0.0.0',
-    'hash': '79efe55'
+    'hash': '217d88b7'
   },
   'allow_switching_backend_instance': true
 };

src/karma.conf.ts

@@ -80,5 +80,5 @@ module.exports = (config: any) => {
     ],
 
     reporter: ['progress', 'kjhtml']
-  })
-}
+  });
+};

src/theme/custom/denim-yellowgreen.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 // Plus imports for other components in your app.
 @import '../../app/clients/clients-view/clients-view.component-theme.scss';
 @import '../../app/groups/groups-view/groups-view.component-theme.scss';

src/theme/custom/pictonblue-yellowgreen.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 // Plus imports for other components in your app.
 @import '../../app/clients/clients-view/clients-view.component-theme.scss';
 @import '../../app/groups/groups-view/groups-view.component-theme.scss';