Revert last commit due to requested changes

Revert last commit due to requested changes. Renamed variable.
2024-12-25 16:59:17 +01:00 · 2020-05-30 10:21:42 +10:00 · 2020-05-30 10:21:42 +10:00 · f36bba6406
commit f36bba6406
parent 674c583881
19 changed files with 27 additions and 56 deletions
--- 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">
--- 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;
--- 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">
--- 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;
--- 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">
--- 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
--- 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"
--- 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;
--- 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}}
--- 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) {
--- 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">
--- 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) {
--- 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">
--- 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();
    }

--- 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()"
--- 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;

--- 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": {
--- 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"
  },
--- 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 + '_'];