Skip to content

DEXW-1623: Add selecting account from Ledger by id #1641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jahsus-waves merged 3 commits into from
Oct 9, 2019
Merged

DEXW-1623: Add selecting account from Ledger by id #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fadf234
DEXW-1623: Add selecting account from Ledger by id
Sep 11, 2019
efe4f5c
DEXW-1623: Fix race id vs selectedUser.id
Oct 4, 2019
616d42f
DEXW-1623: Fix avatar's className
Oct 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/modules/app/less/app.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ fieldset {
}

.get-started-checkbox-save {
margin: 20px 0;
margin: 10px 0;
}

@media screen and (min-width: 480px) {
Expand Down
4 changes: 4 additions & 0 deletions src/modules/app/services/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@
return this.currentUser ? this.currentUser.address : null;
}

get id() {
return this.currentUser ? this.currentUser.id : null;
}

get name() {
return this.currentUser ? this.currentUser.name : null;
}
Expand Down
172 changes: 140 additions & 32 deletions src/modules/ledger/controllers/LedgerCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

const USERS_COUNT = 5;
const PRELOAD_USERS_COUNT = 5;
const MAX_USER_COUNT = 2147483647;

/**
* @param {typeof Base} Base
Expand Down Expand Up @@ -35,10 +36,6 @@
* @type {boolean}
*/
this.error = false;
/**
* @type {Array}
*/
this.users = [];
/**
* @type {Array}
*/
Expand All @@ -50,7 +47,7 @@
/**
* @type {number}
*/
this.currentStep = 0;
this.offset = 0;
/**
* @type {boolean}
*/
Expand All @@ -75,6 +72,10 @@
* @type {boolean}
*/
this.saveUserData = true;
/**
* @type {string}
*/
this.id = '';
/**
* @type {string}
*/
Expand All @@ -84,6 +85,11 @@
* @private
*/
this._runLedgerCommand = '';
/**
* @type {Object}
* @private
*/
this._users = {};
/**
* @type {Array}
* @private
Expand Down Expand Up @@ -123,27 +129,31 @@
}

/**
* @param count
* @return {void}
* @param {number} count
* @return {Promise}
*/
getUsers(count) {
this._runLedgerCommand = 'getUsers';
this.loading = true;
this.error = false;
const start = this.users.length;

const countUsers = (count || USERS_COUNT) - 1;
const promise = utils.timeoutPromise(this.adapter.getUserList(start, countUsers), 25000);
const promise = utils.timeoutPromise(this.adapter.getUserList(this.offset, countUsers), 25000);

const modalPromise = this.isInit ?
Promise.resolve() :
modalManager.showLoginByDevice(promise, this.adapter.type);

Promise.all([promise, modalPromise])
return Promise.all([promise, modalPromise])
.then(([users]) => {
this.isInit = true;
this.users = [...this.users, ...users];
this.loading = false;
this.error = false;

(users || []).forEach(curUser => {
this._users[curUser.id] = curUser;
});

this.showVisibleUsers();
this.selectUser();
$scope.$digest();
Expand All @@ -152,6 +162,12 @@
const error = { ...err, count };
this.loading = false;
this.error = error;

if (err instanceof RangeError) {
this.offset = 0;
this.id = '';
}

$scope.$digest();
throw error;
});
Expand All @@ -177,10 +193,8 @@
return null;
}

if (!user && !this.selectedUser && this.users.length) {
this.selectedUser = this.users[0];
// } else if (this.selectedUser === user) {
// this.selectedUser = null;
if (!user && !this.selectedUser && this._users[0]) {
this.selectedUser = this._users[0];
} else if (user) {
this.selectedUser = user;
}
Expand All @@ -196,9 +210,19 @@
if (this.selectDefault || this.disabledLeft) {
return;
}
this.currentStep--;
this.currentStep = this.currentStep >= 0 ? this.currentStep : 0;
this.showVisibleUsers();

this.offset = this._normalizeOffset(this.offset - USERS_COUNT);

if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) {
this.showVisibleUsers();
} else {
if (this.loading) {
return;
}

this.getUsers();
}

this._calculateDisabled();
}

Expand All @@ -210,25 +234,32 @@
return;
}

if (this.users.length <= this.currentStep + USERS_COUNT) {
this.offset = this._normalizeOffset(this.offset + USERS_COUNT);

if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) {
this.showVisibleUsers();
} else {
if (this.loading) {
return;
}
this.currentStep++;

this.getUsers();
this._calculateDisabled();
} else {
this.currentStep++;
this.showVisibleUsers();
this._calculateDisabled();
}

this._calculateDisabled();
}

/**
* {void}
*/
showVisibleUsers() {
this.visibleUsers = this.users.slice(this.currentStep, this.currentStep + USERS_COUNT);
const tmp = [];

for (let i = this.offset; i < this.offset + USERS_COUNT; i++) {
tmp.push(this._users[i]);
}

this.visibleUsers = tmp;
}

/**
Expand Down Expand Up @@ -262,18 +293,63 @@
return index !== 0 && this.selectDefault;
}

/**
* @public
*/
onChangeId() {
let id = parseInt(this.selectDefault ? this.selectedUser.id : this.id, 10);

if (isNaN(id) || id < 0) {
id = 0;
}

if (id > MAX_USER_COUNT) {
id = MAX_USER_COUNT;
}

this.id = String(id);

this.offset = this._normalizeOffset(id - Math.floor(USERS_COUNT / 2));

if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) {
this.showVisibleUsers();
this.selectUser(this._users[id]);
} else {
this.getUsers().then(() => {
this.selectUser(this._users[id]);
});
}
}

_calculateDisabled(disable) {
// const limitRight = this.users.length < this.currentStep + USERS_COUNT + 1;
this.disabledLogin = disable || this.loading || !this.selectedUser;
this.disabledRight = disable || this.selectDefault || this.loading;
this.disabledLeft = disable || this.selectDefault || this.loading || this.currentStep === 0;
this.disabledLogin = (
disable ||
this.loading ||
!this.selectedUser
);

this.disabledRight = (
disable ||
this.selectDefault ||
this.loading ||
this.offset === MAX_USER_COUNT - (USERS_COUNT - 1)
);

this.disabledLeft = (
disable ||
this.selectDefault ||
this.loading ||
this.offset === 0
);
}

_onChangeSelectDefault() {
if (this.selectDefault) {
this.currentStep = 0;
this.selectedUser = this.users[0];
this.offset = 0;
this.selectedUser = this._users[0];
this.id = this.selectedUser.id;
}

this._calculateDisabled();
this.showVisibleUsers();
}
Expand All @@ -282,6 +358,7 @@
* @private
*/
_onSelectUser() {
this.id = this.selectedUser.id;
this.userExisted =
this._usersInStorage.find(user => user.address === this.selectedUser.address) ||
null;
Expand All @@ -300,6 +377,37 @@
this.importForm.userName.$setValidity('isUnique', !isUnique);
}

/**
* @private
* @param {number} from
* @param {number} to
*/
_hasUsersInCache(from, to) {
for (let i = from; i <= to; i++) {
if (!this._users[i]) {
return false;
}
}

return true;
}

/**
* @private
* @param {number} offset
*/
_normalizeOffset(offset) {
if (offset > MAX_USER_COUNT - (USERS_COUNT - 1)) {
return MAX_USER_COUNT - (USERS_COUNT - 1);
}

if (offset < 0) {
return 0;
}

return offset;
}

}

return new LedgerCtrl();
Expand Down
Loading