cleanup, fixes with paths

This commit is contained in:
marlon-erler
2024-07-23 18:23:26 +02:00
parent 0a34304652
commit 7d388cf4eb
4 changed files with 30 additions and 28 deletions
+8 -14
View File
@@ -576,7 +576,7 @@
boardHandlerManager = new HandlerManager(); boardHandlerManager = new HandlerManager();
// paths // paths
getBasePath = () => { getBasePath = () => {
return this.fileModel.getModelContainerPath("taskModel"); return this.fileModel.getModelContainerPath("tasks" /* ModelTask */);
}; };
getBoardFilePath = (boardId) => { getBoardFilePath = (boardId) => {
return [...this.fileModel.getFilePath(boardId)]; return [...this.fileModel.getFilePath(boardId)];
@@ -585,13 +585,16 @@
return [...this.fileModel.getFilePath(taskId)]; return [...this.fileModel.getFilePath(taskId)];
}; };
getBoardContainerPath = () => { getBoardContainerPath = () => {
return [...this.getBasePath(), subDirectories.boards]; return [...this.getBasePath(), "boards" /* Boards */];
}; };
getBoardDirectoryPath = (boardId) => { getBoardDirectoryPath = (boardId) => {
return [...this.getBoardContainerPath(), boardId]; return [...this.getBoardContainerPath(), boardId];
}; };
getTaskContainerPath = (boardId) => { getTaskContainerPath = (boardId) => {
return [...this.getBoardDirectoryPath(boardId), subDirectories.boardTasks]; return [
...this.getBoardDirectoryPath(boardId),
"tasks" /* BoardTasks */
];
}; };
getTaskReferencePath = (boardId, fileId) => { getTaskReferencePath = (boardId, fileId) => {
return [...this.getTaskContainerPath(boardId), fileId]; return [...this.getTaskContainerPath(boardId), fileId];
@@ -714,10 +717,6 @@
}; };
}; };
}; };
var subDirectories = {
boards: "boards",
boardTasks: "tasks"
};
var BoardInfoFileContentReference = { var BoardInfoFileContentReference = {
dataVersion: DATA_VERSION, dataVersion: DATA_VERSION,
fileId: "string", fileId: "string",
@@ -751,10 +750,10 @@
); );
}; };
getFileContainerPath = () => { getFileContainerPath = () => {
return [...this.getBasePath(), subDirectories2.data]; return [...this.getBasePath(), "data" /* Data */];
}; };
getModelContainerPath = (modelName) => { getModelContainerPath = (modelName) => {
return [...this.getBasePath(), subDirectories2.model, modelName]; return [...this.getBasePath(), "model" /* Model */, modelName];
}; };
getFilePath = (fileId) => { getFilePath = (fileId) => {
return [...this.getFileContainerPath(), fileId]; return [...this.getFileContainerPath(), fileId];
@@ -846,11 +845,6 @@
}; };
}; };
}; };
var subDirectories2 = {
data: "data",
model: "model",
taskModel: "tasks"
};
var FileContentReference = { var FileContentReference = {
dataVersion: DATA_VERSION, dataVersion: DATA_VERSION,
fileId: "", fileId: "",
+7 -7
View File
@@ -30,13 +30,13 @@ export default class FileModel {
}; };
getFileContainerPath = (): string[] => { getFileContainerPath = (): string[] => {
return [...this.getBasePath(), subDirectories.data]; return [...this.getBasePath(), FileModelSubPath.Data];
}; };
getModelContainerPath = ( getModelContainerPath = (
modelName: keyof typeof subDirectories modelName: FileModelSubPath
): string[] => { ): string[] => {
return [...this.getBasePath(), subDirectories.model, modelName]; return [...this.getBasePath(), FileModelSubPath.Model, modelName];
}; };
getFilePath = (fileId: string): string[] => { getFilePath = (fileId: string): string[] => {
@@ -167,10 +167,10 @@ export default class FileModel {
} }
// paths // paths
export const subDirectories = { export enum FileModelSubPath {
data: "data", Data = "data",
model: "model", Model = "model",
taskModel: "tasks", ModelTask = "tasks",
}; };
// types // types
+10 -7
View File
@@ -4,7 +4,7 @@ import {
DATA_VERSION, DATA_VERSION,
checkMatchesObjectStructure, checkMatchesObjectStructure,
} from "../Utility/typeSafety"; } from "../Utility/typeSafety";
import FileModel, { FileContent } from "./fileModel"; import FileModel, { FileContent, FileModelSubPath } from "./fileModel";
import ChatModel from "../Chat/chatModel"; import ChatModel from "../Chat/chatModel";
import { Color } from "../../colors"; import { Color } from "../../colors";
@@ -22,7 +22,7 @@ export default class TaskModel {
// paths // paths
getBasePath = (): string[] => { getBasePath = (): string[] => {
return this.fileModel.getModelContainerPath("taskModel"); return this.fileModel.getModelContainerPath(FileModelSubPath.ModelTask);
}; };
getBoardFilePath = (boardId: string): string[] => { getBoardFilePath = (boardId: string): string[] => {
@@ -34,7 +34,7 @@ export default class TaskModel {
}; };
getBoardContainerPath = (): string[] => { getBoardContainerPath = (): string[] => {
return [...this.getBasePath(), subDirectories.boards]; return [...this.getBasePath(), TaskModelSubPaths.Boards];
}; };
getBoardDirectoryPath = (boardId: string): string[] => { getBoardDirectoryPath = (boardId: string): string[] => {
@@ -42,7 +42,10 @@ export default class TaskModel {
}; };
getTaskContainerPath = (boardId: string): string[] => { getTaskContainerPath = (boardId: string): string[] => {
return [...this.getBoardDirectoryPath(boardId), subDirectories.boardTasks]; return [
...this.getBoardDirectoryPath(boardId),
TaskModelSubPaths.BoardTasks,
];
}; };
getTaskReferencePath = (boardId: string, fileId: string): string[] => { getTaskReferencePath = (boardId: string, fileId: string): string[] => {
@@ -215,9 +218,9 @@ export default class TaskModel {
}; };
} }
export const subDirectories = { export enum TaskModelSubPaths {
boards: "boards", Boards = "boards",
boardTasks: "tasks", BoardTasks = "tasks",
}; };
// types // types
+5
View File
@@ -130,3 +130,8 @@ export default class TaskPageViewModel {
); );
} }
} }
export enum TaskPageViewModelSubPaths {
LastUsedBoard = "last-used-board",
BoardLastUsedView = "last-used-view",
};