feat: display beta warning on desktop

This commit is contained in:
Baptiste Grob
2020-10-20 16:53:49 +02:00
parent a5860ff293
commit ee563cd09b
9 changed files with 119 additions and 29 deletions

View File

@@ -34,7 +34,14 @@
ng-if='ctrl.roomShowState[room.uuid]',
on-dismiss='ctrl.onRoomDismiss(room)',
application='ctrl.application'
)
)
.sk-app-bar-item.border(ng-if="ctrl.state.showBetaWarning")
.sk-app-bar-item(ng-if="ctrl.state.showBetaWarning")
a.no-decoration.sk-label.title.uppercase(
href='https://github.com/standardnotes/forum/issues/1114',
rel='noopener',
target='_blank'
) You are using a beta version of the app
.center
.sk-app-bar-item(ng-if='ctrl.arbitraryStatusMessage')
.sk-app-bar-item-column
@@ -42,7 +49,7 @@
.right
.sk-app-bar-item(
ng-click='ctrl.openSecurityUpdate()',
ng-if='ctrl.state.dataUpgradeAvailable'
ng-if='ctrl.state.dataUpgradeAvailable && ctrl.state.showDataUpgrade'
)
span.success.sk-label Encryption upgrade available.
.sk-app-bar-item(

View File

@@ -27,6 +27,7 @@ import {
} from '@/strings';
import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
import { confirmDialog } from '@/services/alertService';
import { autorun, IReactionDisposer } from 'mobx';
/**
* Disable before production release.
@@ -51,7 +52,9 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
hasPasscode: boolean;
dataUpgradeAvailable: boolean;
dockShortcuts: DockShortcut[];
hasAccountSwitcher: boolean
hasAccountSwitcher: boolean;
showBetaWarning: boolean;
showDataUpgrade: boolean;
}> {
private $rootScope: ng.IRootScopeService
private rooms: SNComponent[] = []
@@ -76,6 +79,7 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
private observerRemovers: Array<() => void> = [];
private completedInitialSync = false;
private showingDownloadStatus = false;
private removeBetaWarningListener?: IReactionDisposer;
/* @ngInject */
constructor(
@@ -103,6 +107,7 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
this.rootScopeListener2 = undefined;
(this.closeAccountMenu as any) = undefined;
(this.toggleSyncResolutionMenu as any) = undefined;
this.removeBetaWarningListener?.();
super.deinit();
}
@@ -114,6 +119,13 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
});
});
this.loadAccountSwitcherState();
this.removeBetaWarningListener = autorun(() => {
const showBetaWarning = this.appState.showBetaWarning;
this.setState({
showBetaWarning: showBetaWarning,
showDataUpgrade: !showBetaWarning
});
});
}
loadAccountSwitcherState() {
@@ -133,7 +145,9 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
hasPasscode: false,
dockShortcuts: [],
descriptors: this.mainApplicationGroup.getDescriptors(),
hasAccountSwitcher: false
hasAccountSwitcher: false,
showBetaWarning: false,
showDataUpgrade: false,
};
}