From 7a60c0fbfdcc3869b4ccf9b072c71597b1d8fb82 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Mon, 4 Nov 2024 15:04:30 +0200
Subject: [PATCH] UI: Remove qr code widgets for tenant level

---
 ui-ngx/src/app/core/services/menu.models.ts   |  3 +-
 ...bile-app-qr-code-basic-config.component.ts |  4 +--
 ...ile-qr-code-widget-settings.component.html | 11 ++-----
 ...obile-qr-code-widget-settings.component.ts | 29 -------------------
 .../app/shared/models/mobile-app.models.ts    |  1 -
 5 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/ui-ngx/src/app/core/services/menu.models.ts b/ui-ngx/src/app/core/services/menu.models.ts
index 7dbb9614c8..f173ef1af5 100644
--- a/ui-ngx/src/app/core/services/menu.models.ts
+++ b/ui-ngx/src/app/core/services/menu.models.ts
@@ -820,8 +820,7 @@ const defaultUserMenuMap = new Map<Authority, MenuReference[]>([
         id: MenuId.mobile_center,
         pages: [
           {id: MenuId.mobile_apps},
-          {id: MenuId.mobile_bundles},
-          {id: MenuId.mobile_qr_code_widget}
+          {id: MenuId.mobile_bundles}
         ]
       },
       {id: MenuId.api_usage},
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/mobile-app-qr-code-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/mobile-app-qr-code-basic-config.component.ts
index f415e1d17c..d1ed782d03 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/mobile-app-qr-code-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/mobile-app-qr-code-basic-config.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { ChangeDetectorRef, Component, Injector } from '@angular/core';
+import { Component } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -42,8 +42,6 @@ export class MobileAppQrCodeBasicConfigComponent extends BasicWidgetConfigCompon
 
   constructor(protected store: Store<AppState>,
               protected widgetConfigComponent: WidgetConfigComponent,
-              private cd: ChangeDetectorRef,
-              private $injector: Injector,
               private fb: UntypedFormBuilder) {
     super(store, widgetConfigComponent);
   }
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
index 4788d8265f..4005c60178 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
@@ -27,12 +27,7 @@
   <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
   <mat-card-content style="padding-top: 16px">
     <div class="tb-form-panel no-border no-padding" [formGroup]="mobileAppSettingsForm">
-      <div class="tb-form-row no-border no-padding-bottom" *ngIf="isTenantAdmin()">
-        <mat-slide-toggle class="mat-slide" formControlName="useSystemSettings">
-          {{ 'admin.mobile-app.use-system-settings' | translate }}
-        </mat-slide-toggle>
-      </div>
-      <div class="tb-form-panel" *ngIf="!mobileAppSettingsForm.get('useSystemSettings').value">
+      <div class="tb-form-panel">
         <div class="tb-form-row column-xs no-border no-padding space-between">
           <div class="tb-form-panel-title" translate>admin.mobile-app.applications</div>
           <tb-toggle-select formControlName="useDefaultApp">
@@ -63,7 +58,7 @@
           </mat-slide-toggle>
         </div>
       </div>
-      <div class="tb-form-panel" formGroupName="qrCodeConfig" *ngIf="!mobileAppSettingsForm.get('useSystemSettings').value">
+      <div class="tb-form-panel" formGroupName="qrCodeConfig">
         <div class="tb-form-row column-xs no-border no-padding space-between">
           <div class="tb-form-panel-title" translate>admin.mobile-app.appearance-on-home-page</div>
           <tb-toggle-select formControlName="showOnHomePage">
@@ -98,7 +93,7 @@
                         matTooltipClass="tb-error-tooltip"
                         [matTooltip]="(mobileAppSettingsForm.get('qrCodeConfig.qrCodeLabel').hasError('required') ?
                          'admin.mobile-app.label-required' : 'admin.mobile-app.label-max-length') | translate"
-                        *ngIf="mobileAppSettingsForm.get('qrCodeConfig.qrCodeLabel').touched &&
+                        *ngIf="!mobileAppSettingsForm.get('qrCodeConfig.qrCodeLabel').untouched &&
                          mobileAppSettingsForm.get('qrCodeConfig.qrCodeLabel').hasError('required') ||
                          mobileAppSettingsForm.get('qrCodeConfig.qrCodeLabel').hasError('maxlength')"
                         class="tb-error">
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.ts
index ad1dcc2d2f..3ddb15cd3b 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.ts
@@ -24,8 +24,6 @@ import { MobileApplicationService } from '@core/http/mobile-application.service'
 import { BadgePosition, badgePositionTranslationsMap, QrCodeSettings } from '@shared/models/mobile-app.models';
 import { ActionUpdateMobileQrCodeEnabled } from '@core/auth/auth.actions';
 import { EntityType } from '@shared/models/entity-type.models';
-import { getCurrentAuthUser } from '@core/auth/auth.selectors';
-import { Authority } from '@shared/models/authority.enum';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
@@ -39,7 +37,6 @@ export class MobileQrCodeWidgetSettingsComponent extends PageComponent implement
   readonly entityType = EntityType;
 
   mobileAppSettingsForm = this.fb.group({
-    useSystemSettings: [false],
     useDefaultApp: [true],
     mobileAppBundleId: [{value: null, disabled: true}, Validators.required],
     androidEnabled: [true],
@@ -53,7 +50,6 @@ export class MobileQrCodeWidgetSettingsComponent extends PageComponent implement
     })
   });
 
-  private authUser = getCurrentAuthUser(this.store);
   private mobileAppSettings: QrCodeSettings;
 
   constructor(protected store: Store<AppState>,
@@ -62,24 +58,6 @@ export class MobileQrCodeWidgetSettingsComponent extends PageComponent implement
     super(store);
     this.mobileAppService.getMobileAppSettings()
       .subscribe(settings => this.processMobileAppSettings(settings));
-    if (this.isTenantAdmin()) {
-      this.mobileAppSettingsForm.get('useSystemSettings').valueChanges.pipe(
-        takeUntilDestroyed()
-      ).subscribe(value => {
-        if (value) {
-          this.mobileAppSettingsForm.get('mobileAppBundleId').disable({emitEvent: false});
-          this.mobileAppSettingsForm.get('qrCodeConfig.qrCodeLabel').disable({emitEvent: false});
-        } else {
-          const formValue = this.mobileAppSettingsForm.value;
-          if (!formValue.useDefaultApp) {
-            this.mobileAppSettingsForm.get('mobileAppBundleId').enable({emitEvent: false});
-          }
-          if (formValue.qrCodeConfig.qrCodeLabelEnabled && formValue.qrCodeConfig.showOnHomePage) {
-            this.mobileAppSettingsForm.get('qrCodeConfig.qrCodeLabel').enable({emitEvent: false});
-          }
-        }
-      });
-    }
     this.mobileAppSettingsForm.get('useDefaultApp').valueChanges.pipe(
       takeUntilDestroyed()
     ).subscribe(value => {
@@ -138,15 +116,8 @@ export class MobileQrCodeWidgetSettingsComponent extends PageComponent implement
     });
   }
 
-  public isTenantAdmin(): boolean {
-    return this.authUser.authority === Authority.TENANT_ADMIN;
-  }
-
   private processMobileAppSettings(mobileAppSettings: QrCodeSettings): void {
     this.mobileAppSettings = {...mobileAppSettings};
-    if (!this.isTenantAdmin()) {
-      this.mobileAppSettings.useSystemSettings = false;
-    }
     this.mobileAppSettingsForm.reset(this.mobileAppSettings);
   }
 
diff --git a/ui-ngx/src/app/shared/models/mobile-app.models.ts b/ui-ngx/src/app/shared/models/mobile-app.models.ts
index 167c4ca567..acf609a637 100644
--- a/ui-ngx/src/app/shared/models/mobile-app.models.ts
+++ b/ui-ngx/src/app/shared/models/mobile-app.models.ts
@@ -22,7 +22,6 @@ import { MobileAppBundleId } from '@shared/models/id/mobile-app-bundle-id';
 import { deepClone, isNotEmptyStr } from '@core/utils';
 
 export interface QrCodeSettings extends HasTenantId {
-  useSystemSettings: boolean;
   useDefaultApp: boolean;
   mobileAppBundleId: MobileAppBundleId
   androidEnabled: boolean;