cleanup, fixes with paths
This commit is contained in:
Vendored
+8
-14
@@ -576,7 +576,7 @@
|
||||
boardHandlerManager = new HandlerManager();
|
||||
// paths
|
||||
getBasePath = () => {
|
||||
return this.fileModel.getModelContainerPath("taskModel");
|
||||
return this.fileModel.getModelContainerPath("tasks" /* ModelTask */);
|
||||
};
|
||||
getBoardFilePath = (boardId) => {
|
||||
return [...this.fileModel.getFilePath(boardId)];
|
||||
@@ -585,13 +585,16 @@
|
||||
return [...this.fileModel.getFilePath(taskId)];
|
||||
};
|
||||
getBoardContainerPath = () => {
|
||||
return [...this.getBasePath(), subDirectories.boards];
|
||||
return [...this.getBasePath(), "boards" /* Boards */];
|
||||
};
|
||||
getBoardDirectoryPath = (boardId) => {
|
||||
return [...this.getBoardContainerPath(), boardId];
|
||||
};
|
||||
getTaskContainerPath = (boardId) => {
|
||||
return [...this.getBoardDirectoryPath(boardId), subDirectories.boardTasks];
|
||||
return [
|
||||
...this.getBoardDirectoryPath(boardId),
|
||||
"tasks" /* BoardTasks */
|
||||
];
|
||||
};
|
||||
getTaskReferencePath = (boardId, fileId) => {
|
||||
return [...this.getTaskContainerPath(boardId), fileId];
|
||||
@@ -714,10 +717,6 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
var subDirectories = {
|
||||
boards: "boards",
|
||||
boardTasks: "tasks"
|
||||
};
|
||||
var BoardInfoFileContentReference = {
|
||||
dataVersion: DATA_VERSION,
|
||||
fileId: "string",
|
||||
@@ -751,10 +750,10 @@
|
||||
);
|
||||
};
|
||||
getFileContainerPath = () => {
|
||||
return [...this.getBasePath(), subDirectories2.data];
|
||||
return [...this.getBasePath(), "data" /* Data */];
|
||||
};
|
||||
getModelContainerPath = (modelName) => {
|
||||
return [...this.getBasePath(), subDirectories2.model, modelName];
|
||||
return [...this.getBasePath(), "model" /* Model */, modelName];
|
||||
};
|
||||
getFilePath = (fileId) => {
|
||||
return [...this.getFileContainerPath(), fileId];
|
||||
@@ -846,11 +845,6 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
var subDirectories2 = {
|
||||
data: "data",
|
||||
model: "model",
|
||||
taskModel: "tasks"
|
||||
};
|
||||
var FileContentReference = {
|
||||
dataVersion: DATA_VERSION,
|
||||
fileId: "",
|
||||
|
||||
@@ -30,13 +30,13 @@ export default class FileModel {
|
||||
};
|
||||
|
||||
getFileContainerPath = (): string[] => {
|
||||
return [...this.getBasePath(), subDirectories.data];
|
||||
return [...this.getBasePath(), FileModelSubPath.Data];
|
||||
};
|
||||
|
||||
getModelContainerPath = (
|
||||
modelName: keyof typeof subDirectories
|
||||
modelName: FileModelSubPath
|
||||
): string[] => {
|
||||
return [...this.getBasePath(), subDirectories.model, modelName];
|
||||
return [...this.getBasePath(), FileModelSubPath.Model, modelName];
|
||||
};
|
||||
|
||||
getFilePath = (fileId: string): string[] => {
|
||||
@@ -167,10 +167,10 @@ export default class FileModel {
|
||||
}
|
||||
|
||||
// paths
|
||||
export const subDirectories = {
|
||||
data: "data",
|
||||
model: "model",
|
||||
taskModel: "tasks",
|
||||
export enum FileModelSubPath {
|
||||
Data = "data",
|
||||
Model = "model",
|
||||
ModelTask = "tasks",
|
||||
};
|
||||
|
||||
// types
|
||||
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
DATA_VERSION,
|
||||
checkMatchesObjectStructure,
|
||||
} from "../Utility/typeSafety";
|
||||
import FileModel, { FileContent } from "./fileModel";
|
||||
import FileModel, { FileContent, FileModelSubPath } from "./fileModel";
|
||||
|
||||
import ChatModel from "../Chat/chatModel";
|
||||
import { Color } from "../../colors";
|
||||
@@ -22,7 +22,7 @@ export default class TaskModel {
|
||||
|
||||
// paths
|
||||
getBasePath = (): string[] => {
|
||||
return this.fileModel.getModelContainerPath("taskModel");
|
||||
return this.fileModel.getModelContainerPath(FileModelSubPath.ModelTask);
|
||||
};
|
||||
|
||||
getBoardFilePath = (boardId: string): string[] => {
|
||||
@@ -34,7 +34,7 @@ export default class TaskModel {
|
||||
};
|
||||
|
||||
getBoardContainerPath = (): string[] => {
|
||||
return [...this.getBasePath(), subDirectories.boards];
|
||||
return [...this.getBasePath(), TaskModelSubPaths.Boards];
|
||||
};
|
||||
|
||||
getBoardDirectoryPath = (boardId: string): string[] => {
|
||||
@@ -42,7 +42,10 @@ export default class TaskModel {
|
||||
};
|
||||
|
||||
getTaskContainerPath = (boardId: string): string[] => {
|
||||
return [...this.getBoardDirectoryPath(boardId), subDirectories.boardTasks];
|
||||
return [
|
||||
...this.getBoardDirectoryPath(boardId),
|
||||
TaskModelSubPaths.BoardTasks,
|
||||
];
|
||||
};
|
||||
|
||||
getTaskReferencePath = (boardId: string, fileId: string): string[] => {
|
||||
@@ -215,9 +218,9 @@ export default class TaskModel {
|
||||
};
|
||||
}
|
||||
|
||||
export const subDirectories = {
|
||||
boards: "boards",
|
||||
boardTasks: "tasks",
|
||||
export enum TaskModelSubPaths {
|
||||
Boards = "boards",
|
||||
BoardTasks = "tasks",
|
||||
};
|
||||
|
||||
// types
|
||||
|
||||
@@ -130,3 +130,8 @@ export default class TaskPageViewModel {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export enum TaskPageViewModelSubPaths {
|
||||
LastUsedBoard = "last-used-board",
|
||||
BoardLastUsedView = "last-used-view",
|
||||
};
|
||||
Reference in New Issue
Block a user