fix removing items

This commit is contained in:
marlon-erler
2024-07-20 03:34:54 +02:00
parent 58348f78dd
commit bc34e4d7fe
7 changed files with 101 additions and 12 deletions
+48 -5
View File
@@ -186,7 +186,8 @@
// src/View/translations.ts // src/View/translations.ts
var englishTranslations = { var englishTranslations = {
general: { general: {
closeButton: "close" closeButtonAudioLabel: "close",
deleteItemButtonAudioLabel: "delete item"
}, },
regional: { regional: {
weekdays: { weekdays: {
@@ -247,15 +248,42 @@
var language = navigator.language.substring(0, 2); var language = navigator.language.substring(0, 2);
var translations = allTranslations[language] || allTranslations.en; var translations = allTranslations[language] || allTranslations.en;
// src/View/Components/deletableListItem.tsx
function DeletableListItem(text, ondelete) {
return /* @__PURE__ */ createElement("div", { class: "tile flex-row justify-apart align-center padding-0" }, /* @__PURE__ */ createElement("span", { class: "padding-h" }, text), /* @__PURE__ */ createElement(
"button",
{
class: "danger",
"aria-label": translations.general.deleteItemButtonAudioLabel,
"on:click": ondelete
},
/* @__PURE__ */ createElement("span", { class: "icon" }, "delete")
));
}
// src/View/Modals/connectionModal.tsx // src/View/Modals/connectionModal.tsx
function ConnectionModal(connectionViewModel2) { function ConnectionModal(connectionViewModel2) {
const previousAddressConverter = (address) => {
return DeletableListItem(address, () => {
connectionViewModel2.removePreviousAddress(address);
});
};
return /* @__PURE__ */ createElement( return /* @__PURE__ */ createElement(
"div", "div",
{ {
class: "modal", class: "modal",
"toggle:open": connectionViewModel2.isShowingConnectionModal "toggle:open": connectionViewModel2.isShowingConnectionModal
}, },
/* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translations.connectionModal.connectionModalHeadline)), /* @__PURE__ */ createElement("button", { "on:click": connectionViewModel2.hideConnectionModal }, translations.general.closeButton, /* @__PURE__ */ createElement("span", { class: "icon" }, "close"))) /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translations.connectionModal.connectionModalHeadline), /* @__PURE__ */ createElement(
"div",
{
class: "flex-column gap",
"children:append": [
connectionViewModel2.previousAddresses,
previousAddressConverter
]
}
)), /* @__PURE__ */ createElement("button", { "on:click": connectionViewModel2.hideConnectionModal }, translations.general.closeButtonAudioLabel, /* @__PURE__ */ createElement("span", { class: "icon" }, "close")))
); );
} }
@@ -287,6 +315,7 @@
remove = (pathComponents) => { remove = (pathComponents) => {
const key = _StorageModel.pathComponentsToKey(...pathComponents); const key = _StorageModel.pathComponentsToKey(...pathComponents);
localStorage.removeItem(key); localStorage.removeItem(key);
this.initializeTree();
}; };
list = (pathComponents) => { list = (pathComponents) => {
let currentParent = this.storageEntryTree; let currentParent = this.storageEntryTree;
@@ -309,12 +338,16 @@
}; };
// init // init
constructor() { constructor() {
this.initializeTree();
}
// utility
initializeTree = () => {
this.storageEntryTree = {};
for (const key of Object.keys(localStorage)) { for (const key of Object.keys(localStorage)) {
const components = _StorageModel.keyToPathComponents(key); const components = _StorageModel.keyToPathComponents(key);
this.updateTree(...components); this.updateTree(...components);
} }
} };
// utility
updateTree = (...pathComponents) => { updateTree = (...pathComponents) => {
let currentParent = this.storageEntryTree; let currentParent = this.storageEntryTree;
for (const pathPart of pathComponents) { for (const pathPart of pathComponents) {
@@ -569,6 +602,10 @@
disconnect = () => { disconnect = () => {
this.connectionModel.disconnect(); this.connectionModel.disconnect();
}; };
removePreviousAddress = (address) => {
this.connectionModel.removeAddress(address);
this.updatePreviousAddresses();
};
// view methods // view methods
showConnectionModal = () => { showConnectionModal = () => {
this.isShowingConnectionModal.value = true; this.isShowingConnectionModal.value = true;
@@ -636,7 +673,7 @@
"aria-label": translations.homePage.manageConnectionsAudioLabel, "aria-label": translations.homePage.manageConnectionsAudioLabel,
"on:click": connectionViewModel2.showConnectionModal "on:click": connectionViewModel2.showConnectionModal
}, },
/* @__PURE__ */ createElement("span", { class: "icon" }, "build") /* @__PURE__ */ createElement("span", { class: "icon" }, "edit")
), /* @__PURE__ */ createElement( ), /* @__PURE__ */ createElement(
"button", "button",
{ {
@@ -754,7 +791,13 @@
}; };
// src/index.tsx // src/index.tsx
localStorage.clear();
var storageModel = new StorageModel(); var storageModel = new StorageModel();
storageModel.store(["a", "b", "b1"], "");
storageModel.store(["a", "b", "b2"], "");
console.log(JSON.stringify(storageModel.storageEntryTree, null, 4));
storageModel.remove(["a", "b", "b2"]);
console.log(JSON.stringify(storageModel.storageEntryTree, null, 4));
var settingsViewModel = new SettingsViewModel(storageModel); var settingsViewModel = new SettingsViewModel(storageModel);
var connectionViewModel = new ConnectionViewModel(storageModel); var connectionViewModel = new ConnectionViewModel(storageModel);
document.querySelector("main").append( document.querySelector("main").append(
+9 -3
View File
@@ -24,6 +24,7 @@ export default class StorageModel {
remove = (pathComponents: string[]): void => { remove = (pathComponents: string[]): void => {
const key: string = StorageModel.pathComponentsToKey(...pathComponents); const key: string = StorageModel.pathComponentsToKey(...pathComponents);
localStorage.removeItem(key); localStorage.removeItem(key);
this.initializeTree();
}; };
list = (pathComponents: string[]): string[] => { list = (pathComponents: string[]): string[] => {
@@ -52,14 +53,19 @@ export default class StorageModel {
// init // init
constructor() { constructor() {
this.initializeTree();
}
// utility
initializeTree = (): void => {
this.storageEntryTree = {};
for (const key of Object.keys(localStorage)) { for (const key of Object.keys(localStorage)) {
const components: string[] = StorageModel.keyToPathComponents(key); const components: string[] = StorageModel.keyToPathComponents(key);
this.updateTree(...components); this.updateTree(...components);
} }
} };
// utility updateTree = (...pathComponents: string[]): void => {
updateTree = (...pathComponents: string[]) => {
let currentParent: StorageEntry = this.storageEntryTree; let currentParent: StorageEntry = this.storageEntryTree;
for (const pathPart of pathComponents) { for (const pathPart of pathComponents) {
if (!currentParent[pathPart]) { if (!currentParent[pathPart]) {
+19
View File
@@ -0,0 +1,19 @@
import * as React from "bloatless-react";
import { translations } from "../translations";
export function DeletableListItem(text: string, ondelete: () => void) {
return (
<div class="tile flex-row justify-apart align-center padding-0">
<span class="padding-h">{text}</span>
<button
class="danger"
aria-label={translations.general.deleteItemButtonAudioLabel}
on:click={ondelete}
>
<span class="icon">delete</span>
</button>
</div>
);
}
+17 -2
View File
@@ -1,9 +1,18 @@
import * as React from "bloatless-react"; import * as React from "bloatless-react";
import ConnectionViewModel from "../../ViewModel/connectionViewModel"; import ConnectionViewModel from "../../ViewModel/connectionViewModel";
import { DeletableListItem } from "../Components/deletableListItem";
import { translations } from "../translations"; import { translations } from "../translations";
export function ConnectionModal(connectionViewModel: ConnectionViewModel) { export function ConnectionModal(connectionViewModel: ConnectionViewModel) {
const previousAddressConverter: React.StateItemConverter<string> = (
address: string
) => {
return DeletableListItem(address, () => {
connectionViewModel.removePreviousAddress(address);
});
};
return ( return (
<div <div
class="modal" class="modal"
@@ -13,10 +22,16 @@ export function ConnectionModal(connectionViewModel: ConnectionViewModel) {
<main> <main>
<h2>{translations.connectionModal.connectionModalHeadline}</h2> <h2>{translations.connectionModal.connectionModalHeadline}</h2>
<div
class="flex-column gap"
children:append={[
connectionViewModel.previousAddresses,
previousAddressConverter,
]}
></div>
</main> </main>
<button on:click={connectionViewModel.hideConnectionModal}> <button on:click={connectionViewModel.hideConnectionModal}>
{translations.general.closeButton} {translations.general.closeButtonAudioLabel}
<span class="icon">close</span> <span class="icon">close</span>
</button> </button>
</div> </div>
+1 -1
View File
@@ -52,7 +52,7 @@ export function HomePage(
aria-label={translations.homePage.manageConnectionsAudioLabel} aria-label={translations.homePage.manageConnectionsAudioLabel}
on:click={connectionViewModel.showConnectionModal} on:click={connectionViewModel.showConnectionModal}
> >
<span class="icon">build</span> <span class="icon">edit</span>
</button> </button>
<button <button
class="primary flex justify-center" class="primary flex justify-center"
+2 -1
View File
@@ -1,6 +1,7 @@
const englishTranslations = { const englishTranslations = {
general: { general: {
closeButton: "close", closeButtonAudioLabel: "close",
deleteItemButtonAudioLabel: "delete item",
}, },
regional: { regional: {
+5
View File
@@ -50,6 +50,11 @@ export default class ConnectionViewModel {
this.connectionModel.disconnect(); this.connectionModel.disconnect();
}; };
removePreviousAddress = (address: string): void => {
this.connectionModel.removeAddress(address);
this.updatePreviousAddresses();
}
// view methods // view methods
showConnectionModal = (): void => { showConnectionModal = (): void => {
this.isShowingConnectionModal.value = true; this.isShowingConnectionModal.value = true;