-implemented soft file deletion

-implemented garbage collection
-resolved #25
-resolved #26
-resolved #24
-bug fixes

Author: aczwink

infrastructure/db.sql

@@ -108,10 +108,12 @@ DROP TABLE IF EXISTS `blobs_versions`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `blobs_versions` (
   `blobId` int(10) unsigned NOT NULL,
+  `versionBlobId` int(10) unsigned NOT NULL,
   `title` varchar(100) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
-  PRIMARY KEY (`blobId`,`title`),
-  KEY `files_versions_blobId` (`blobId`),
-  CONSTRAINT `files_versions_blobId` FOREIGN KEY (`blobId`) REFERENCES `blobs` (`id`)
+  PRIMARY KEY (`blobId`,`versionBlobId`),
+  KEY `files_versions_versionBlobId` (`versionBlobId`),
+  CONSTRAINT `files_versions_blobId` FOREIGN KEY (`blobId`) REFERENCES `blobs` (`id`),
+  CONSTRAINT `files_versions_versionBlobId` FOREIGN KEY (`versionBlobId`) REFERENCES `blobs` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -162,6 +164,39 @@ CREATE TABLE `files` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `files_deleted`
+--
+
+DROP TABLE IF EXISTS `files_deleted`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `files_deleted` (
+  `fileId` int(10) unsigned NOT NULL,
+  `deletionTime` datetime NOT NULL,
+  PRIMARY KEY (`fileId`),
+  CONSTRAINT `files_deleted_fileId` FOREIGN KEY (`fileId`) REFERENCES `files` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `files_locations`
+--
+
+DROP TABLE IF EXISTS `files_locations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `files_locations` (
+  `fileId` int(10) unsigned NOT NULL,
+  `lat` float NOT NULL,
+  `lon` float NOT NULL,
+  `countryCode` char(2) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `osmId` varchar(50) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL,
+  PRIMARY KEY (`fileId`),
+  CONSTRAINT `files_locations_fileId` FOREIGN KEY (`fileId`) REFERENCES `files` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `files_revisions`
 --
@@ -287,4 +322,4 @@ CREATE TABLE `tags` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-12-15 21:19:33
+-- Dump completed on 2024-12-22 22:16:04

portal/package.json

@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "acfrontend": "*",
-    "acts-util-core": "*"
+    "acts-util-core": "*",
+    "country-iso-2-to-3": "^1.1.0"
   }
 }

portal/src/RootComponent.tsx

@@ -17,8 +17,8 @@
  * */
 import { BootstrapIcon, Component, Injectable, JSX_CreateElement, JSX_Fragment, Navigation, NavItem, OAuth2Service, OAuth2TokenManager, Router, RouterComponent } from "acfrontend";
 import { CONFIG_OIDC } from "./config";
-import { APIService } from "./APIService";
 import { SCOPE_FILES_WRITE } from "./definitions";
+import { APIService } from "./services/APIService";
 
 @Injectable
 export class RootComponent extends Component
@@ -59,6 +59,7 @@ export class RootComponent extends Component
     {
         if(this.router.state.Get().ToUrl().path.startsWith("/settings"))
             return <NavItem route="/"><BootstrapIcon>house</BootstrapIcon></NavItem>;
+        
         return this.RenderEditCheck();
     }
 

portal/src/SettingsComponent.tsx

@@ -26,6 +26,7 @@ export function SettingsComponent()
                 <ul className="nav nav-pills flex-column">
                     <NavItem route={"/settings/containers"}><BootstrapIcon>eyeglasses</BootstrapIcon> Containers</NavItem>
                     <NavItem route={"/settings/storagebackends"}><BootstrapIcon>eyeglasses</BootstrapIcon> Storage backends</NavItem>
+                    <NavItem route={"/settings/reporting"}><BootstrapIcon>file-text</BootstrapIcon> Reporting</NavItem>
                 </ul>
             </div>
             <div className="col">

portal/src/containers/CreateContainersComponent.tsx

@@ -17,9 +17,9 @@
  * */
 
 import { BootstrapIcon, FormField, JSX_CreateElement, JSX_Fragment, LineEdit, PushButton, Router, Use, UseDeferredAPI, UseState } from "acfrontend";
-import { APIService } from "../APIService";
 import { APIResponse } from "acfrontend/dist/RenderHelpers";
 import { ContainerProperties } from "../../dist/api";
+import { APIService } from "../services/APIService";
 
 function ContainerFormComponent(input: { saveAPI: (data: ContainerProperties) => Promise<APIResponse<void>>  })
 {

portal/src/containers/ListContainersComponent.tsx

@@ -17,8 +17,8 @@
  * */
 
 import { BootstrapIcon, JSX_CreateElement, JSX_Fragment, RouterButton, Use, UseAPI } from "acfrontend";
-import { APIService } from "../APIService";
 import { ContainerProperties } from "../../dist/api";
+import { APIService } from "../services/APIService";
 
 function ContainersList(input: { containers: ContainerProperties[] })
 {

portal/src/file-explorer/ContainerSelectionComponent.tsx

@@ -17,8 +17,8 @@
  * */
 
 import { UseAPI, Use, JSX_CreateElement, BootstrapIcon, Anchor } from "acfrontend";
-import { APIService } from "../APIService";
 import { Container } from "../../dist/api";
+import { APIService } from "../services/APIService";
 
 function ContainersList(input: { containers: Container[] })
 {

portal/src/file-explorer/CreateFileVersionComponent.tsx

@@ -17,9 +17,9 @@
  * */
 
 import { BootstrapIcon, FormField, JSX_CreateElement, PushButton, Router, Select, Use, UseAPI, UseDeferredAPI, UseRouteParameter, UseState } from "acfrontend";
-import { APIService } from "../APIService";
 import { FileMetaDataDTO, StreamingVersionType } from "../../dist/api";
 import { Of } from "acts-util-core";
+import { APIService } from "../services/APIService";
 
 function CreateFileVersionForm(input: { containerId: number; fileId: number; metadata: FileMetaDataDTO })
 {

portal/src/file-explorer/DirectoryViewComponent.tsx

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * */
 
-import { Anchor, AutoCompleteMultiSelectBox, BootstrapIcon, Component, FormField, Injectable, JSX_CreateElement, JSX_Fragment, LineEdit, ProgressSpinner, RouteParamProperty } from "acfrontend";
-import { APIService } from "../APIService";
+import { Anchor, AutoCompleteMultiSelectBox, BootstrapIcon, Component, FormField, Injectable, JSX_CreateElement, JSX_Fragment, LineEdit, ProgressSpinner, RouteParamProperty, RouterButton } from "acfrontend";
 import { DirectoryContentsDTO } from "../../dist/api";
 import { FilesGridView } from "./FilesGridView";
 import { FilesTableView } from "./FilesTableView";
+import { APIService } from "../services/APIService";
 
 @Injectable
 export class DirectoryViewComponent extends Component<{ dirPath: string }>
@@ -51,6 +51,7 @@ export class DirectoryViewComponent extends Component<{ dirPath: string }>
                             <br />
                             <button type="button" className={this.GetToggleButtonClassName(this.view === "grid")} onclick={() => this.view = "grid"}><BootstrapIcon>grid</BootstrapIcon></button>
                             <button type="button" className={this.GetToggleButtonClassName(this.view === "list")} onclick={() => this.view = "list"}><BootstrapIcon>view-list</BootstrapIcon></button>
+                            <Anchor route={"/" + this.containerId + "/maps"}><BootstrapIcon>globe-europe-africa</BootstrapIcon></Anchor>
                         </li>
                     </ol>
                 </nav>

portal/src/file-explorer/DownloadFileUsingProgressPopup.tsx

@@ -0,0 +1,79 @@
+/**
+ * OpenDistributedFileStorage
+ * Copyright (C) 2024 Amir Czwink ([email protected])
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * */
+import { RootInjector, FileDownloadService, PopupManager, ProgressSpinner, JSX_CreateElement, Component } from "acfrontend";
+import { Property } from "acts-util-core";
+import { ResponseData } from "../../dist/api";
+
+class DownloadModalPopup extends Component<{ progress: Property<ProgressEvent | null>; startTime: number; }>
+{
+    protected override Render(): RenderValue
+    {
+        return <div className="modal-dialog">
+            <div className="modal-content">
+                <div className="modal-body">
+                    <p>Downloading file. Standby...</p>
+                    {this.RenderStatus()}
+                </div>
+            </div>
+        </div>;
+    }
+
+    //Private methods
+    private RenderStatus()
+    {
+        const v = this.input.progress.Get();
+        if(v === null)
+            return <ProgressSpinner />;
+
+        const dt = (Date.now() - this.input.startTime) / 1000;
+        const speed = v.loaded / dt;
+        if(v.lengthComputable)
+        {
+            const percent = Math.round(v.loaded / v.total * 100);
+            return <fragment>
+                <div className="progress">
+                    <div className="progress-bar" style={"width: " + percent + "%"}>{percent}%</div>
+                </div>
+                <br />
+                Downloaded: {v.loaded.FormatBinaryPrefixed("B")} of {v.total.FormatBinaryPrefixed("B")} ({speed.FormatBinaryPrefixed("B")}/s)
+            </fragment>;
+        }
+        return "Downloaded: " + v.loaded.FormatBinaryPrefixed("B") + " (" + speed.FormatBinaryPrefixed("B") + "/s)";
+    }
+
+    //Event handlers
+    override OnInitiated(): void
+    {
+        this.input.progress.Subscribe(this.Update.bind(this));
+    }
+}
+
+export async function DownloadFileUsingProgressPopup(fileName: string, initRequest: (progressTracker: (event: ProgressEvent) => void) => Promise<ResponseData<number, number, Blob>>)
+{
+    const prop = new Property<ProgressEvent | null>(null);
+    const ref = RootInjector.Resolve(PopupManager).OpenModal(<DownloadModalPopup progress={prop} startTime={Date.now()} />, { className: "fade show d-block" });
+
+    const response = await initRequest(event => prop.Set(event));
+
+    ref.Close();
+    if("data" in response)
+        RootInjector.Resolve(FileDownloadService).DownloadBlobAsFile(response.data, fileName);
+    else
+        throw new Error("TODO: implement me!");
+    return response;
+}

portal/src/file-explorer/EditFileAttributesComponent.tsx

@@ -17,9 +17,11 @@
  * */
 
 import { AutoCompleteTextLineEdit, BootstrapIcon, FormField, JSX_CreateElement, LineEdit, PushButton, Router, Use, UseAPI, UseDeferredAPI, UseRouteParameter, UseState } from "acfrontend";
-import { APIService } from "../APIService";
 import { FileMetaDataDTO } from "../../dist/api";
 import { FileEventsService } from "../FileEventsService";
+import { APIService } from "../services/APIService";
+import { GeoLocationSelector } from "../geolocation/GeoLocationSelector";
+import { GeoLocationMap } from "../geolocation/GeoLocationMap";
 
 async function LoadTags(containerId: number, searchText: string)
 {
@@ -43,15 +45,30 @@ function FileEditor(input: { containerId: number; fileId: number; fileData: File
         state.tags[index] = newValue;
         state.tags = [...state.tags]; //inform view about change
     }
+    async function onLocationChanged(newValue: string)
+    {
+        const response = await Use(APIService).geocoding._any_.get(newValue);
+        if(response.statusCode !== 200)
+            throw new Error("TODO implement me");
+        const location = response.data;
+        state.locationPos = {
+            lat: parseFloat(location.latitude),
+            lon: parseFloat(location.longitude)
+        };
+        state.osmLocationId = newValue;
+    }
 
     const state = UseState({
         filePath: input.fileData.filePath,
+        osmLocationId: input.fileData.location?.osmId ?? null,
+        locationPos: (input.fileData.location === undefined) ? null : { lat: input.fileData.location.lat, lon: input.fileData.location.lon },
         tags: input.fileData.tags
     });
     const isValid = state.tags.find(x => x.trim().length === 0) === undefined;
 
     const apiState = UseDeferredAPI(
         () => Use(APIService).files._any_.put(input.fileId, {
+            osmLocationId: state.osmLocationId,
             filePath: state.filePath,
             tags: state.tags
         }),
@@ -67,6 +84,9 @@ function FileEditor(input: { containerId: number; fileId: number; fileData: File
         <FormField title="File path">
             <LineEdit link={state.links.filePath} />
         </FormField>
+        <h4>Location</h4>
+        <GeoLocationSelector locationId={state.osmLocationId} onValueChanged={onLocationChanged} />
+        {(state.locationPos === null) ? null : <GeoLocationMap points={[state.locationPos]} /> }
         <h4>Tags</h4>
         {state.tags.map( (x, i) => <div className="row">
             <div className="col">

portal/src/file-explorer/FileAccessesComponent.tsx

@@ -17,8 +17,8 @@
  * */
 
 import { UseRouteParameter, UseAPI, Use, JSX_CreateElement, JSX_Fragment, BootstrapIcon } from "acfrontend";
-import { APIService } from "../APIService";
 import { AccessStatistics, StorageTier } from "../../dist/api";
+import { APIService } from "../services/APIService";
 
 function RenderStorageTier(storageTier: StorageTier)
 {

portal/src/file-explorer/FileExplorerComponent.tsx

@@ -16,16 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * */
 
-import { Component, InfoMessageManager, Injectable, JSX_CreateElement, ProgressSpinner, RouteParamProperty, Router } from "acfrontend";
-import { APIService } from "../APIService";
+import { Component, InfoMessageManager, Injectable, JSX_CreateElement, PopupManager, ProgressSpinner, RouteParamProperty, Router } from "acfrontend";
 import { DirectoryViewComponent } from "./DirectoryViewComponent";
+import { APIService } from "../services/APIService";
+import { UploadFileModal } from "./UploadFileModal";
 
 let dragCounter = 0;
 
 @Injectable
 export class FileExplorerComponent extends Component
 {
-    constructor(private apiService: APIService, private infoMessageManager: InfoMessageManager, private router: Router,
+    constructor(private apiService: APIService, private infoMessageManager: InfoMessageManager, private router: Router, private popupManager: PopupManager,
         @RouteParamProperty("containerId") private containerId: number)
     {
         super();
@@ -56,53 +57,23 @@ export class FileExplorerComponent extends Component
             this.dirPath = "/";
     }
 
-    private async UploadFile(file: File)
-    {
-        console.log("Uploading file", file.name);
-        const response = await this.apiService.containers._any_.files.post(this.containerId, {
-            parentPath: this.dirPath,
-            file
-        });
-        console.log("Finished", file.name, "result: ", response);
-        switch(response.statusCode)
-        {
-            case 204:
-                return true;
-            case 409:
-                this.infoMessageManager.ShowMessage(<p>{file.name} was not uploaded because it exists already!</p>, { type: "warning" });
-                break;
-            default:
-                this.infoMessageManager.ShowMessage(<p>Failed uploading file {file.name}</p>, { type: "danger" });
-        }
-
-        return false;
-    }
-
     private async UploadFiles(files: File[])
     {
         this.loading = true;
 
-        if(files.length === 1)
+        const context = this;
+        function OnFinish(success: boolean)
         {
-            const result = await this.UploadFile(files[0]);
-            if(result)
-                this.infoMessageManager.ShowMessage(<p>File uploaded successfully. You will see it soon in the explorer...</p>, { type: "success" });
-        }
-        else
-        {
-            let okCount = 0;
-            for (const file of files)
+            if(success)
             {
-                const result = await this.UploadFile(file);    
-                if(result)
-                    okCount++;
+                if(files.length === 1)
+                    context.infoMessageManager.ShowMessage(<p>File uploaded successfully. You will see it soon in the explorer...</p>, { type: "success" });
+                else
+                    context.infoMessageManager.ShowMessage(<p>{files.length} files uploaded successfully. You will see them soon in the explorer...</p>, { type: "success" });
             }
-
-            if(okCount === files.length)
-                this.infoMessageManager.ShowMessage(<p>{okCount} files uploaded successfully. You will see them soon in the explorer...</p>, { type: "success" });
-            else
-                this.infoMessageManager.ShowMessage(<p>{files.length - okCount} files of {files.length} could not be uploaded successfully.</p>, { type: "danger" });
         }
+        this.popupManager.OpenModal(<UploadFileModal context={{ type: "newfile", containerId: this.containerId, parentPath: this.dirPath }} files={files} onFinish={OnFinish} />, { className: "fade show d-block" });
+        //this.infoMessageManager.ShowMessage(<p>{files.length - okCount} files of {files.length} could not be uploaded successfully.</p>, { type: "danger" });
 
         this.loading = false;
     }