Merge pull request #1729 from CTemplar/dev

Dev
CTemplar · Apr 11, 2022 · b318c03 · b318c03
2 parents cb5c11b + 084d8f5
commit b318c03
Show file tree

Hide file tree

Showing 74 changed files with 3,856 additions and 3,556 deletions.
diff --git a/angular.json b/angular.json
@@ -67,7 +67,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ctemplar",
-  "version": "2.5.73",
+  "version": "2.5.74",
   "license": "Apache",
   "main": "electron-main.js",
   "description": "Angular webclient (with Linux, macOS and Windows desktop clients) for CTemplar's encrypted email service.",
@@ -28,17 +28,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^10.2.5",
-    "@angular/cdk": "^10.2.7",
-    "@angular/common": "^10.2.5",
-    "@angular/compiler": "^10.2.5",
-    "@angular/core": "^10.2.5",
-    "@angular/forms": "^10.2.5",
-    "@angular/localize": "^10.2.5",
-    "@angular/material": "^10.2.7",
-    "@angular/platform-browser": "^10.2.5",
-    "@angular/platform-browser-dynamic": "^10.2.5",
-    "@angular/router": "^10.2.5",
+    "@angular/animations": "^11.2.14",
+    "@angular/cdk": "^11.2.13",
+    "@angular/common": "^11.2.14",
+    "@angular/compiler": "^11.2.14",
+    "@angular/core": "^11.2.14",
+    "@angular/forms": "^11.2.14",
+    "@angular/localize": "^11.2.14",
+    "@angular/material": "^11.2.13",
+    "@angular/platform-browser": "^11.2.14",
+    "@angular/platform-browser-dynamic": "^11.2.14",
+    "@angular/router": "^11.2.14",
     "@ckeditor/ckeditor5-angular": "^2.0.1",
     "@electron/remote": "^1.1.0",
     "@ng-bootstrap/ng-bootstrap": "^9.1.3",
@@ -56,7 +56,6 @@
     "electron-updater": "^4.3.4",
     "electron-window-state": "^5.0.3",
     "email-addresses": "^3.1.0",
-    "eml-format": "^0.6.1",
     "juice": "^7.0.0",
     "mimemessage": "^1.0.5",
     "moment-timezone": "^0.5.27",
@@ -73,16 +72,16 @@
   },
   "devDependencies": {
     "@angular-builders/dev-server": "^7.3.1",
-    "@angular-devkit/build-angular": "^0.1002.3",
-    "@angular/cli": "^10.2.3",
-    "@angular/compiler-cli": "^10.2.5",
+    "@angular-devkit/build-angular": "^0.1102.18",
+    "@angular/cli": "^11.2.18",
+    "@angular/compiler-cli": "^11.2.14",
     "@ckeditor/ckeditor5-inspector": "^2.2.2",
-    "@types/jasmine": "^3.5.14",
+    "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "^2.0.8",
     "@types/node": "^15.0.1",
     "@typescript-eslint/eslint-plugin": "^4.1.0",
     "@typescript-eslint/parser": "^4.1.0",
-    "electron": "^12.1.0",
+    "electron": "^13.6.6",
     "electron-builder": "^22.10.5",
     "electron-reload": "1.5.0",
     "eslint": "^7.28.0",
@@ -93,7 +92,7 @@
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-unicorn": "^33.0.1",
     "husky": "^6.0.0",
-    "jasmine-core": "~3.5.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~6.3.16",
     "karma-chrome-launcher": "~3.1.0",
@@ -107,7 +106,7 @@
     "typescript": "~4.0.7"
   },
   "lint-staged": {
-    "**/*.{js,ts,json}": [
+    "**/*.{js,ts}": [
       "eslint --fix",
       "prettier --write"
     ]

diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -1,25 +1,36 @@
-import { TestBed, async } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { AppComponent } from './app.component';
 describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AppComponent],
-    }).compileComponents();
-  }));
-  it('should create the app', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  }));
-  it(`should have as title 'app'`, async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('app');
-  }));
-  it('should render title in a h1 tag', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [AppComponent],
+      }).compileComponents();
+    }),
+  );
+  it(
+    'should create the app',
+    waitForAsync(() => {
+      const fixture = TestBed.createComponent(AppComponent);
+      const app = fixture.debugElement.componentInstance;
+      expect(app).toBeTruthy();
+    }),
+  );
+  it(
+    `should have as title 'app'`,
+    waitForAsync(() => {
+      const fixture = TestBed.createComponent(AppComponent);
+      const app = fixture.debugElement.componentInstance;
+      expect(app.title).toEqual('app');
+    }),
+  );
+  it(
+    'should render title in a h1 tag',
+    waitForAsync(() => {
+      const fixture = TestBed.createComponent(AppComponent);
+      fixture.detectChanges();
+      const compiled = fixture.debugElement.nativeElement;
+      expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
+    }),
+  );
 });
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
@@ -131,7 +131,7 @@ <h4 style="text-align: center" class="footer-slogan">
     </h4>
     <div class="footer-bottom-row text-center">
       <p class="app-credit small">
-        &copy;2021
+        &copy;2022
         <span [translate]="'footer.software_systems'"
           >Templar Software Systems Ltd., a Seychelles Limited Liability Company</span
         >

diff --git a/src/app/footer/footer.component.spec.ts b/src/app/footer/footer.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { FooterComponent } from './footer.component';
 
 describe('FooterComponent', () => {
   let component: FooterComponent;
   let fixture: ComponentFixture<FooterComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [FooterComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [FooterComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(FooterComponent);

diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { HeaderComponent } from './header.component';
 
 describe('HeaderComponent', () => {
   let component: HeaderComponent;
   let fixture: ComponentFixture<HeaderComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [HeaderComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [HeaderComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(HeaderComponent);

diff --git a/src/app/mail/dialogs/import-private-key/import-private-key.component.spec.ts b/src/app/mail/dialogs/import-private-key/import-private-key.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { ImportPrivateKeyComponent } from './import-private-key.component';
 
 describe('ImportPrivateKeyComponent', () => {
   let component: ImportPrivateKeyComponent;
   let fixture: ComponentFixture<ImportPrivateKeyComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ImportPrivateKeyComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [ImportPrivateKeyComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ImportPrivateKeyComponent);

diff --git a/src/app/mail/mail-contact/mail-contact.component.spec.ts b/src/app/mail/mail-contact/mail-contact.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { MailContactComponent } from './mail-contact.component';
 
 describe('MailContactComponent', () => {
   let component: MailContactComponent;
   let fixture: ComponentFixture<MailContactComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MailContactComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [MailContactComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MailContactComponent);

diff --git a/src/app/mail/mail-contact/save-contact/save-contact.component.spec.ts b/src/app/mail/mail-contact/save-contact/save-contact.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { SaveContactComponent } from './save-contact.component';
 
 describe('SaveContactComponent', () => {
   let component: SaveContactComponent;
   let fixture: ComponentFixture<SaveContactComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SaveContactComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [SaveContactComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SaveContactComponent);

diff --git a/src/app/mail/mail-detail/mail-detail-body/mail-detail-body.component.spec.ts b/src/app/mail/mail-detail/mail-detail-body/mail-detail-body.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { MailDetailBodyComponent } from './mail-detail-body.component';
 
 describe('MailDetailBodyComponent', () => {
   let component: MailDetailBodyComponent;
   let fixture: ComponentFixture<MailDetailBodyComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MailDetailBodyComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [MailDetailBodyComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MailDetailBodyComponent);

diff --git a/...l/mail-detail/mail-detail-decryption-error/mail-detail-decryption-error.component.spec.ts b/...l/mail-detail/mail-detail-decryption-error/mail-detail-decryption-error.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { MailDetailDecryptionErrorComponent } from './mail-detail-decryption-error.component';
 
 describe('MailDetailDecryptionErrorComponent', () => {
   let component: MailDetailDecryptionErrorComponent;
   let fixture: ComponentFixture<MailDetailDecryptionErrorComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MailDetailDecryptionErrorComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [MailDetailDecryptionErrorComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MailDetailDecryptionErrorComponent);

diff --git a/...etail/mail-detail-encryption-type-icon/mail-detail-encryption-type-icon.component.spec.ts b/...etail/mail-detail-encryption-type-icon/mail-detail-encryption-type-icon.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { MailDetailEncryptionTypeIconComponent } from './mail-detail-encryption-type-icon.component';
 
 describe('MailDetailEncryptionTypeIconComponent', () => {
   let component: MailDetailEncryptionTypeIconComponent;
   let fixture: ComponentFixture<MailDetailEncryptionTypeIconComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MailDetailEncryptionTypeIconComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [MailDetailEncryptionTypeIconComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MailDetailEncryptionTypeIconComponent);

diff --git a/src/app/mail/mail-detail/mail-detail-header/mail-detail-header.component.spec.ts b/src/app/mail/mail-detail/mail-detail-header/mail-detail-header.component.spec.ts
@@ -1,16 +1,18 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { MailDetailHeaderComponent } from './mail-detail-header.component';
 
 describe('MailDetailHeaderComponent', () => {
   let component: MailDetailHeaderComponent;
   let fixture: ComponentFixture<MailDetailHeaderComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MailDetailHeaderComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [MailDetailHeaderComponent],
+      }).compileComponents();
+    }),
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MailDetailHeaderComponent);