From f36bba64062094bed532341f312c1d5f5e14baf5 Mon Sep 17 00:00:00 2001
From: syntaxerror752 <revan1234@hotmail.com>
Date: Sat, 30 May 2020 10:21:42 +1000
Subject: [PATCH] Revert last commit due to requested changes

Revert last commit due to requested changes.
Renamed variable.
---
 src/app/organizations/manage/manage.component.html     |  2 +-
 src/app/organizations/manage/manage.component.ts       |  5 +----
 src/app/organizations/settings/settings.component.html |  2 +-
 src/app/organizations/settings/settings.component.ts   |  5 +----
 src/app/organizations/tools/tools.component.html       |  2 +-
 src/app/organizations/tools/tools.component.ts         |  5 +----
 src/app/organizations/vault/vault.component.html       |  2 +-
 src/app/organizations/vault/vault.component.ts         |  5 +----
 src/app/settings/options.component.html                | 10 +++++-----
 src/app/settings/options.component.ts                  |  8 ++++----
 src/app/settings/settings.component.html               |  2 +-
 src/app/settings/settings.component.ts                 |  5 +----
 src/app/tools/tools.component.html                     |  2 +-
 src/app/tools/tools.component.ts                       |  5 +----
 src/app/vault/vault.component.html                     |  2 +-
 src/app/vault/vault.component.ts                       |  6 +-----
 src/locales/en/messages.json                           |  6 +++---
 src/locales/en_GB/messages.json                        |  7 -------
 src/services/htmlStorage.service.ts                    |  2 +-
 19 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/src/app/organizations/manage/manage.component.html b/src/app/organizations/manage/manage.component.html
index 49b87986de..c54f1a117f 100644
--- a/src/app/organizations/manage/manage.component.html
+++ b/src/app/organizations/manage/manage.component.html
@@ -1,4 +1,4 @@
-<div class="container page-content" [ngClass]="{'full-width': this.scaleUIWidth}">
+<div class="container page-content">
     <div class="row">
         <div class="col-3">
             <div class="card" *ngIf="organization">
diff --git a/src/app/organizations/manage/manage.component.ts b/src/app/organizations/manage/manage.component.ts
index 2cfe7ba94c..c6042bfbb3 100644
--- a/src/app/organizations/manage/manage.component.ts
+++ b/src/app/organizations/manage/manage.component.ts
@@ -5,7 +5,6 @@ import {
 import { ActivatedRoute } from '@angular/router';
 
 import { UserService } from 'jslib/abstractions/user.service';
-import { StorageService } from 'jslib/abstractions/storage.service';
 
 import { Organization } from 'jslib/models/domain/organization';
 
@@ -18,13 +17,11 @@ export class ManageComponent implements OnInit {
     accessPolicies = false;
     accessGroups = false;
     accessEvents = false;
-    scaleUIWidth: boolean = false;
 
-    constructor(private route: ActivatedRoute, private userService: UserService, private storageService: StorageService) { }
+    constructor(private route: ActivatedRoute, private userService: UserService) { }
 
     ngOnInit() {
         this.route.parent.params.subscribe(async (params) => {
-            this.scaleUIWidth = await this.storageService.get<boolean>('enableUIScaling');
             this.organization = await this.userService.getOrganization(params.organizationId);
             this.accessPolicies = this.organization.usePolicies;
             this.accessEvents = this.organization.useEvents;
diff --git a/src/app/organizations/settings/settings.component.html b/src/app/organizations/settings/settings.component.html
index e7cce8e587..2dac5ac185 100644
--- a/src/app/organizations/settings/settings.component.html
+++ b/src/app/organizations/settings/settings.component.html
@@ -1,4 +1,4 @@
-<div class="container page-content" [ngClass]="{'full-width': this.scaleUIWidth}">
+<div class="container page-content">
     <div class="row">
         <div class="col-3">
             <div class="card">
diff --git a/src/app/organizations/settings/settings.component.ts b/src/app/organizations/settings/settings.component.ts
index ff5441e32f..c2db836085 100644
--- a/src/app/organizations/settings/settings.component.ts
+++ b/src/app/organizations/settings/settings.component.ts
@@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router';
 
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { UserService } from 'jslib/abstractions/user.service';
-import { StorageService } from 'jslib/abstractions/storage.service';
 
 @Component({
     selector: 'app-org-settings',
@@ -12,14 +11,12 @@ import { StorageService } from 'jslib/abstractions/storage.service';
 export class SettingsComponent {
     access2fa = false;
     selfHosted: boolean;
-    scaleUIWidth: boolean = false;
 
     constructor(private route: ActivatedRoute, private userService: UserService,
-        private platformUtilsService: PlatformUtilsService, private storageService: StorageService) { }
+        private platformUtilsService: PlatformUtilsService) { }
 
     ngOnInit() {
         this.route.parent.params.subscribe(async (params) => {
-            this.scaleUIWidth = await this.storageService.get<boolean>('enableUIScaling');
             this.selfHosted = await this.platformUtilsService.isSelfHost();
             const organization = await this.userService.getOrganization(params.organizationId);
             this.access2fa = organization.use2fa;
diff --git a/src/app/organizations/tools/tools.component.html b/src/app/organizations/tools/tools.component.html
index 1f24beaa67..0ffb712568 100644
--- a/src/app/organizations/tools/tools.component.html
+++ b/src/app/organizations/tools/tools.component.html
@@ -1,4 +1,4 @@
-<div class="container page-content" [ngClass]="{'full-width': this.scaleUIWidth}">
+<div class="container page-content">
     <div class="row">
         <div class="col-3">
             <div class="card mb-4">
diff --git a/src/app/organizations/tools/tools.component.ts b/src/app/organizations/tools/tools.component.ts
index a31fed0c0f..4df7d2523b 100644
--- a/src/app/organizations/tools/tools.component.ts
+++ b/src/app/organizations/tools/tools.component.ts
@@ -5,7 +5,6 @@ import { Organization } from 'jslib/models/domain/organization';
 
 import { MessagingService } from 'jslib/abstractions/messaging.service';
 import { UserService } from 'jslib/abstractions/user.service';
-import { StorageService } from 'jslib/abstractions/storage.service';
 
 @Component({
     selector: 'app-org-tools',
@@ -14,14 +13,12 @@ import { StorageService } from 'jslib/abstractions/storage.service';
 export class ToolsComponent {
     organization: Organization;
     accessReports = false;
-    scaleUIWidth: boolean = false;
 
     constructor(private route: ActivatedRoute, private userService: UserService,
-        private messagingService: MessagingService, private storageService: StorageService) { }
+        private messagingService: MessagingService) { }
 
     ngOnInit() {
         this.route.parent.params.subscribe(async (params) => {
-            this.scaleUIWidth = await this.storageService.get<boolean>('enableUIScaling');
             this.organization = await this.userService.getOrganization(params.organizationId);
             // TODO: Maybe we want to just make sure they are not on a free plan? Just compare useTotp for now
             // since all paid plans include useTotp
diff --git a/src/app/organizations/vault/vault.component.html b/src/app/organizations/vault/vault.component.html
index a54060e95f..3f836dee51 100644
--- a/src/app/organizations/vault/vault.component.html
+++ b/src/app/organizations/vault/vault.component.html
@@ -1,4 +1,4 @@
-<div class="container page-content" [ngClass]="{'full-width': this.scaleUIWidth}">
+<div class="container page-content">
     <div class="row">
         <div class="col-3">
             <app-org-vault-groupings [showFolders]="false" [showFavorites]="false" [showTrash]="true"
diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts
index f5038bab7e..b42bcbf60f 100644
--- a/src/app/organizations/vault/vault.component.ts
+++ b/src/app/organizations/vault/vault.component.ts
@@ -19,7 +19,6 @@ import { SyncService } from 'jslib/abstractions/sync.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
 import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
-import { StorageService } from 'jslib/abstractions/storage.service';
 
 import { Organization } from 'jslib/models/domain/organization';
 import { CipherView } from 'jslib/models/view/cipherView';
@@ -53,7 +52,6 @@ export class VaultComponent implements OnInit, OnDestroy {
     collectionId: string = null;
     type: CipherType = null;
     deleted: boolean = false;
-    scaleUIWidth: boolean = false;
 
     private modal: ModalComponent = null;
 
@@ -61,11 +59,10 @@ export class VaultComponent implements OnInit, OnDestroy {
         private router: Router, private changeDetectorRef: ChangeDetectorRef,
         private syncService: SyncService, private i18nService: I18nService,
         private componentFactoryResolver: ComponentFactoryResolver, private messagingService: MessagingService,
-        private broadcasterService: BroadcasterService, private storageService: StorageService, private ngZone: NgZone) { }
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) { }
 
     ngOnInit() {
         const queryParams = this.route.parent.params.subscribe(async (params) => {
-            this.scaleUIWidth = await this.storageService.get<boolean>('enableUIScaling');
             this.organization = await this.userService.getOrganization(params.organizationId);
             this.groupingsComponent.organization = this.organization;
             this.ciphersComponent.organization = this.organization;
diff --git a/src/app/settings/options.component.html b/src/app/settings/options.component.html
index 182f0088ec..b369b90f6f 100644
--- a/src/app/settings/options.component.html
+++ b/src/app/settings/options.component.html
@@ -79,13 +79,13 @@
     </div>
 	<div class="form-group">
         <div class="form-check">
-            <input class="form-check-input" type="checkbox" id="enableUIScaling" name="enableUIScaling"
-                [(ngModel)]="enableUIScaling">
-            <label class="form-check-label" for="enableUIScaling">
-                {{'enableUIScaling' | i18n}}
+            <input class="form-check-input" type="checkbox" id="enableFullWidth" name="enableFullWidth"
+                [(ngModel)]="enableFullWidth">
+            <label class="form-check-label" for="enableFullWidth">
+                {{'enableFullWidth' | i18n}}
             </label>
         </div>
-        <small class="form-text text-muted">{{'enableUIScalingDesc' | i18n}}</small>
+        <small class="form-text text-muted">{{'enableFullWidthDesc' | i18n}}</small>
     </div>
     <button type="submit" class="btn btn-primary">
         {{'save' | i18n}}
diff --git a/src/app/settings/options.component.ts b/src/app/settings/options.component.ts
index 87f6ec6fb2..799d711dad 100644
--- a/src/app/settings/options.component.ts
+++ b/src/app/settings/options.component.ts
@@ -25,7 +25,7 @@ export class OptionsComponent implements OnInit {
     vaultTimeoutAction: string = 'lock';
     disableIcons: boolean;
     enableGravatars: boolean;
-    enableUIScaling: boolean;
+    enableFullWidth: boolean;
     locale: string;
     vaultTimeouts: any[];
     localeOptions: any[];
@@ -67,7 +67,7 @@ export class OptionsComponent implements OnInit {
         this.vaultTimeoutAction = await this.storageService.get<string>(ConstantsService.vaultTimeoutActionKey);
         this.disableIcons = await this.storageService.get<boolean>(ConstantsService.disableFaviconKey);
         this.enableGravatars = await this.storageService.get<boolean>('enableGravatars');
-        this.enableUIScaling = await this.storageService.get<boolean>('enableUIScaling');
+        this.enableFullWidth = await this.storageService.get<boolean>('enableFullWidth');
         this.locale = this.startingLocale = await this.storageService.get<string>(ConstantsService.localeKey);
     }
 
@@ -78,8 +78,8 @@ export class OptionsComponent implements OnInit {
         await this.stateService.save(ConstantsService.disableFaviconKey, this.disableIcons);
         await this.storageService.save('enableGravatars', this.enableGravatars);
         await this.stateService.save('enableGravatars', this.enableGravatars);
-        await this.storageService.save('enableUIScaling', this.enableUIScaling);
-        await this.stateService.save('enableUIScaling', this.enableUIScaling);
+        await this.storageService.save('enableFullWidth', this.enableFullWidth);
+        await this.stateService.save('enableFullWidth', this.enableFullWidth);
         await this.storageService.save(ConstantsService.localeKey, this.locale);
         this.analytics.eventTrack.next({ action: 'Saved Options' });
         if (this.locale !== this.startingLocale) {
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index a20066853a..2ed3911852 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -1,4 +1,4 @@
-<div class="container page-content" [ngClass]="{'full-width': this.scaleUIWidth}">
+<div class="container page-content">
     <div class="row">
         <div class="col-3">
             <div class="card">
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
index cf79e8d78e..083c538bc7 100644
--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@@ -9,7 +9,6 @@ import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { TokenService } from 'jslib/abstractions/token.service';
 
 import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
-import { StorageService } from 'jslib/abstractions/storage.service';
 
 const BroadcasterSubscriptionId = 'SettingsComponent';
 
@@ -20,13 +19,11 @@ const BroadcasterSubscriptionId = 'SettingsComponent';
 export class SettingsComponent implements OnInit, OnDestroy {
     premium: boolean;
     selfHosted: boolean;
-    scaleUIWidth: boolean = false;
 
     constructor(private tokenService: TokenService, private broadcasterService: BroadcasterService,
-        private ngZone: NgZone, private platformUtilsService: PlatformUtilsService, private storageService: StorageService) { }
+        private ngZone: NgZone, private platformUtilsService: PlatformUtilsService) { }
 
     async ngOnInit() {
-        this.scaleUIWidth = await this.storageService.get<boolean>('enableUIScaling');
         this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
             this.ngZone.run(async () => {
                 switch (message.command) {
diff --git a/src/app/tools/tools.component.html b/src/app/tools/tools.component.html
index 841c14a92f..69c6263efd 100644
--- a/src/app/tools/tools.component.html
+++ b/src/app/tools/tools.component.html
@@ -1,4 +1,4 @@
-<div class="container page-content" [ngClass]="{'full-width': this.scaleUIWidth}">
+<div class="container page-content">
     <div class="row">
         <div class="col-3">
             <div class="card mb-4">
diff --git a/src/app/tools/tools.component.ts b/src/app/tools/tools.component.ts
index 3665a60bbf..f9ecdbe7a1 100644
--- a/src/app/tools/tools.component.ts
+++ b/src/app/tools/tools.component.ts
@@ -5,7 +5,6 @@ import {
 
 import { MessagingService } from 'jslib/abstractions/messaging.service';
 import { UserService } from 'jslib/abstractions/user.service';
-import { StorageService } from 'jslib/abstractions/storage.service';
 
 @Component({
     selector: 'app-tools',
@@ -13,12 +12,10 @@ import { StorageService } from 'jslib/abstractions/storage.service';
 })
 export class ToolsComponent implements OnInit {
     canAccessPremium = false;
-    scaleUIWidth: boolean = false;
 
-    constructor(private userService: UserService, private messagingService: MessagingService, private storageService: StorageService) { }
+    constructor(private userService: UserService, private messagingService: MessagingService) { }
 
     async ngOnInit() {
-        this.scaleUIWidth = await this.storageService.get<boolean>('enableUIScaling');
         this.canAccessPremium = await this.userService.canAccessPremium();
     }
 
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index 27b1d47cd2..3b5ace702e 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -1,4 +1,4 @@
-<div class="container page-content" [ngClass]="{'full-width': this.scaleUIWidth}">
+<div class="container page-content">
     <div class="row">
         <div class="col-3">
             <app-vault-groupings (onAllClicked)="clearGroupingFilters()" (onFavoritesClicked)="filterFavorites()"
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index 929325ed51..ee3705732d 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -42,7 +42,6 @@ import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 import { TokenService } from 'jslib/abstractions/token.service';
 import { UserService } from 'jslib/abstractions/user.service';
-import { StorageService } from 'jslib/abstractions/storage.service';
 
 import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
 
@@ -76,7 +75,6 @@ export class VaultComponent implements OnInit, OnDestroy {
     showUpdateKey = false;
     showPremiumCallout = false;
     deleted: boolean = false;
-    scaleUIWidth: boolean = false;
 
     private modal: ModalComponent = null;
 
@@ -86,11 +84,9 @@ export class VaultComponent implements OnInit, OnDestroy {
         private tokenService: TokenService, private cryptoService: CryptoService,
         private messagingService: MessagingService, private userService: UserService,
         private platformUtilsService: PlatformUtilsService, private toasterService: ToasterService,
-        private broadcasterService: BroadcasterService, private storageService: StorageService,
-        private ngZone: NgZone) { }
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) { }
 
     async ngOnInit() {
-        this.scaleUIWidth = await this.storageService.get<boolean>('enableUIScaling');
         this.showVerifyEmail = !(await this.tokenService.getEmailVerified());
         this.showBrowserOutdated = window.navigator.userAgent.indexOf('MSIE') !== -1;
 
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 91b0321030..51557af40f 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1044,11 +1044,11 @@
   "enableGravatarsDesc": {
     "message": "Use avatar images loaded from gravatar.com."
   },
-  "enableUIScaling": {
-    "message": "Enable UI Scaling",
+  "enableFullWidth": {
+    "message": "Enable Full Width",
     "description": "Allows scaling the web vault UI's width"
   },
-  "enableUIScalingDesc": {
+  "enableFullWidthDesc": {
     "message": "Allows expanding the web vault view to fill the full width of the browser window."
   },
   "default": {
diff --git a/src/locales/en_GB/messages.json b/src/locales/en_GB/messages.json
index 0824d2df95..d15c21696f 100644
--- a/src/locales/en_GB/messages.json
+++ b/src/locales/en_GB/messages.json
@@ -1044,13 +1044,6 @@
   "enableGravatarsDesc": {
     "message": "Use avatar images loaded from gravatar.com."
   },
-  "enableUIScaling": {
-    "message": "Enable UI Scaling",
-    "description": "Allows scaling the web vault UI's width"
-  },
-  "enableUIScalingDesc": {
-    "message": "Allows expanding the web vault view to fill the full width of the browser window."
-  },
   "default": {
     "message": "Default"
   },
diff --git a/src/services/htmlStorage.service.ts b/src/services/htmlStorage.service.ts
index bff1a7dcef..3fa7e89d19 100644
--- a/src/services/htmlStorage.service.ts
+++ b/src/services/htmlStorage.service.ts
@@ -4,7 +4,7 @@ import { ConstantsService } from 'jslib/services';
 
 export class HtmlStorageService implements StorageService {
     private localStorageKeys = new Set(['appId', 'anonymousAppId', 'rememberedEmail', 'passwordGenerationOptions',
-        ConstantsService.disableFaviconKey, 'rememberEmail', 'enableGravatars', 'enableUIScaling', ConstantsService.localeKey,
+        ConstantsService.disableFaviconKey, 'rememberEmail', 'enableGravatars', 'enableFullWidth', ConstantsService.localeKey,
         ConstantsService.autoConfirmFingerprints, ConstantsService.vaultTimeoutKey,
         ConstantsService.vaultTimeoutActionKey]);
     private localStorageStartsWithKeys = ['twoFactorToken_', ConstantsService.collapsedGroupingsKey + '_'];