From 9d2f8e27c5abcbce4cc76a7c10750d4ab8d65e3e Mon Sep 17 00:00:00 2001
From: "garionion (aider)" <git@entr0py.de>
Date: Fri, 28 Feb 2025 22:03:18 +0100
Subject: [PATCH] feat: Add name field to storage space and create dedicated
 storage page

---
 api/storage.go                          |  10 ++
 database/sqlite/query.sql               |   8 +-
 web/src/components/AppHeader.vue        | 119 ++-----------
 web/src/components/StorageHierarchy.vue |   2 +-
 web/src/pages/storage.vue               | 224 ++++++++++++++++++++++++
 web/src/stores/storage.ts               |   7 +-
 6 files changed, 255 insertions(+), 115 deletions(-)
 create mode 100644 web/src/pages/storage.vue

diff --git a/api/storage.go b/api/storage.go
index 82f138c..4b28e33 100644
--- a/api/storage.go
+++ b/api/storage.go
@@ -43,6 +43,7 @@ func (h *StorageHandler) GetStorageSpaces(c echo.Context) error {
 			"id":       space.ID,
 			"parent":   space.Parent,
 			"location": space.Location,
+			"name":     space.Name,
 		}
 	}
 
@@ -191,6 +192,7 @@ func (h *StorageHandler) CreateStorageSpace(c echo.Context) error {
 	
 	// Parse request body
 	type StorageSpaceRequest struct {
+		Name     string `json:"name"`
 		Location string `json:"location"`
 		Parent   *struct {
 			Valid bool  `json:"valid"`
@@ -234,10 +236,18 @@ func (h *StorageHandler) CreateStorageSpace(c echo.Context) error {
 		location.String = req.Location
 	}
 	
+	// Convert name to sql.NullString
+	var name sql.NullString
+	if req.Name != "" {
+		name.Valid = true
+		name.String = req.Name
+	}
+	
 	// Create storage space
 	err := h.db.CreateStorageSpace(ctx, db.CreateStorageSpaceParams{
 		Parent:   parent,
 		Location: location,
+		Name:     name,
 	})
 	
 	if err != nil {
diff --git a/database/sqlite/query.sql b/database/sqlite/query.sql
index dde6bff..b936f83 100644
--- a/database/sqlite/query.sql
+++ b/database/sqlite/query.sql
@@ -56,17 +56,17 @@ INSERT INTO pictures (user_id, storagespace_id, object_id, event_id, check_in_id
 VALUES (?, ?, ?, ?, ?, ?, ?, ?);
 
 -- name: GetAllStorageSpaces :many
-SELECT id, parent, location FROM storagespace;
+SELECT id, parent, location, name FROM storagespace;
 
 -- name: GetStorageSpaceByID :one
-SELECT id, parent, location FROM storagespace WHERE id = ?;
+SELECT id, parent, location, name FROM storagespace WHERE id = ?;
 
 -- name: GetChildStorageSpaces :many
-SELECT id, parent, location FROM storagespace WHERE parent = ?;
+SELECT id, parent, location, name FROM storagespace WHERE parent = ?;
 
 -- name: GetObjectsByStorageID :many
 SELECT id, storagespace_id, name, description, serialnumber, created 
 FROM objects WHERE storagespace_id = ?;
 
 -- name: CreateStorageSpace :exec
-INSERT INTO storagespace (parent, location) VALUES (?, ?);
+INSERT INTO storagespace (parent, location, name) VALUES (?, ?, ?);
diff --git a/web/src/components/AppHeader.vue b/web/src/components/AppHeader.vue
index f3e6476..7c80e70 100644
--- a/web/src/components/AppHeader.vue
+++ b/web/src/components/AppHeader.vue
@@ -1,117 +1,20 @@
 <template>
   <v-app-bar color="primary" app>
     <v-app-bar-title>Inventory Manager</v-app-bar-title>
-    <v-spacer></v-spacer>
-    <v-btn
-      prepend-icon="mdi-plus"
-      @click="openAddStorageDialog"
-    >
-      Add Storage Space
-    </v-btn>
     
-    <!-- Dialog for adding new storage space -->
-    <v-dialog v-model="showDialog" max-width="500px">
-      <v-card>
-        <v-card-title>Add New Storage Space</v-card-title>
-        <v-card-text>
-          <v-form @submit.prevent="addStorageSpace">
-            <v-text-field
-              v-model="newStorage.location"
-              label="Location"
-              required
-              :error-messages="locationError"
-            ></v-text-field>
-            
-            <v-select
-              v-model="newStorage.parentId"
-              :items="storageSpaces"
-              item-title="location"
-              item-value="id"
-              label="Parent Storage (optional)"
-              clearable
-            >
-              <template v-slot:item="{ item, props }">
-                <v-list-item v-bind="props" :title="item.raw.location || `Storage #${item.raw.id}`"></v-list-item>
-              </template>
-            </v-select>
-            
-            <v-alert
-              v-if="error"
-              type="error"
-              variant="tonal"
-              class="mt-3"
-            >
-              {{ error }}
-            </v-alert>
-          </v-form>
-        </v-card-text>
-        <v-card-actions>
-          <v-spacer></v-spacer>
-          <v-btn color="grey" variant="text" @click="showDialog = false">Cancel</v-btn>
-          <v-btn 
-            color="primary" 
-            variant="elevated" 
-            @click="addStorageSpace"
-            :loading="loading"
-          >
-            Save
-          </v-btn>
-        </v-card-actions>
-      </v-card>
-    </v-dialog>
+    <v-tabs>
+      <v-tab to="/">Home</v-tab>
+      <v-tab to="/storage">Storage</v-tab>
+    </v-tabs>
+    
+    <v-spacer></v-spacer>
+    
+    <v-btn icon>
+      <v-icon>mdi-account</v-icon>
+    </v-btn>
   </v-app-bar>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
-import { useStorageStore } from '@/stores/storage';
-
-const storageStore = useStorageStore();
-const showDialog = ref(false);
-const loading = ref(false);
-const error = ref<string | null>(null);
-const locationError = ref<string>('');
-
-const newStorage = ref({
-  location: '',
-  parentId: null as number | null
-});
-
-const storageSpaces = computed(() => storageStore.storageSpaces);
-
-function openAddStorageDialog() {
-  // Reset form
-  newStorage.value = {
-    location: '',
-    parentId: null
-  };
-  error.value = null;
-  locationError.value = '';
-  showDialog.value = true;
-}
-
-async function addStorageSpace() {
-  // Validate
-  if (!newStorage.value.location.trim()) {
-    locationError.value = 'Location is required';
-    return;
-  }
-  
-  locationError.value = '';
-  loading.value = true;
-  error.value = null;
-  
-  try {
-    await storageStore.createStorageSpace({
-      location: newStorage.value.location,
-      parentId: newStorage.value.parentId
-    });
-    
-    showDialog.value = false;
-  } catch (err: any) {
-    error.value = err.message || 'Failed to create storage space';
-  } finally {
-    loading.value = false;
-  }
-}
+// No additional logic needed
 </script>
diff --git a/web/src/components/StorageHierarchy.vue b/web/src/components/StorageHierarchy.vue
index 1c1e53c..e6d0d31 100644
--- a/web/src/components/StorageHierarchy.vue
+++ b/web/src/components/StorageHierarchy.vue
@@ -106,7 +106,7 @@ const StorageBox = defineComponent({
       <v-expansion-panel-title>
         <div class="d-flex align-center">
           <v-icon class="mr-2">mdi-package-variant-closed</v-icon>
-          <span>{{ storage.location || \`Storage #\${storage.id}\` }}</span>
+          <span>{{ storage.name || storage.location || \`Storage #\${storage.id}\` }}</span>
           <v-chip class="ml-2" size="small" color="primary" variant="outlined">
             {{ objectsInCurrentStorage.length }} objects
           </v-chip>
diff --git a/web/src/pages/storage.vue b/web/src/pages/storage.vue
new file mode 100644
index 0000000..d14b55c
--- /dev/null
+++ b/web/src/pages/storage.vue
@@ -0,0 +1,224 @@
+<template>
+  <v-container>
+    <v-row>
+      <v-col cols="12">
+        <v-card>
+          <v-card-title class="text-h5">
+            Storage Spaces
+            <v-spacer></v-spacer>
+            <v-btn
+              color="primary"
+              prepend-icon="mdi-plus"
+              @click="openAddStorageDialog"
+            >
+              Add Storage Space
+            </v-btn>
+          </v-card-title>
+          
+          <v-card-text>
+            <v-alert
+              v-if="error"
+              type="error"
+              variant="tonal"
+              closable
+            >
+              {{ error }}
+            </v-alert>
+            
+            <div v-if="loading" class="d-flex justify-center align-center my-4">
+              <v-progress-circular indeterminate color="primary"></v-progress-circular>
+            </div>
+            
+            <v-table v-else>
+              <thead>
+                <tr>
+                  <th>ID</th>
+                  <th>Name</th>
+                  <th>Location</th>
+                  <th>Parent</th>
+                  <th>Actions</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="space in storageSpaces" :key="space.id">
+                  <td>{{ space.id }}</td>
+                  <td>{{ space.name || '-' }}</td>
+                  <td>{{ space.location || '-' }}</td>
+                  <td>
+                    <span v-if="space.parent && space.parent.valid">
+                      {{ getParentName(space.parent.int64) }}
+                    </span>
+                    <span v-else>-</span>
+                  </td>
+                  <td>
+                    <v-btn
+                      icon
+                      variant="text"
+                      size="small"
+                      :to="`/storage/${space.id}`"
+                      title="View Details"
+                    >
+                      <v-icon>mdi-eye</v-icon>
+                    </v-btn>
+                  </td>
+                </tr>
+              </tbody>
+            </v-table>
+          </v-card-text>
+        </v-card>
+      </v-col>
+    </v-row>
+    
+    <!-- Dialog for adding new storage space -->
+    <v-dialog v-model="showDialog" max-width="500px">
+      <v-card>
+        <v-card-title>Add New Storage Space</v-card-title>
+        <v-card-text>
+          <v-form @submit.prevent="addStorageSpace">
+            <v-text-field
+              v-model="newStorage.name"
+              label="Name"
+              required
+              :error-messages="nameError"
+            ></v-text-field>
+            
+            <v-text-field
+              v-model="newStorage.location"
+              label="Location"
+              required
+              :error-messages="locationError"
+            ></v-text-field>
+            
+            <v-select
+              v-model="newStorage.parentId"
+              :items="storageSpaces"
+              item-title="displayName"
+              item-value="id"
+              label="Parent Storage (optional)"
+              clearable
+            >
+              <template v-slot:item="{ item, props }">
+                <v-list-item v-bind="props" :title="item.raw.displayName"></v-list-item>
+              </template>
+            </v-select>
+            
+            <v-alert
+              v-if="error"
+              type="error"
+              variant="tonal"
+              class="mt-3"
+            >
+              {{ error }}
+            </v-alert>
+          </v-form>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer></v-spacer>
+          <v-btn color="grey" variant="text" @click="showDialog = false">Cancel</v-btn>
+          <v-btn 
+            color="primary" 
+            variant="elevated" 
+            @click="addStorageSpace"
+            :loading="loading"
+          >
+            Save
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+  </v-container>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, onMounted } from 'vue';
+import { useStorageStore } from '@/stores/storage';
+
+const storageStore = useStorageStore();
+const showDialog = ref(false);
+const loading = ref(false);
+const error = ref<string | null>(null);
+const nameError = ref<string>('');
+const locationError = ref<string>('');
+
+const newStorage = ref({
+  name: '',
+  location: '',
+  parentId: null as number | null
+});
+
+const storageSpaces = computed(() => {
+  return storageStore.storageSpaces.map(space => ({
+    ...space,
+    displayName: space.name || space.location || `Storage #${space.id}`
+  }));
+});
+
+function getParentName(parentId: number): string {
+  const parent = storageSpaces.value.find(s => s.id === parentId);
+  return parent ? (parent.name || parent.location || `Storage #${parent.id}`) : `ID: ${parentId}`;
+}
+
+function openAddStorageDialog() {
+  // Reset form
+  newStorage.value = {
+    name: '',
+    location: '',
+    parentId: null
+  };
+  error.value = null;
+  nameError.value = '';
+  locationError.value = '';
+  showDialog.value = true;
+}
+
+async function addStorageSpace() {
+  // Validate
+  let isValid = true;
+  
+  if (!newStorage.value.name.trim()) {
+    nameError.value = 'Name is required';
+    isValid = false;
+  } else {
+    nameError.value = '';
+  }
+  
+  if (!newStorage.value.location.trim()) {
+    locationError.value = 'Location is required';
+    isValid = false;
+  } else {
+    locationError.value = '';
+  }
+  
+  if (!isValid) return;
+  
+  loading.value = true;
+  error.value = null;
+  
+  try {
+    await storageStore.createStorageSpace({
+      name: newStorage.value.name,
+      location: newStorage.value.location,
+      parentId: newStorage.value.parentId
+    });
+    
+    showDialog.value = false;
+  } catch (err: any) {
+    error.value = err.message || 'Failed to create storage space';
+  } finally {
+    loading.value = false;
+  }
+}
+
+onMounted(async () => {
+  loading.value = true;
+  error.value = null;
+  
+  try {
+    await storageStore.fetchStorageSpaces();
+  } catch (err: any) {
+    error.value = err.message || 'Failed to load storage spaces';
+  } finally {
+    loading.value = false;
+  }
+});
+</script>
diff --git a/web/src/stores/storage.ts b/web/src/stores/storage.ts
index 0c75f68..c91d573 100644
--- a/web/src/stores/storage.ts
+++ b/web/src/stores/storage.ts
@@ -8,6 +8,7 @@ interface StorageSpace {
     int64: number;
   } | null;
   location: string | null;
+  name: string | null;
 }
 
 interface StorageObject {
@@ -43,7 +44,7 @@ export const useStorageStore = defineStore('storage', {
   },
   
   actions: {
-    async createStorageSpace(data: { location: string; parentId: number | null }): Promise<void> {
+    async createStorageSpace(data: { name: string; location: string; parentId: number | null }): Promise<void> {
       this.loading = true;
       this.error = null;
       
@@ -57,6 +58,7 @@ export const useStorageStore = defineStore('storage', {
             'Content-Type': 'application/json',
           },
           body: JSON.stringify({
+            name: data.name,
             location: data.location,
             parent: parentData
           }),
@@ -95,7 +97,8 @@ export const useStorageStore = defineStore('storage', {
         this.storageSpaces = data.map((space: any) => ({
           id: space.id,
           parent: space.parent,
-          location: space.location
+          location: space.location,
+          name: space.name
         }));
       } catch (error: any) {
         this.error = error.message;