Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: folders FTA #4345

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
65f7c3f
refactor(app-aco): use FTA in app-aco - folder entity
leopuleo Jun 24, 2024
f30304a
refactor(app-aco): use FTA in app-aco - folder entity
leopuleo Jun 25, 2024
0702593
Merge branch 'refs/heads/next' into leo/refactor/app-aco-fta
leopuleo Aug 15, 2024
ea0e4d5
refactor(app-aco): implement useCase and controller layers
leopuleo Aug 27, 2024
ce1bfe2
refactor(app-aco): implement presenter
leopuleo Aug 27, 2024
a5be5e1
refactor(app-aco): add loading use case decoration
leopuleo Aug 27, 2024
2370f07
refactor(app-aco): move Graphql interface to gateway
leopuleo Aug 27, 2024
bf1e730
chore: wip
leopuleo Sep 18, 2024
9851745
Merge branch 'next' into leo/refactor/app-aco-fta
leopuleo Oct 15, 2024
171d1ad
wip: folders FTA
leopuleo Oct 17, 2024
292441e
wip: retrieve data from gateway
leopuleo Oct 17, 2024
d87bf4f
fix: loading folders
leopuleo Oct 17, 2024
f155108
fix: move folderLevelPermissions into new hook
leopuleo Oct 17, 2024
11f093e
refactor: pass type as repo dependency
leopuleo Oct 17, 2024
7309428
refactor: flp FTA
leopuleo Oct 17, 2024
4ee8d25
fix: revert the folder tree state in case of error on drop
leopuleo Oct 18, 2024
295039a
fix: remove previous implementation files
leopuleo Oct 18, 2024
c6c467c
feat: move vm into listFolders
leopuleo Oct 18, 2024
ba5011d
refactor: create separate folders useCases
leopuleo Oct 19, 2024
22bd689
wip: create instance class
leopuleo Oct 21, 2024
1b8b210
refactor: introduce GetFolderLevelPermission feature
leopuleo Oct 21, 2024
0c5b524
refactor: introduce GetFolderLevelPermission feature
leopuleo Oct 21, 2024
603aa5e
refactor: add loading namespace
leopuleo Oct 21, 2024
581ab8e
Merge branch 'next' into leo/refactor/app-aco-fta
leopuleo Oct 21, 2024
22c5c9c
chore: run adio
leopuleo Oct 21, 2024
a478e6f
Merge branch 'next' into leo/refactor/app-aco-fta
leopuleo Nov 8, 2024
9cd7c33
Merge branch 'next' into leo/refactor/app-aco-fta
leopuleo Nov 12, 2024
d5b66bf
Merge branch 'next' into leo/refactor/app-aco-fta
leopuleo Nov 18, 2024
a885839
Merge remote-tracking branch 'origin/leo/refactor/app-aco-fta' into l…
leopuleo Jan 9, 2025
7e63836
refactor: replace FolderCache with generic ListCache
leopuleo Jan 9, 2025
b963e3a
refactor: remove unused makeAutoObservable
leopuleo Jan 9, 2025
c04bfea
test: add tests
leopuleo Jan 10, 2025
b3770d1
refactor: remove useFolders
leopuleo Jan 10, 2025
12f2b8b
Merge branch 'next' into leo/refactor/app-aco-fta
leopuleo Jan 10, 2025
226af4d
fix: omit all inherited permissions
leopuleo Jan 10, 2025
40a483d
refactor: add listing params
leopuleo Jan 10, 2025
58f8e18
Merge branch 'next' into leo/refactor/app-aco-fta
leopuleo Jan 21, 2025
2dacaac
Merge branch 'next' into leo/refactor/app-aco-fta
leopuleo Jan 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor(app-aco): implement useCase and controller layers
  • Loading branch information
leopuleo committed Aug 27, 2024
commit ea0e4d5037278f7630e0d6c3132a331d4399944b
62 changes: 0 additions & 62 deletions packages/app-aco/src/Domain/Models/Folder/Folder.ts

This file was deleted.

27 changes: 13 additions & 14 deletions packages/app-aco/src/Domain/Models/Folder/FolderMapper.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
import { Folder } from "./Folder";
import { IFolderMapper } from "./IFolderMapper";
import { ROOT_FOLDER } from "~/constants";
import { Folder } from "~/folders/domain";

export class FolderMapper implements IFolderMapper {
toDTO(folder: Folder) {
console.log("FolderMapper", folder);

return {
id: folder.id,
title: folder.title,
slug: folder.slug,
type: folder.type,
parentId: folder.parentId || "root",
createdBy: folder.createdBy,
createdOn: folder.createdOn,
savedBy: folder.savedBy,
savedOn: folder.savedOn,
modifiedBy: folder.modifiedBy,
modifiedOn: folder.modifiedOn,
parentId: folder.parentId ?? ROOT_FOLDER,
permissions: folder.permissions,
hasNonInheritedPermissions: folder.hasNonInheritedPermissions,
canManagePermissions: folder.canManagePermissions,
canManageStructure: folder.canManageStructure,
canManageContent: folder.canManageContent
hasNonInheritedPermissions: folder.hasNonInheritedPermissions ?? false,
canManagePermissions: folder.canManagePermissions ?? false,
canManageStructure: folder.canManageStructure ?? false,
canManageContent: folder.canManageContent ?? false,
createdBy: folder.createdBy ?? { id: "", type: "", displayName: "" },
createdOn: folder.createdOn ?? "",
savedBy: folder.savedBy ?? { id: "", type: "", displayName: "" },
savedOn: folder.savedOn ?? "",
modifiedBy: folder.modifiedBy ?? null,
modifiedOn: folder.modifiedOn ?? null
};
}
}
4 changes: 2 additions & 2 deletions packages/app-aco/src/Domain/Models/Folder/IFolderMapper.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Folder } from "./Folder";
import { Folder } from "~/folders/domain";
import { FolderItem } from "~/types";

export interface IFolderMapper {
toDTO: (folder: Folder | FolderItem) => FolderItem;
toDTO: (folder: Folder) => FolderItem;
}
1 change: 0 additions & 1 deletion packages/app-aco/src/Domain/Models/Folder/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from "./Folder";
export * from "./FolderMapper";
export * from "./IFolderMapper";

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion packages/app-aco/src/Domain/Repositories/index.ts

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions packages/app-aco/src/Gateways/Folders/CreateFolder/index.ts

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions packages/app-aco/src/Gateways/Folders/UpdateFolder/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/app-aco/src/Gateways/index.ts

This file was deleted.

11 changes: 4 additions & 7 deletions packages/app-aco/src/components/FolderTree/List/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,10 @@ export const List = ({

setTreeData(newTree);

await updateFolder(
{
...item,
parentId: dropTargetId !== ROOT_FOLDER ? (dropTargetId as string) : null
},
{ refetchFoldersList: true }
);
await updateFolder({
...item,
parentId: dropTargetId !== ROOT_FOLDER ? (dropTargetId as string) : null
});
} catch (error) {
return showSnackbar(error.message);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/app-aco/src/dialogs/useSetPermissionsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const useSetPermissionsDialog = (): UseSetPermissionsDialogResponse => {
const updateData = { ...folder, ...data };

try {
await updateFolder(updateData, { refetchFoldersList: true });
await updateFolder(updateData);
showSnackbar("Folder permissions updated successfully!");
} catch (error) {
showSnackbar(error.message);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { makeAutoObservable } from "mobx";
import { Folder } from "~/folders/domain";
import { ICache } from "./ICache";
import { Folder } from "~/Domain/Models";

export class FoldersCache implements ICache<Folder> {
private folders: Folder[];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FoldersCache } from "~/Domain/Caches/FoldersCache";
import { FoldersCache } from "./FoldersCache";

export class FoldersCacheFactory {
private cache: Map<string, FoldersCache> = new Map();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export * from "./ICache";
export * from "./FoldersCache";
export * from "./FoldersCacheFactory";
export * from "./ICache";
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { ICreateFolderController } from "./ICreateFolderController";
import { ICreateFolderUseCase } from "~/folders/useCases";
import { FolderItem } from "~/types";

export class CreateFolderController implements ICreateFolderController {
private useCase: ICreateFolderUseCase;

constructor(useCase: ICreateFolderUseCase) {
this.useCase = useCase;
}

async execute(folder: FolderItem, type: string) {
console.log("type", type);
await this.useCase.execute({
type: type,
title: folder.title,
slug: folder.slug,
parentId: folder.parentId,
permissions: folder.permissions
});
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { FolderItem } from "~/types";

export interface ICreateFolderController {
execute: (folder: FolderItem, type: string) => Promise<void>;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./CreateFolderController";
export * from "./ICreateFolderController";
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { IDeleteFolderController } from "./IDeleteFolderController";
import { IDeleteFolderUseCase } from "~/folders/useCases";
import { FolderItem } from "~/types";

export class DeleteFolderController implements IDeleteFolderController {
private useCase: IDeleteFolderUseCase;

constructor(useCase: IDeleteFolderUseCase) {
this.useCase = useCase;
}

async execute(folder: FolderItem) {
await this.useCase.execute({ id: folder.id });
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FolderItem } from "~/types";

export interface ICreateFolderRepository {
export interface IDeleteFolderController {
execute: (folder: FolderItem) => Promise<void>;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./DeleteFolderController";
export * from "./IDeleteFolderController";
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { IGetFolderController } from "./IGetFolderController";
import { IGetFolderUseCase } from "~/folders/useCases";

export class GetFolderController implements IGetFolderController {
private useCase: IGetFolderUseCase;

constructor(useCase: IGetFolderUseCase) {
this.useCase = useCase;
}

async execute(id: string) {
await this.useCase.execute({ id });
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface IGetFolderController {
execute: (id: string) => Promise<void>;
}
2 changes: 2 additions & 0 deletions packages/app-aco/src/folders/controllers/GetFolder/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./GetFolderController";
export * from "./IGetFolderController";
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface IListFoldersController {
execute: (type: string) => Promise<void>;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { IListFoldersController } from "./IListFoldersController";
import { IListFoldersUseCase } from "~/folders/useCases";

export class ListFoldersController implements IListFoldersController {
private useCase: IListFoldersUseCase;

constructor(useCase: IListFoldersUseCase) {
this.useCase = useCase;
}

async execute(type: string): Promise<void> {
await this.useCase.execute({ type });
}
}
2 changes: 2 additions & 0 deletions packages/app-aco/src/folders/controllers/ListFolders/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./IListFoldersController";
export * from "./ListFoldersController";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FolderItem } from "~/types";

export interface IDeleteFolderRepository {
export interface IUpdateFolderController {
execute: (folder: FolderItem) => Promise<void>;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { IUpdateFolderController } from "./IUpdateFolderController";
import { IUpdateFolderUseCase } from "~/folders/useCases";
import { FolderItem } from "~/types";

export class UpdateFolderController implements IUpdateFolderController {
private useCase: IUpdateFolderUseCase;

constructor(useCase: IUpdateFolderUseCase) {
this.useCase = useCase;
}

async execute(folder: FolderItem) {
await this.useCase.execute({
id: folder.id,
title: folder.title,
slug: folder.slug,
type: folder.type,
parentId: folder.parentId,
permissions: folder.permissions
});
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./IUpdateFolderController";
export * from "./UpdateFolderController";
62 changes: 62 additions & 0 deletions packages/app-aco/src/folders/domain/Folder.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { CmsIdentity, FolderPermission } from "~/types";

export interface FolderData {
id?: string;
title: string;
slug: string;
type: string;
parentId: string | null;
permissions: FolderPermission[];
hasNonInheritedPermissions?: boolean;
canManagePermissions?: boolean;
canManageStructure?: boolean;
canManageContent?: boolean;
createdBy?: CmsIdentity;
createdOn?: string;
savedBy?: CmsIdentity;
savedOn?: string;
modifiedBy?: CmsIdentity | null;
modifiedOn?: string | null;
}

export class Folder {
public id: string;
public title: string;
public slug: string;
public type: string;
public parentId: string | null;
public permissions: FolderPermission[];
public hasNonInheritedPermissions?: boolean;
public canManagePermissions?: boolean;
public canManageStructure?: boolean;
public canManageContent?: boolean;
public createdBy?: CmsIdentity;
public createdOn?: string;
public savedBy?: CmsIdentity;
public savedOn?: string;
public modifiedBy?: CmsIdentity | null;
public modifiedOn?: string | null;

protected constructor(folder: FolderData) {
this.id = folder.id ?? "";
this.title = folder.title;
this.slug = folder.slug;
this.type = folder.type;
this.parentId = folder.parentId;
this.permissions = folder.permissions;
this.hasNonInheritedPermissions = folder.hasNonInheritedPermissions;
this.canManagePermissions = folder.canManagePermissions;
this.canManageStructure = folder.canManageStructure;
this.canManageContent = folder.canManageContent;
this.createdBy = folder.createdBy;
this.createdOn = folder.createdOn;
this.savedBy = folder.savedBy;
this.savedOn = folder.savedOn;
this.modifiedBy = folder.modifiedBy;
this.modifiedOn = folder.modifiedOn;
}

static create(folder: FolderData) {
return new Folder(folder);
}
}
1 change: 1 addition & 0 deletions packages/app-aco/src/folders/domain/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./Folder";
Loading