fix(console): label policy preview, duplicate changes on update, deps (#1948)

* font, preview fixes, i18n

* fix changes refresh

* chore(deps): bump @angular/platform-browser-dynamic in /console (#1901)

Bumps [@angular/platform-browser-dynamic](https://github.com/angular/angular/tree/HEAD/packages/platform-browser-dynamic) from 12.0.3 to 12.0.5.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/12.0.5/packages/platform-browser-dynamic)

---
updated-dependencies:
- dependency-name: "@angular/platform-browser-dynamic"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump @angular/compiler-cli in /console (#1904)

Bumps [@angular/compiler-cli](https://github.com/angular/angular/tree/HEAD/packages/compiler-cli) from 12.0.3 to 12.0.5.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/12.0.5/packages/compiler-cli)

---
updated-dependencies:
- dependency-name: "@angular/compiler-cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump @angular/service-worker in /console (#1905)

Bumps [@angular/service-worker](https://github.com/angular/angular/tree/HEAD/packages/service-worker) from 12.0.3 to 12.0.5.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/12.0.5/packages/service-worker)

---
updated-dependencies:
- dependency-name: "@angular/service-worker"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump @angular/common from 12.0.3 to 12.0.5 in /console (#1908)

Bumps [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) from 12.0.3 to 12.0.5.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/12.0.5/packages/common)

---
updated-dependencies:
- dependency-name: "@angular/common"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump @angular/forms from 12.0.3 to 12.0.5 in /console (#1909)

Bumps [@angular/forms](https://github.com/angular/angular/tree/HEAD/packages/forms) from 12.0.3 to 12.0.5.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/12.0.5/packages/forms)

---
updated-dependencies:
- dependency-name: "@angular/forms"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump @angular/router from 12.0.3 to 12.0.5 in /console (#1907)

Bumps [@angular/router](https://github.com/angular/angular/tree/HEAD/packages/router) from 12.0.3 to 12.0.5.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/12.0.5/packages/router)

---
updated-dependencies:
- dependency-name: "@angular/router"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>

* chore(deps-dev): bump @angular-devkit/build-angular in /console (#1943)

Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 12.0.3 to 12.1.0.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v12.0.3...v12.1.0)

---
updated-dependencies:
- dependency-name: "@angular-devkit/build-angular"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump ngx-color from 7.0.0 to 7.2.0 in /console (#1932)

Bumps [ngx-color](https://github.com/scttcper/ngx-color) from 7.0.0 to 7.2.0.
- [Release notes](https://github.com/scttcper/ngx-color/releases)
- [Commits](https://github.com/scttcper/ngx-color/compare/v7.0.0...v7.2.0)

---
updated-dependencies:
- dependency-name: ngx-color
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update cli, lang servce

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

console/package.json

@@ -12,16 +12,16 @@
   "dependencies": {
     "@angular/animations": "~12.0.3",
     "@angular/cdk": "~12.0.0",
-    "@angular/common": "~12.0.3",
+    "@angular/common": "~12.0.5",
     "@angular/compiler": "~12.0.0",
     "@angular/core": "~12.0.0",
-    "@angular/forms": "~12.0.0",
+    "@angular/forms": "~12.0.5",
     "@angular/material": "^12.0.3",
     "@angular/material-moment-adapter": "^12.0.3",
     "@angular/platform-browser": "~12.0.0",
-    "@angular/platform-browser-dynamic": "~12.0.3",
-    "@angular/router": "~12.0.0",
-    "@angular/service-worker": "~12.0.0",
+    "@angular/router": "~12.0.5",
+    "@angular/platform-browser-dynamic": "~12.0.5",
+    "@angular/service-worker": "~12.0.5",
     "@grpc/grpc-js": "^1.3.2",
     "@ngx-translate/core": "^13.0.0",
     "@ngx-translate/http-loader": "^6.0.0",
@@ -38,7 +38,7 @@
     "libphonenumber-js": "^1.9.16",
     "moment": "^2.29.1",
     "ngx-image-cropper": "^3.3.5",
-    "ngx-color": "^7.0.0",
+    "ngx-color": "^7.2.0",
     "ngx-quicklink": "^0.2.6",
     "rxjs": "~6.6.7",
     "ts-protoc-gen": "^0.14.0",
@@ -47,10 +47,10 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~12.0.0",
-    "@angular/cli": "~12.0.0",
-    "@angular/compiler-cli": "~12.0.0",
-    "@angular/language-service": "~12.0.3",
+    "@angular-devkit/build-angular": "~12.1.0",
+    "@angular/cli": "~12.1.0",
+    "@angular/compiler-cli": "~12.0.5",
+    "@angular/language-service": "~12.1.0",
     "@types/jasmine": "~3.7.7",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^15.12.1",

console/src/app/modules/changes/changes.component.ts

@@ -69,6 +69,7 @@ export class ChangesComponent implements OnInit, OnDestroy {
     this.init();
     if (this.refresh) {
       this.refresh.pipe(takeUntil(this.destroyed$), debounceTime(2000)).subscribe(() => {
+        this._data = new BehaviorSubject([]);
         this.init();
       });
     }

console/src/app/modules/policies/private-labeling-policy/preview/preview.component.html

@@ -2,9 +2,15 @@
   <span class="label">{{label}}</span>
   <div class="dashed" [ngClass]="{'dark': theme === Theme.DARK, 'light': theme === Theme.LIGHT}" [style.background]="theme == Theme.DARK ? policy.backgroundColorDark : policy.backgroundColor">
     <div class="login-wrapper" [style.color]="theme == Theme.DARK ? policy.fontColorDark : policy.fontColor">
+      <ng-container *ngIf="preview === Preview.PREVIEW; else currentimgs">
         <img *ngIf="images['previewLogo'] && theme == Theme.LIGHT" [src]="images['previewLogo']" alt="logo-mock" />
-
         <img *ngIf="images['previewDarkLogo'] && theme == Theme.DARK"  [src]="images['previewDarkLogo']" alt="logo-mock" />
+      </ng-container>
+
+      <ng-template #currentimgs>
+        <img *ngIf="images['logo'] && theme == Theme.LIGHT" [src]="images['logo']" alt="logo-mock" />
+        <img *ngIf="images['darkLogo'] && theme == Theme.DARK"  [src]="images['darkLogo']" alt="logo-mock" />
+      </ng-template>
 
       <h1 [style.color]="theme == Theme.DARK ? policy.fontColorDark : policy.fontColor">{{'POLICY.PRIVATELABELING.PREVIEW.TITLE' | translate}}</h1>
       <p [style.color]="theme == Theme.DARK ? policy.fontColorDark : policy.fontColor" class="desc-text">{{'POLICY.PRIVATELABELING.PREVIEW.SECOND' | translate}}</p>

console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.html

@@ -223,7 +223,7 @@
                   <button mat-stroked-button class="btn" [disabled]="serviceType == PolicyComponentServiceType.MGMT && (['label_policy.private_label'] | hasFeature | async) == false"  mat-raised-button type="button" (click)="selectedFontFile.click();">{{'POLICY.PRIVATELABELING.BTN' | translate}}</button>
 
                   <i class="icon las la-cloud-upload-alt"></i>
-                  <span >{{isHoveringOverFont ? ('POLICY.PRIVATELABELING.RELEASE' | translate): ('POLICY.PRIVATELABELING.DROP' | translate)}}</span>
+                  <span >{{isHoveringOverFont ? ('POLICY.PRIVATELABELING.RELEASEFONT' | translate): ('POLICY.PRIVATELABELING.DROPFONT' | translate)}}</span>
                 </label>
             </div>
         </div>

console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.ts

@@ -379,7 +379,6 @@ export class PrivateLabelingPolicyComponent implements OnDestroy {
 
           if ((canUse === true && this.serviceType === PolicyComponentServiceType.MGMT) ||
             this.serviceType === PolicyComponentServiceType.ADMIN) {
-            // this.loadingImages = true;
             this.loadImages();
           }
         }
@@ -423,6 +422,7 @@ export class PrivateLabelingPolicyComponent implements OnDestroy {
     if (promises.length) {
       Promise.all(promises).then(() => {
         this.loadingImages = false;
+        this.refreshPreview.emit();
       }).catch(error => {
         this.loadingImages = false;
       });
@@ -465,6 +465,7 @@ export class PrivateLabelingPolicyComponent implements OnDestroy {
     if (promises.length) {
       Promise.all(promises).then(() => {
         this.loadingImages = false;
+        this.refreshPreview.emit();
       }).catch(error => {
         this.loadingImages = false;
       });

console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts

@@ -48,7 +48,6 @@ export class AuthUserDetailComponent implements OnDestroy {
     this.userService.getMyUser().then(resp => {
       if (resp.user) {
         this.user = resp.user;
-        console.log(resp.user);
       }
       this.loading = false;
     }).catch(error => {

console/src/assets/i18n/de.json

@@ -666,6 +666,8 @@
       "ADVANCEDBEHAVIOR":"Erweitertes Verhalten",
       "DROP":"Bild hier ablegen",
       "RELEASE":"Jetzt loslassen",
+      "DROPFONT":"Fontdatei hier ablegen",
+      "RELEASEFONT":"Jetzt loslassen",
       "PREVIEW": {
         "TITLE":"Anmeldung",
         "SECOND":"mit ZITADEL-Konto anmelden.",

console/src/assets/i18n/en.json

@@ -666,6 +666,8 @@
       "ADVANCEDBEHAVIOR":"Advanced Behavior",
       "DROP":"Drop image here",
       "RELEASE":"Release",
+      "DROPFONT":"Drop fontfile here",
+      "RELEASEFONT":"Release",
       "PREVIEW": {
         "TITLE":"Login",
         "SECOND":"login with your ZITADEL-Account.",