remove more object stuff, prepare FileModel

src/Model/chatModel.ts

@@ -44,18 +44,10 @@ export class ChatModel {
     return storageKeys.chatMessages(this.id);
   }
 
-  get objectDirPath(): string[] {
-    return storageKeys.chatObjects(this.id);
-  }
-
   getMessagePath = (id: string): string[] => {
     return [...this.messageDirPath, id];
   };
 
-  getObjectPath = (id: string): string[] => {
-    return [...this.objectDirPath, id];
-  };
-
   // set
   setPrimaryChannel = (primaryChannel: string): void => {
     this.info.primaryChannel = primaryChannel;
@@ -95,11 +87,6 @@ export class ChatModel {
     this.chatMessageHandler(chatMessage);
   };
 
-  addObject = (chatObject: ChatObject): void => {
-    const objectPath: string[] = this.getObjectPath(chatObject.id);
-    this.storageModel.storeStringifiable(objectPath, chatObject);
-  };
-
   // delete
   delete = () => {
     // untrack
@@ -149,23 +136,6 @@ export class ChatModel {
     return sorted;
   }
 
-  get objects(): ChatObject[] {
-    const objectIds: string[] = this.storageModel.list(this.objectDirPath);
-    if (!Array.isArray(objectIds)) return [];
-
-    const objects: ChatObject[] = [];
-    for (const objectId of objectIds) {
-      const objectPathComponents: string[] = this.getObjectPath(objectId);
-      const object: any =
-        this.storageModel.restoreStringifiable(objectPathComponents);
-      if (checkIsValidObject(object) == false) continue;
-      if (object.id != objectId) continue;
-
-      objects.push(object);
-    }
-    return objects;
-  }
-
   // messaging
   sendMessage = async (body: string): Promise<boolean> => {
     const senderName = this.settingsModel.username;
@@ -309,28 +279,5 @@ export interface ChatMessage {
 
   status?: ChatMessageStatus;
 
-  stringifiedObject?: string;
+  stringifiedFile?: string;
-}
-
-export interface ChatObject {
-  dataVersion: "v2";
-
-  id: string;
-  title: string;
-
-  contentVersions: { [key: string]: ChatObjectContent };
-}
-
-export interface ChatObjectContent {
-  dataVersion: "v2";
-
-  id: string;
-  creationDate: string;
-
-  noteText?: string;
-  priority?: number;
-  category?: string;
-  status?: string;
-  date?: string;
-  time?: string;
 }

src/Model/fileModel.ts

@@ -0,0 +1,15 @@
+export interface File {
+  dataVersion: "v2";
+
+  id: string;
+  title: string;
+
+  contentVersions: { [id: string]: FileContent };
+}
+
+export interface FileContent {
+  dataVersion: "v2";
+
+  id: string;
+  creationDate: string;
+}

src/Model/storageModel.ts

@@ -113,13 +113,13 @@ export default class StorageModel {
   };
 
   static getFileName = (pathComponents: string[]): string => {
-    return pathComponents[pathComponents.length - 1] || "\\"
+    return pathComponents[pathComponents.length - 1] || "\\";
-  }
+  };
 
   static getFileNameFromString = (pathString: string): string => {
     const pathComponents: string[] = this.stringToPathComponents(pathString);
-    return pathComponents[pathComponents.length - 1] || "\\"
+    return pathComponents[pathComponents.length - 1] || "\\";
-  }
+  };
 
   static pathComponentsToString = (...pathComponents: string[]): string => {
     return pathComponents.join(PATH_COMPONENT_SEPARATOR);
@@ -156,11 +156,8 @@ export const storageKeys = {
 
   // history
   previousAddresses: [DATA_VERSION, "history", "previous-addresses"],
-  previousObjectCategories: [DATA_VERSION, "history", "object-categories"],
-  previousObjectStatuses: [DATA_VERSION, "history", "object-statuses"],
-  previousObjectFilters: [DATA_VERSION, "history", "object-filters"],
 
-  // chat etc
+  // chat
   chats: [DATA_VERSION, "chat"],
   chatInfo: (id: string) => [DATA_VERSION, "chat", id, "info"],
   chatLastUsedPage: (id: string) => [
@@ -171,5 +168,4 @@ export const storageKeys = {
   ],
   chatColor: (id: string) => [DATA_VERSION, "chat", id, "color"],
   chatMessages: (id: string) => [DATA_VERSION, "chat", id, "messages"],
-  chatObjects: (id: string) => [DATA_VERSION, "chat", id, "objects"],
 };