From 9f80018ca0ecc191a22e46181f5d42573a0676a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina.teudan.ext@knecon.com>
Date: Wed, 11 Oct 2023 11:23:39 +0300
Subject: [PATCH] RED-7740: Fixed canvas reuse

---
 .../screens/license/components/chart/chart.component.ts   | 2 ++
 .../components/license-select/license-select.component.ts | 8 +++++---
 apps/red-ui/src/app/services/license.service.ts           | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts
index ff1dc90f1..c579005f9 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts
@@ -80,6 +80,8 @@ export class ChartComponent implements OnChanges {
             aspectRatio: 2.5,
         };
 
+        this.chart?.destroy();
+
         this.chart = new Chart(this.chartId, {
             type: 'line',
             data: this.chartData,
diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/license-select/license-select.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/components/license-select/license-select.component.ts
index 30f1a4cb6..9049a1862 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license/components/license-select/license-select.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/license/components/license-select/license-select.component.ts
@@ -3,7 +3,7 @@ import { LicenseService } from '@services/license.service';
 import { ILicense } from '@red/domain';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { map, tap } from 'rxjs/operators';
-import { IqserPermissionsService } from '@iqser/common-ui';
+import { LoadingService } from '@iqser/common-ui';
 
 const translations = {
     active: _('license-info-screen.status.active'),
@@ -26,14 +26,16 @@ export class LicenseSelectComponent {
         }),
     );
 
-    constructor(readonly licenseService: LicenseService, private readonly _permissionsService: IqserPermissionsService) {}
+    constructor(readonly licenseService: LicenseService, private readonly _loadingService: LoadingService) {}
 
-    getStatus(id) {
+    getStatus(id: string): string {
         return id === this.licenseService.activeLicense.id ? translations.active : translations.inactive;
     }
 
     async licenseChanged(license: ILicense) {
+        this._loadingService.start();
         await this.licenseService.loadLicenseData(license);
         this.licenseService.setSelectedLicense(license);
+        this._loadingService.stop();
     }
 }
diff --git a/apps/red-ui/src/app/services/license.service.ts b/apps/red-ui/src/app/services/license.service.ts
index 9ceb27830..584588d1c 100644
--- a/apps/red-ui/src/app/services/license.service.ts
+++ b/apps/red-ui/src/app/services/license.service.ts
@@ -17,8 +17,8 @@ const defaultOnError: ILicenses = {
             product: 'Error',
             licensedTo: 'Error',
             licensedToEmail: 'Error',
-            validFrom: '01-01-2023',
-            validUntil: '01-01-2024',
+            validFrom: '2023-01-01T00:00:00Z',
+            validUntil: '2023-12-31T00:00:00Z',
             features: [
                 {
                     name: LicenseFeatures.PROCESSING_PAGES,