From 58348f78ddc393e9a0cc12be3ca760cd33751d04 Mon Sep 17 00:00:00 2001 From: marlon-erler Date: Sat, 20 Jul 2024 02:59:40 +0200 Subject: [PATCH] update previous addresses on startup --- dist/index.js | 13 ++++++++----- src/Model/connectionModel.ts | 2 +- src/ViewModel/connectionViewModel.tsx | 11 ++++++++--- src/index.tsx | 1 - 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dist/index.js b/dist/index.js index b326b2c0..43fe2585 100644 --- a/dist/index.js +++ b/dist/index.js @@ -512,10 +512,10 @@ const addressPath = this.getAddressPath(address); this.storageModel.remove(addressPath); }; - getAddresses = () => { + get addresses() { const dirPath = storageKeys.previousAddresses; return this.storageModel.list(dirPath); - }; + } // setup constructor(configuration) { this.udn = new UDNFrontend(); @@ -558,8 +558,7 @@ if (this.connectionModel.address) { this.serverAddressInput.value = this.connectionModel.address; } - this.previousAddresses.clear(); - this.previousAddresses.add(...this.connectionModel.getAddresses()); + this.updatePreviousAddresses(); }; messageHandler = (data) => { }; @@ -577,6 +576,10 @@ hideConnectionModal = () => { this.isShowingConnectionModal.value = false; }; + updatePreviousAddresses = () => { + this.previousAddresses.clear(); + this.previousAddresses.add(...this.connectionModel.addresses); + }; // init constructor(storageModel2) { const connectionModel = new ConnectionModel({ @@ -585,6 +588,7 @@ messageHandler: this.messageHandler }); this.connectionModel = connectionModel; + this.updatePreviousAddresses(); } }; @@ -751,7 +755,6 @@ // src/index.tsx var storageModel = new StorageModel(); - console.log(JSON.stringify(storageModel.storageEntryTree, null, 4)); var settingsViewModel = new SettingsViewModel(storageModel); var connectionViewModel = new ConnectionViewModel(storageModel); document.querySelector("main").append( diff --git a/src/Model/connectionModel.ts b/src/Model/connectionModel.ts index a11b7d29..54783617 100644 --- a/src/Model/connectionModel.ts +++ b/src/Model/connectionModel.ts @@ -59,7 +59,7 @@ export default class ConnectionModel { this.storageModel.remove(addressPath); }; - getAddresses = (): string[] => { + get addresses(): string[] { const dirPath = storageKeys.previousAddresses; return this.storageModel.list(dirPath); }; diff --git a/src/ViewModel/connectionViewModel.tsx b/src/ViewModel/connectionViewModel.tsx index 65dc2f85..fd0c5182 100644 --- a/src/ViewModel/connectionViewModel.tsx +++ b/src/ViewModel/connectionViewModel.tsx @@ -36,9 +36,7 @@ export default class ConnectionViewModel { if (this.connectionModel.address) { this.serverAddressInput.value = this.connectionModel.address; } - - this.previousAddresses.clear(); - this.previousAddresses.add(...this.connectionModel.getAddresses()); + this.updatePreviousAddresses(); }; messageHandler = (data: Message): void => {}; @@ -61,6 +59,11 @@ export default class ConnectionViewModel { this.isShowingConnectionModal.value = false; }; + updatePreviousAddresses = (): void => { + this.previousAddresses.clear(); + this.previousAddresses.add(...this.connectionModel.addresses); + } + // init constructor(storageModel: StorageModel) { const connectionModel = new ConnectionModel({ @@ -69,5 +72,7 @@ export default class ConnectionViewModel { messageHandler: this.messageHandler, }); this.connectionModel = connectionModel; + + this.updatePreviousAddresses(); } } diff --git a/src/index.tsx b/src/index.tsx index 1b3c9123..8e81b8b6 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -6,7 +6,6 @@ import StorageModel from "./Model/storageModel"; // models const storageModel = new StorageModel(); -console.log(JSON.stringify(storageModel.storageEntryTree, null, 4)); // viewModels const settingsViewModel = new SettingsViewModel(storageModel);