sij/env.esq
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update client view when clicking "change client" link

Browse source 
it would just stay what it was before, so it was hard/impossible
to switch between web and native.
This commit is contained in:
Bruno Windels 2021-02-01 16:00:46 +01:00
parent 1c520a68a3
commit 53d1018340
1 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/open/ClientViewModel.js
View file

@ -35,19 +35,21 @@ export class ClientViewModel extends ViewModel {
this._pickClient = pickClient; this._pickClient = pickClient;
// to provide "choose other client" button after calling pick() // to provide "choose other client" button after calling pick()
this._clientListViewModel = null; this._clientListViewModel = null;
this._update();
}
const matchingPlatforms = getMatchingPlatforms(client, this.platforms); _update() {
const nativePlatform = matchingPlatforms.find(p => !isWebPlatform(p)); const matchingPlatforms = getMatchingPlatforms(this._client, this.platforms);
const webPlatform = matchingPlatforms.find(p => isWebPlatform(p)); const webPlatform = matchingPlatforms.find(p => isWebPlatform(p));
this._nativePlatform = matchingPlatforms.find(p => !isWebPlatform(p));
this._proposedPlatform = this.preferences.platform || this._nativePlatform || webPlatform;
this._proposedPlatform = this.preferences.platform || nativePlatform || webPlatform; this.actions = this._createActions(this._client, this._link, this._nativePlatform, webPlatform);
this._nativePlatform = nativePlatform || this._proposedPlatform; this._clientCanIntercept = !!(this._nativePlatform && this._client.canInterceptMatrixToLinks(this._nativePlatform));
this.actions = this._createActions(client, link, nativePlatform, webPlatform);
this._clientCanIntercept = !!(nativePlatform && client.canInterceptMatrixToLinks(nativePlatform));
this._showOpen = this.deepLink && !this._clientCanIntercept; this._showOpen = this.deepLink && !this._clientCanIntercept;
} }
// these are only shown in the install stage
_createActions(client, link, nativePlatform, webPlatform) { _createActions(client, link, nativePlatform, webPlatform) {
let actions = []; let actions = [];
if (nativePlatform) { if (nativePlatform) {
@ -117,7 +119,8 @@ export class ClientViewModel extends ViewModel {
} }
get showDeepLinkInInstall() { get showDeepLinkInInstall() {
return this._clientCanIntercept && this.deepLink; // we can assume this._nativePlatform as this._clientCanIntercept already checks it
return this._clientCanIntercept && !!this._client.getDeepLink(this._nativePlatform, this._link);
} }
get availableOnPlatformNames() { get availableOnPlatformNames() {
@ -142,14 +145,20 @@ export class ClientViewModel extends ViewModel {
return textPlatforms; return textPlatforms;
} }
get _deepLinkPlatform() {
// in install stage, always show the native link in the small "open it here" link, independent of preference.
return this._showOpen ? this._proposedPlatform : this._nativePlatform;
}
// both used for big "Continue" button in open stage,
// and for small "open it here" link in the install stage.
get deepLink() { get deepLink() {
const platform = this.showBack ? this._proposedPlatform : this._nativePlatform; return this._client.getDeepLink(this._deepLinkPlatform, this._link);
return this._client.getDeepLink(platform, this._link);
} }
deepLinkActivated() { deepLinkActivated() {
this._pickClient(this._client); this._pickClient(this._client);
this.preferences.setClient(this._client.id, this._proposedPlatform); this.preferences.setClient(this._client.id, this._deepLinkPlatform);
if (this._showOpen) { if (this._showOpen) {
this._showOpen = false; this._showOpen = false;
this.emitChange(); this.emitChange();
@ -161,8 +170,8 @@ export class ClientViewModel extends ViewModel {
this.emitChange(); this.emitChange();
} }
// whether or not we are only showing this client (in open or install stage)
get showBack() { get showBack() {
// if we're not only showing this client, don't show back (see pick())
return !!this._clientListViewModel; return !!this._clientListViewModel;
} }
@ -170,6 +179,11 @@ export class ClientViewModel extends ViewModel {
if (this._clientListViewModel) { if (this._clientListViewModel) {
const vm = this._clientListViewModel; const vm = this._clientListViewModel;
this._clientListViewModel = null; this._clientListViewModel = null;
// clear the client preference so we default back to to native link if any
// in the list with all clients, and also if we refresh, we get the list with
// all clients rather than having our "change client" click reverted.
this.preferences.setClient(undefined, undefined);
this._update();
this.emitChange(); this.emitChange();
vm.showAll(); vm.showAll();
} }