lychiyu/frequi_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/frequi.git synced 2024-11-23 11:35:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve sync behaviour

Browse Source
This commit is contained in:
Matthias 2022-04-28 06:46:22 +02:00
parent b477a9dddd
commit 43676179dc
4 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/apiService.ts
View File

@ -28,7 +28,7 @@ export function useApi(userService: UserService, botId: string) {
(err) => { (err) => {
// console.log(err); // console.log(err);
if (err.response && err.response.status === 401) { if (err.response && err.response.status === 401) {
console.log('Dispatching refresh_token...'); console.log('Fetching refresh_token...');
return userService return userService
.refreshToken() .refreshToken()
.then((token) => { .then((token) => {

48
src/stores/ftbot.ts
View File

@ -184,17 +184,13 @@ export function createBotSubStore(botId: string, botName: string) {
rename(name: string) { rename(name: string) {
userService.renameBot(name); userService.renameBot(name);
}, },
setRefreshRequired(refreshRequired: boolean) {
this.refreshRequired = refreshRequired;
},
setAutoRefresh(newRefreshValue) { setAutoRefresh(newRefreshValue) {
this.autoRefresh = newRefreshValue; this.autoRefresh = newRefreshValue;
// TODO: Investigate this - // TODO: Investigate this -
// this ONLY works if ReloadControl is only visible once,otherwise it triggers twice // this ONLY works if ReloadControl is only visible once,otherwise it triggers twice
if (newRefreshValue) { if (newRefreshValue) {
// dispatch('startRefresh', true); this.refreshFrequent();
} else { this.refreshSlow(true);
// dispatch('stopRefresh');
} }
userService.setAutoRefresh(newRefreshValue); userService.setAutoRefresh(newRefreshValue);
}, },
@ -274,17 +270,17 @@ export function createBotSubStore(botId: string, botName: string) {
trades = trades.concat(result.trades); trades = trades.concat(result.trades);
totalTrades = res.data.total_trades; totalTrades = res.data.total_trades;
} while (trades.length !== totalTrades); } while (trades.length !== totalTrades);
const tradesCount = trades.length;
// Add botId to all trades
trades = trades.map((t) => ({
...t,
botId,
botName,
botTradeId: `${botId}__${t.trade_id}`,
}));
this.trades = trades;
this.tradeCount = tradesCount;
} }
const tradesCount = trades.length;
// Add botId to all trades
trades = trades.map((t) => ({
...t,
botId,
botName,
botTradeId: `${botId}__${t.trade_id}`,
}));
this.trades = trades;
this.tradeCount = tradesCount;
return Promise.resolve(); return Promise.resolve();
} catch (error) { } catch (error) {
@ -309,18 +305,16 @@ export function createBotSubStore(botId: string, botName: string) {
) { ) {
// Open trades changed, so we should refresh now. // Open trades changed, so we should refresh now.
this.refreshRequired = true; this.refreshRequired = true;
// dispatch('refreshSlow', null, { root: true }); this.refreshSlow(false);
const openTrades = result.data.map((t) => ({
...t,
botId,
botName,
botTradeId: `${botId}__${t.trade_id}`,
}));
this.openTrades = openTrades;
} else {
this.openTrades = [];
} }
const openTrades = result.data.map((t) => ({
...t,
botId,
botName,
botTradeId: `${botId}__${t.trade_id}`,
}));
this.openTrades = openTrades;
}) })
.catch(console.error); .catch(console.error);
}, },

2
src/stores/ftbotwrapper.ts
View File

@ -172,7 +172,6 @@ export const useBotStore = defineStore('wrapper', {
delete this.availableBots[botId]; delete this.availableBots[botId];
this.botStores = { ...this.botStores }; this.botStores = { ...this.botStores };
this.availableBots = { ...this.availableBots }; this.availableBots = { ...this.availableBots };
// commit('removeBot', botId);
} else { } else {
console.warn(`bot ${botId} not found! could not remove`); console.warn(`bot ${botId} not found! could not remove`);
} }
@ -314,4 +313,5 @@ export function initBots() {
botStore.addBot(v); botStore.addBot(v);
}); });
botStore.selectFirstBot(); botStore.selectFirstBot();
botStore.startRefresh();
} }

1
src/stores/settings.ts
View File

@ -60,7 +60,6 @@ export const useSettingsStore = defineStore('uiSettings', {
const result = await axios.get<UiVersion>('/ui_version'); const result = await axios.get<UiVersion>('/ui_version');
const { version } = result.data; const { version } = result.data;
this.uiVersion = version; this.uiVersion = version;
// commit('setUIVersion', version);
} catch (error) { } catch (error) {
// //
} }