@webiny/app-website-builder 6.5.0-beta.0 → 6.5.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Extension.js +3 -0
- package/Extension.js.map +1 -1
- package/domain/Page/Page.d.ts +2 -0
- package/domain/Page/Page.js +1 -0
- package/domain/Page/Page.js.map +1 -1
- package/domain/PageRevision/PageRevision.d.ts +11 -0
- package/domain/PageRevision/PageRevision.js +20 -0
- package/domain/PageRevision/PageRevision.js.map +1 -1
- package/features/pages/createPageRevisionFrom/CreatePageRevisionFrom.test.js +41 -1
- package/features/pages/createPageRevisionFrom/CreatePageRevisionFrom.test.js.map +1 -1
- package/features/pages/createPageRevisionFrom/CreatePageRevisionFromRepository.d.ts +3 -2
- package/features/pages/createPageRevisionFrom/CreatePageRevisionFromRepository.js +8 -2
- package/features/pages/createPageRevisionFrom/CreatePageRevisionFromRepository.js.map +1 -1
- package/features/pages/deletePageRevision/DeletePageRevision.test.d.ts +1 -0
- package/features/pages/deletePageRevision/DeletePageRevision.test.js +67 -0
- package/features/pages/deletePageRevision/DeletePageRevision.test.js.map +1 -0
- package/features/pages/deletePageRevision/DeletePageRevisionGateway.d.ts +1 -1
- package/features/pages/deletePageRevision/DeletePageRevisionGateway.js +2 -3
- package/features/pages/deletePageRevision/DeletePageRevisionGateway.js.map +1 -1
- package/features/pages/deletePageRevision/DeletePageRevisionRepository.d.ts +4 -2
- package/features/pages/deletePageRevision/DeletePageRevisionRepository.js +7 -3
- package/features/pages/deletePageRevision/DeletePageRevisionRepository.js.map +1 -1
- package/features/pages/deletePageRevision/DeletePageRevisionUseCase.js +1 -1
- package/features/pages/deletePageRevision/DeletePageRevisionUseCase.js.map +1 -1
- package/features/pages/deletePageRevision/abstractions.d.ts +2 -3
- package/features/pages/deletePageRevision/abstractions.js.map +1 -1
- package/features/pages/getPage/PageGatewayDto.d.ts +2 -0
- package/features/pages/publishPage/PublishPage.test.js +41 -1
- package/features/pages/publishPage/PublishPage.test.js.map +1 -1
- package/features/pages/publishPage/PublishPageRepository.d.ts +3 -2
- package/features/pages/publishPage/PublishPageRepository.js +15 -4
- package/features/pages/publishPage/PublishPageRepository.js.map +1 -1
- package/features/pages/shared/pageGraphQLFields.js +1 -0
- package/features/pages/shared/pageGraphQLFields.js.map +1 -1
- package/features/pages/unpublishPage/UnpublishPage.test.js +4 -1
- package/features/pages/unpublishPage/UnpublishPage.test.js.map +1 -1
- package/features/pages/unpublishPage/UnpublishPageRepository.d.ts +3 -2
- package/features/pages/unpublishPage/UnpublishPageRepository.js +12 -4
- package/features/pages/unpublishPage/UnpublishPageRepository.js.map +1 -1
- package/inputRenderers/FileInput.js +1 -1
- package/inputRenderers/FileInput.js.map +1 -1
- package/package.json +23 -23
- package/presentation/pages/PageEditor/Revisions/RevisionListDrawer.js +4 -0
- package/presentation/pages/PageEditor/Revisions/RevisionListDrawer.js.map +1 -1
- package/presentation/pages/PageEditor/Revisions/RevisionListItem.d.ts +3 -3
- package/presentation/pages/PageEditor/Revisions/RevisionListItem.js +9 -20
- package/presentation/pages/PageEditor/Revisions/RevisionListItem.js.map +1 -1
- package/presentation/pages/PageEditor/Revisions/RevisionsList.js +7 -19
- package/presentation/pages/PageEditor/Revisions/RevisionsList.js.map +1 -1
- package/presentation/pages/PageEditor/Revisions/useRevision.d.ts +1 -1
- package/presentation/pages/PageEditor/Revisions/useRevision.js +84 -14
- package/presentation/pages/PageEditor/Revisions/useRevision.js.map +1 -1
- package/presentation/pages/PageEditor/Revisions/useRevisionList.d.ts +3 -0
- package/presentation/pages/PageEditor/Revisions/useRevisionList.js +31 -0
- package/presentation/pages/PageEditor/Revisions/useRevisionList.js.map +1 -0
- package/presentation/pages/PageEditor/TopBar/RevisionsMenu.js +7 -19
- package/presentation/pages/PageEditor/TopBar/RevisionsMenu.js.map +1 -1
- package/presentation/pages/PageList/PageListDataSource.js +1 -1
- package/presentation/pages/PageList/PageListDataSource.js.map +1 -1
- package/presentation/pages/PageList/PageListPresenter.test.d.ts +1 -0
- package/presentation/pages/PageList/PageListPresenter.test.js +293 -0
- package/presentation/pages/PageList/PageListPresenter.test.js.map +1 -0
- package/presentation/pages/RevisionList/RevisionListPresenter.d.ts +27 -0
- package/presentation/pages/RevisionList/RevisionListPresenter.js +73 -0
- package/presentation/pages/RevisionList/RevisionListPresenter.js.map +1 -0
- package/presentation/pages/RevisionList/RevisionListPresenter.test.d.ts +1 -0
- package/presentation/pages/RevisionList/RevisionListPresenter.test.js +219 -0
- package/presentation/pages/RevisionList/RevisionListPresenter.test.js.map +1 -0
- package/presentation/pages/RevisionList/abstractions.d.ts +34 -0
- package/presentation/pages/RevisionList/abstractions.js +5 -0
- package/presentation/pages/RevisionList/abstractions.js.map +1 -0
- package/presentation/pages/RevisionList/feature.d.ts +3 -0
- package/presentation/pages/RevisionList/feature.js +17 -0
- package/presentation/pages/RevisionList/feature.js.map +1 -0
- package/presentation/pages/RevisionList/index.d.ts +2 -0
- package/presentation/pages/RevisionList/index.js +1 -0
- package/presentation/redirects/RedirectList/RedirectListDataSource.js +1 -1
- package/presentation/redirects/RedirectList/RedirectListDataSource.js.map +1 -1
- package/presentation/redirects/RedirectList/RedirectListPresenter.test.d.ts +1 -0
- package/presentation/redirects/RedirectList/RedirectListPresenter.test.js +273 -0
- package/presentation/redirects/RedirectList/RedirectListPresenter.test.js.map +1 -0
- package/shared/fileManagerItemToValue.js +3 -1
- package/shared/fileManagerItemToValue.js.map +1 -1
- package/shared/fileManagerItemToValue.test.d.ts +1 -0
- package/shared/fileManagerItemToValue.test.js +73 -0
- package/shared/fileManagerItemToValue.test.js.map +1 -0
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { Container } from "@webiny/di";
|
|
3
|
+
import { WbPageStatus } from "../../../constants.js";
|
|
4
|
+
import { PageRevision, pageRevisionsCacheFactory } from "../../../domain/PageRevision/index.js";
|
|
5
|
+
import { GetPageRevisionsUseCase } from "../../../features/pages/getPageRevisions/abstractions.js";
|
|
6
|
+
import { PageRevisionsCache, WbPageLoadingRepository, WbPageRevisionsLoadingRepository } from "../../../features/pages/shared/abstractions.js";
|
|
7
|
+
import { WbPermissions } from "../../../features/permissions/abstractions.js";
|
|
8
|
+
import { RevisionListPresenter } from "./abstractions.js";
|
|
9
|
+
import { RevisionListPresenter as external_RevisionListPresenter_js_RevisionListPresenter } from "./RevisionListPresenter.js";
|
|
10
|
+
const createRevision = (id, entryId, version, savedOn)=>PageRevision.create({
|
|
11
|
+
id,
|
|
12
|
+
entryId,
|
|
13
|
+
version,
|
|
14
|
+
savedOn,
|
|
15
|
+
status: WbPageStatus.Draft,
|
|
16
|
+
title: `Page ${entryId}`,
|
|
17
|
+
locked: false,
|
|
18
|
+
createdBy: {
|
|
19
|
+
id: "admin",
|
|
20
|
+
displayName: "Admin",
|
|
21
|
+
type: "admin"
|
|
22
|
+
},
|
|
23
|
+
createdOn: savedOn,
|
|
24
|
+
revisionDescription: void 0
|
|
25
|
+
});
|
|
26
|
+
describe("RevisionListPresenter", ()=>{
|
|
27
|
+
const revisionsCache = pageRevisionsCacheFactory.getCache();
|
|
28
|
+
const getPageRevisions = {
|
|
29
|
+
execute: vi.fn().mockResolvedValue([])
|
|
30
|
+
};
|
|
31
|
+
const loadingRepository = {
|
|
32
|
+
isLoading: vi.fn().mockReturnValue(false)
|
|
33
|
+
};
|
|
34
|
+
const pageLoadingRepository = {
|
|
35
|
+
isLoading: vi.fn().mockReturnValue(false)
|
|
36
|
+
};
|
|
37
|
+
const permissions = {
|
|
38
|
+
canEdit: vi.fn().mockReturnValue(true),
|
|
39
|
+
canDelete: vi.fn().mockReturnValue(true),
|
|
40
|
+
canPublish: vi.fn().mockReturnValue(true),
|
|
41
|
+
canUnpublish: vi.fn().mockReturnValue(true)
|
|
42
|
+
};
|
|
43
|
+
const createPresenter = ()=>{
|
|
44
|
+
const container = new Container();
|
|
45
|
+
container.registerInstance(PageRevisionsCache, revisionsCache);
|
|
46
|
+
container.registerInstance(WbPageRevisionsLoadingRepository, loadingRepository);
|
|
47
|
+
container.registerInstance(WbPageLoadingRepository, pageLoadingRepository);
|
|
48
|
+
container.registerInstance(WbPermissions, permissions);
|
|
49
|
+
container.registerInstance(GetPageRevisionsUseCase, getPageRevisions);
|
|
50
|
+
container.register(external_RevisionListPresenter_js_RevisionListPresenter).inSingletonScope();
|
|
51
|
+
return container.resolve(RevisionListPresenter);
|
|
52
|
+
};
|
|
53
|
+
beforeEach(()=>{
|
|
54
|
+
vi.clearAllMocks();
|
|
55
|
+
loadingRepository.isLoading.mockReturnValue(false);
|
|
56
|
+
pageLoadingRepository.isLoading.mockReturnValue(false);
|
|
57
|
+
permissions.canEdit.mockReturnValue(true);
|
|
58
|
+
permissions.canDelete.mockReturnValue(true);
|
|
59
|
+
permissions.canPublish.mockReturnValue(true);
|
|
60
|
+
permissions.canUnpublish.mockReturnValue(true);
|
|
61
|
+
revisionsCache.clear();
|
|
62
|
+
});
|
|
63
|
+
it("should fetch the revisions when initialized", ()=>{
|
|
64
|
+
const presenter = createPresenter();
|
|
65
|
+
presenter.init({
|
|
66
|
+
entryId: "page-1"
|
|
67
|
+
});
|
|
68
|
+
expect(getPageRevisions.execute).toHaveBeenCalledTimes(1);
|
|
69
|
+
expect(getPageRevisions.execute).toHaveBeenCalledWith({
|
|
70
|
+
entryId: "page-1"
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
it("should not refetch the revisions when initialized with the same entry", ()=>{
|
|
74
|
+
const presenter = createPresenter();
|
|
75
|
+
presenter.init({
|
|
76
|
+
entryId: "page-1"
|
|
77
|
+
});
|
|
78
|
+
presenter.init({
|
|
79
|
+
entryId: "page-1"
|
|
80
|
+
});
|
|
81
|
+
expect(getPageRevisions.execute).toHaveBeenCalledTimes(1);
|
|
82
|
+
presenter.init({
|
|
83
|
+
entryId: "page-2"
|
|
84
|
+
});
|
|
85
|
+
expect(getPageRevisions.execute).toHaveBeenCalledTimes(2);
|
|
86
|
+
});
|
|
87
|
+
it("should only expose the revisions of the current page, newest first", ()=>{
|
|
88
|
+
const presenter = createPresenter();
|
|
89
|
+
revisionsCache.addItems([
|
|
90
|
+
createRevision("page-1#0001", "page-1", 1, "2026-09-20T00:00:00.000Z"),
|
|
91
|
+
createRevision("page-1#0002", "page-1", 2, "2026-09-22T00:00:00.000Z"),
|
|
92
|
+
createRevision("page-2#0001", "page-2", 1, "2026-09-21T00:00:00.000Z")
|
|
93
|
+
]);
|
|
94
|
+
presenter.init({
|
|
95
|
+
entryId: "page-1"
|
|
96
|
+
});
|
|
97
|
+
expect(presenter.vm.revisions.map((item)=>item.revision.id)).toEqual([
|
|
98
|
+
"page-1#0002",
|
|
99
|
+
"page-1#0001"
|
|
100
|
+
]);
|
|
101
|
+
expect(presenter.vm.isEmpty).toBeFalse();
|
|
102
|
+
});
|
|
103
|
+
it("should not report an empty list while loading", ()=>{
|
|
104
|
+
loadingRepository.isLoading.mockReturnValue(true);
|
|
105
|
+
const presenter = createPresenter();
|
|
106
|
+
presenter.init({
|
|
107
|
+
entryId: "page-1"
|
|
108
|
+
});
|
|
109
|
+
expect(presenter.vm.revisions).toBeEmpty();
|
|
110
|
+
expect(presenter.vm.isLoading).toBeTrue();
|
|
111
|
+
expect(presenter.vm.isEmpty).toBeFalse();
|
|
112
|
+
});
|
|
113
|
+
it("should report a mutation in progress", ()=>{
|
|
114
|
+
pageLoadingRepository.isLoading.mockImplementation((action)=>"CREATE_REVISION_FROM" === action);
|
|
115
|
+
const presenter = createPresenter();
|
|
116
|
+
presenter.init({
|
|
117
|
+
entryId: "page-1"
|
|
118
|
+
});
|
|
119
|
+
expect(presenter.vm.isMutating).toBeTrue();
|
|
120
|
+
});
|
|
121
|
+
it.each([
|
|
122
|
+
"PUBLISH",
|
|
123
|
+
"UNPUBLISH",
|
|
124
|
+
"DELETE"
|
|
125
|
+
])("should not report a mutation for %s, which is confirmed through a dialog", (action)=>{
|
|
126
|
+
pageLoadingRepository.isLoading.mockImplementation((a)=>a === action);
|
|
127
|
+
const presenter = createPresenter();
|
|
128
|
+
presenter.init({
|
|
129
|
+
entryId: "page-1"
|
|
130
|
+
});
|
|
131
|
+
expect(presenter.vm.isMutating).toBeFalse();
|
|
132
|
+
});
|
|
133
|
+
it("should not report a mutation for unrelated page actions", ()=>{
|
|
134
|
+
pageLoadingRepository.isLoading.mockImplementation((action)=>"LIST" === action);
|
|
135
|
+
const presenter = createPresenter();
|
|
136
|
+
presenter.init({
|
|
137
|
+
entryId: "page-1"
|
|
138
|
+
});
|
|
139
|
+
expect(presenter.vm.isMutating).toBeFalse();
|
|
140
|
+
});
|
|
141
|
+
it("should reflect a status change made through the cache", ()=>{
|
|
142
|
+
const presenter = createPresenter();
|
|
143
|
+
revisionsCache.addItems([
|
|
144
|
+
createRevision("page-1#0001", "page-1", 1, "2026-09-20T00:00:00.000Z")
|
|
145
|
+
]);
|
|
146
|
+
presenter.init({
|
|
147
|
+
entryId: "page-1"
|
|
148
|
+
});
|
|
149
|
+
expect(presenter.vm.revisions[0].revision.status).toEqual(WbPageStatus.Draft);
|
|
150
|
+
revisionsCache.updateItems((revision)=>"page-1#0001" === revision.id ? revision.withStatus(WbPageStatus.Unpublished) : revision);
|
|
151
|
+
expect(presenter.vm.revisions[0].revision.status).toEqual(WbPageStatus.Unpublished);
|
|
152
|
+
expect(getPageRevisions.execute).toHaveBeenCalledTimes(1);
|
|
153
|
+
});
|
|
154
|
+
describe("capabilities", ()=>{
|
|
155
|
+
const initWith = (status, locked = false)=>{
|
|
156
|
+
const revision = PageRevision.create({
|
|
157
|
+
id: "page-1#0001",
|
|
158
|
+
entryId: "page-1",
|
|
159
|
+
version: 1,
|
|
160
|
+
status,
|
|
161
|
+
locked,
|
|
162
|
+
savedOn: "2026-09-20T00:00:00.000Z",
|
|
163
|
+
title: "Page 1",
|
|
164
|
+
createdBy: {
|
|
165
|
+
id: "admin",
|
|
166
|
+
displayName: "Admin",
|
|
167
|
+
type: "admin"
|
|
168
|
+
},
|
|
169
|
+
createdOn: "2026-09-20T00:00:00.000Z",
|
|
170
|
+
revisionDescription: void 0
|
|
171
|
+
});
|
|
172
|
+
revisionsCache.addItems([
|
|
173
|
+
revision
|
|
174
|
+
]);
|
|
175
|
+
const presenter = createPresenter();
|
|
176
|
+
presenter.init({
|
|
177
|
+
entryId: "page-1"
|
|
178
|
+
});
|
|
179
|
+
return presenter.vm.revisions[0];
|
|
180
|
+
};
|
|
181
|
+
it("should allow publishing a draft, but not unpublishing it", ()=>{
|
|
182
|
+
const item = initWith(WbPageStatus.Draft);
|
|
183
|
+
expect(item.canPublish).toBeTrue();
|
|
184
|
+
expect(item.canUnpublish).toBeFalse();
|
|
185
|
+
});
|
|
186
|
+
it("should allow unpublishing a published revision, but not publishing it again", ()=>{
|
|
187
|
+
const item = initWith(WbPageStatus.Published);
|
|
188
|
+
expect(item.canPublish).toBeFalse();
|
|
189
|
+
expect(item.canUnpublish).toBeTrue();
|
|
190
|
+
});
|
|
191
|
+
it("should not allow editing a locked revision", ()=>{
|
|
192
|
+
const item = initWith(WbPageStatus.Unpublished, true);
|
|
193
|
+
expect(item.canEdit).toBeFalse();
|
|
194
|
+
expect(item.canCreateFrom).toBeTrue();
|
|
195
|
+
});
|
|
196
|
+
it("should allow deleting a locked revision, matching the API", ()=>{
|
|
197
|
+
const item = initWith(WbPageStatus.Published, true);
|
|
198
|
+
expect(item.canDelete).toBeTrue();
|
|
199
|
+
});
|
|
200
|
+
it("should respect the permissions", ()=>{
|
|
201
|
+
permissions.canEdit.mockReturnValue(false);
|
|
202
|
+
permissions.canDelete.mockReturnValue(false);
|
|
203
|
+
permissions.canPublish.mockReturnValue(false);
|
|
204
|
+
const item = initWith(WbPageStatus.Draft);
|
|
205
|
+
expect(item.canCreateFrom).toBeFalse();
|
|
206
|
+
expect(item.canEdit).toBeFalse();
|
|
207
|
+
expect(item.canPublish).toBeFalse();
|
|
208
|
+
expect(item.canDelete).toBeFalse();
|
|
209
|
+
});
|
|
210
|
+
it("should check delete permission against the revision itself", ()=>{
|
|
211
|
+
initWith(WbPageStatus.Draft);
|
|
212
|
+
expect(permissions.canDelete).toHaveBeenCalledWith("page", expect.objectContaining({
|
|
213
|
+
id: "page-1#0001"
|
|
214
|
+
}));
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
});
|
|
218
|
+
|
|
219
|
+
//# sourceMappingURL=RevisionListPresenter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"presentation/pages/RevisionList/RevisionListPresenter.test.js","sources":["../../../../src/presentation/pages/RevisionList/RevisionListPresenter.test.ts"],"sourcesContent":["import { describe, it, expect, beforeEach, vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { WbPageStatus, type WbStatus } from \"~/constants.js\";\nimport { PageRevision, pageRevisionsCacheFactory } from \"~/domain/PageRevision/index.js\";\nimport { GetPageRevisionsUseCase } from \"~/features/pages/getPageRevisions/abstractions.js\";\nimport {\n PageRevisionsCache,\n WbPageLoadingRepository,\n WbPageRevisionsLoadingRepository\n} from \"~/features/pages/shared/abstractions.js\";\nimport { WbPermissions } from \"~/features/permissions/abstractions.js\";\nimport { RevisionListPresenter as PresenterAbstraction } from \"./abstractions.js\";\nimport { RevisionListPresenter } from \"./RevisionListPresenter.js\";\n\nconst createRevision = (id: string, entryId: string, version: number, savedOn: string) => {\n return PageRevision.create({\n id,\n entryId,\n version,\n savedOn,\n status: WbPageStatus.Draft,\n title: `Page ${entryId}`,\n locked: false,\n createdBy: { id: \"admin\", displayName: \"Admin\", type: \"admin\" },\n createdOn: savedOn,\n revisionDescription: undefined\n });\n};\n\ndescribe(\"RevisionListPresenter\", () => {\n const revisionsCache = pageRevisionsCacheFactory.getCache();\n\n const getPageRevisions = {\n execute: vi.fn().mockResolvedValue([])\n };\n\n const loadingRepository = {\n isLoading: vi.fn().mockReturnValue(false)\n };\n\n const pageLoadingRepository = {\n isLoading: vi.fn().mockReturnValue(false)\n };\n\n const permissions = {\n canEdit: vi.fn().mockReturnValue(true),\n canDelete: vi.fn().mockReturnValue(true),\n canPublish: vi.fn().mockReturnValue(true),\n canUnpublish: vi.fn().mockReturnValue(true)\n };\n\n const createPresenter = () => {\n const container = new Container();\n container.registerInstance(PageRevisionsCache, revisionsCache);\n container.registerInstance(\n WbPageRevisionsLoadingRepository,\n loadingRepository as unknown as WbPageRevisionsLoadingRepository.Interface\n );\n container.registerInstance(\n WbPageLoadingRepository,\n pageLoadingRepository as unknown as WbPageLoadingRepository.Interface\n );\n container.registerInstance(\n WbPermissions,\n permissions as unknown as WbPermissions.Interface\n );\n container.registerInstance(GetPageRevisionsUseCase, getPageRevisions);\n container.register(RevisionListPresenter).inSingletonScope();\n\n return container.resolve(PresenterAbstraction);\n };\n\n beforeEach(() => {\n vi.clearAllMocks();\n loadingRepository.isLoading.mockReturnValue(false);\n pageLoadingRepository.isLoading.mockReturnValue(false);\n permissions.canEdit.mockReturnValue(true);\n permissions.canDelete.mockReturnValue(true);\n permissions.canPublish.mockReturnValue(true);\n permissions.canUnpublish.mockReturnValue(true);\n revisionsCache.clear();\n });\n\n it(\"should fetch the revisions when initialized\", () => {\n const presenter = createPresenter();\n\n presenter.init({ entryId: \"page-1\" });\n\n expect(getPageRevisions.execute).toHaveBeenCalledTimes(1);\n expect(getPageRevisions.execute).toHaveBeenCalledWith({ entryId: \"page-1\" });\n });\n\n it(\"should not refetch the revisions when initialized with the same entry\", () => {\n const presenter = createPresenter();\n\n presenter.init({ entryId: \"page-1\" });\n presenter.init({ entryId: \"page-1\" });\n\n expect(getPageRevisions.execute).toHaveBeenCalledTimes(1);\n\n presenter.init({ entryId: \"page-2\" });\n\n expect(getPageRevisions.execute).toHaveBeenCalledTimes(2);\n });\n\n it(\"should only expose the revisions of the current page, newest first\", () => {\n const presenter = createPresenter();\n\n revisionsCache.addItems([\n createRevision(\"page-1#0001\", \"page-1\", 1, \"2026-09-20T00:00:00.000Z\"),\n createRevision(\"page-1#0002\", \"page-1\", 2, \"2026-09-22T00:00:00.000Z\"),\n createRevision(\"page-2#0001\", \"page-2\", 1, \"2026-09-21T00:00:00.000Z\")\n ]);\n\n presenter.init({ entryId: \"page-1\" });\n\n expect(presenter.vm.revisions.map(item => item.revision.id)).toEqual([\n \"page-1#0002\",\n \"page-1#0001\"\n ]);\n expect(presenter.vm.isEmpty).toBeFalse();\n });\n\n it(\"should not report an empty list while loading\", () => {\n loadingRepository.isLoading.mockReturnValue(true);\n const presenter = createPresenter();\n\n presenter.init({ entryId: \"page-1\" });\n\n expect(presenter.vm.revisions).toBeEmpty();\n expect(presenter.vm.isLoading).toBeTrue();\n expect(presenter.vm.isEmpty).toBeFalse();\n });\n\n it(\"should report a mutation in progress\", () => {\n pageLoadingRepository.isLoading.mockImplementation(\n action => action === \"CREATE_REVISION_FROM\"\n );\n const presenter = createPresenter();\n\n presenter.init({ entryId: \"page-1\" });\n\n expect(presenter.vm.isMutating).toBeTrue();\n });\n\n it.each([\"PUBLISH\", \"UNPUBLISH\", \"DELETE\"])(\n \"should not report a mutation for %s, which is confirmed through a dialog\",\n action => {\n // Those dialogs show their own loader, so a second one on the drawer is just noise.\n pageLoadingRepository.isLoading.mockImplementation(a => a === action);\n const presenter = createPresenter();\n\n presenter.init({ entryId: \"page-1\" });\n\n expect(presenter.vm.isMutating).toBeFalse();\n }\n );\n\n it(\"should not report a mutation for unrelated page actions\", () => {\n // The \"WbPage\" namespace is shared with the pages table.\n pageLoadingRepository.isLoading.mockImplementation(action => action === \"LIST\");\n const presenter = createPresenter();\n\n presenter.init({ entryId: \"page-1\" });\n\n expect(presenter.vm.isMutating).toBeFalse();\n });\n\n it(\"should reflect a status change made through the cache\", () => {\n // The revisions menu and the drawer share this presenter, so a mutation made in one of\n // them must be visible in the other without a refetch.\n const presenter = createPresenter();\n\n revisionsCache.addItems([\n createRevision(\"page-1#0001\", \"page-1\", 1, \"2026-09-20T00:00:00.000Z\")\n ]);\n\n presenter.init({ entryId: \"page-1\" });\n\n expect(presenter.vm.revisions[0].revision.status).toEqual(WbPageStatus.Draft);\n\n revisionsCache.updateItems(revision =>\n revision.id === \"page-1#0001\" ? revision.withStatus(WbPageStatus.Unpublished) : revision\n );\n\n expect(presenter.vm.revisions[0].revision.status).toEqual(WbPageStatus.Unpublished);\n expect(getPageRevisions.execute).toHaveBeenCalledTimes(1);\n });\n\n describe(\"capabilities\", () => {\n const initWith = (status: WbStatus, locked = false) => {\n const revision = PageRevision.create({\n id: \"page-1#0001\",\n entryId: \"page-1\",\n version: 1,\n status,\n locked,\n savedOn: \"2026-09-20T00:00:00.000Z\",\n title: \"Page 1\",\n createdBy: { id: \"admin\", displayName: \"Admin\", type: \"admin\" },\n createdOn: \"2026-09-20T00:00:00.000Z\",\n revisionDescription: undefined\n });\n revisionsCache.addItems([revision]);\n\n const presenter = createPresenter();\n presenter.init({ entryId: \"page-1\" });\n return presenter.vm.revisions[0];\n };\n\n it(\"should allow publishing a draft, but not unpublishing it\", () => {\n const item = initWith(WbPageStatus.Draft);\n\n expect(item.canPublish).toBeTrue();\n expect(item.canUnpublish).toBeFalse();\n });\n\n it(\"should allow unpublishing a published revision, but not publishing it again\", () => {\n const item = initWith(WbPageStatus.Published);\n\n expect(item.canPublish).toBeFalse();\n expect(item.canUnpublish).toBeTrue();\n });\n\n it(\"should not allow editing a locked revision\", () => {\n const item = initWith(WbPageStatus.Unpublished, true);\n\n expect(item.canEdit).toBeFalse();\n // Creating a new revision from a locked one is still fine.\n expect(item.canCreateFrom).toBeTrue();\n });\n\n it(\"should allow deleting a locked revision, matching the API\", () => {\n const item = initWith(WbPageStatus.Published, true);\n\n expect(item.canDelete).toBeTrue();\n });\n\n it(\"should respect the permissions\", () => {\n permissions.canEdit.mockReturnValue(false);\n permissions.canDelete.mockReturnValue(false);\n permissions.canPublish.mockReturnValue(false);\n\n const item = initWith(WbPageStatus.Draft);\n\n expect(item.canCreateFrom).toBeFalse();\n expect(item.canEdit).toBeFalse();\n expect(item.canPublish).toBeFalse();\n expect(item.canDelete).toBeFalse();\n });\n\n it(\"should check delete permission against the revision itself\", () => {\n initWith(WbPageStatus.Draft);\n\n // Ownership is per revision, so the row must be passed to the permission check.\n expect(permissions.canDelete).toHaveBeenCalledWith(\n \"page\",\n expect.objectContaining({ id: \"page-1#0001\" })\n );\n });\n });\n});\n"],"names":["createRevision","id","entryId","version","savedOn","PageRevision","WbPageStatus","undefined","describe","revisionsCache","pageRevisionsCacheFactory","getPageRevisions","vi","loadingRepository","pageLoadingRepository","permissions","createPresenter","container","Container","PageRevisionsCache","WbPageRevisionsLoadingRepository","WbPageLoadingRepository","WbPermissions","GetPageRevisionsUseCase","RevisionListPresenter","PresenterAbstraction","beforeEach","it","presenter","expect","item","action","a","revision","initWith","status","locked"],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type { PageRevision } from "../../../domain/PageRevision/PageRevision.js";
|
|
2
|
+
export interface IRevisionListPresenterInit {
|
|
3
|
+
entryId: string;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* A revision plus what may be done to it. Capabilities are part of the view model so that the
|
|
7
|
+
* view never derives policy, and so that other apps can restrict actions by decorating this
|
|
8
|
+
* presenter instead of the individual menu items.
|
|
9
|
+
*/
|
|
10
|
+
export interface IRevisionListItemVm {
|
|
11
|
+
revision: PageRevision;
|
|
12
|
+
canCreateFrom: boolean;
|
|
13
|
+
canEdit: boolean;
|
|
14
|
+
canPublish: boolean;
|
|
15
|
+
canUnpublish: boolean;
|
|
16
|
+
canDelete: boolean;
|
|
17
|
+
}
|
|
18
|
+
export interface IRevisionListVm {
|
|
19
|
+
revisions: IRevisionListItemVm[];
|
|
20
|
+
isLoading: boolean;
|
|
21
|
+
isMutating: boolean;
|
|
22
|
+
isEmpty: boolean;
|
|
23
|
+
}
|
|
24
|
+
export interface IRevisionListPresenter {
|
|
25
|
+
init(params: IRevisionListPresenterInit): void;
|
|
26
|
+
vm: IRevisionListVm;
|
|
27
|
+
}
|
|
28
|
+
export declare const RevisionListPresenter: import("@webiny/di").Abstraction<IRevisionListPresenter>;
|
|
29
|
+
export declare namespace RevisionListPresenter {
|
|
30
|
+
type Interface = IRevisionListPresenter;
|
|
31
|
+
type Init = IRevisionListPresenterInit;
|
|
32
|
+
type ViewModel = IRevisionListVm;
|
|
33
|
+
type ItemViewModel = IRevisionListItemVm;
|
|
34
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"presentation/pages/RevisionList/abstractions.js","sources":["../../../../src/presentation/pages/RevisionList/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { PageRevision } from \"~/domain/PageRevision/PageRevision.js\";\n\nexport interface IRevisionListPresenterInit {\n entryId: string;\n}\n\n/**\n * A revision plus what may be done to it. Capabilities are part of the view model so that the\n * view never derives policy, and so that other apps can restrict actions by decorating this\n * presenter instead of the individual menu items.\n */\nexport interface IRevisionListItemVm {\n revision: PageRevision;\n canCreateFrom: boolean;\n canEdit: boolean;\n canPublish: boolean;\n canUnpublish: boolean;\n canDelete: boolean;\n}\n\nexport interface IRevisionListVm {\n revisions: IRevisionListItemVm[];\n isLoading: boolean;\n isMutating: boolean;\n isEmpty: boolean;\n}\n\nexport interface IRevisionListPresenter {\n init(params: IRevisionListPresenterInit): void;\n vm: IRevisionListVm;\n}\n\nexport const RevisionListPresenter = createAbstraction<IRevisionListPresenter>(\n \"WebsiteBuilder/RevisionListPresenter\"\n);\n\nexport namespace RevisionListPresenter {\n export type Interface = IRevisionListPresenter;\n export type Init = IRevisionListPresenterInit;\n export type ViewModel = IRevisionListVm;\n export type ItemViewModel = IRevisionListItemVm;\n}\n"],"names":["RevisionListPresenter","createAbstraction"],"mappings":";AAiCO,MAAMA,wBAAwBC,kBACjC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { createFeature } from "@webiny/feature/admin";
|
|
2
|
+
import { RevisionListPresenter } from "./abstractions.js";
|
|
3
|
+
import { RevisionListPresenter as external_RevisionListPresenter_js_RevisionListPresenter } from "./RevisionListPresenter.js";
|
|
4
|
+
const RevisionListFeature = createFeature({
|
|
5
|
+
name: "WebsiteBuilder/RevisionList",
|
|
6
|
+
register (container) {
|
|
7
|
+
container.register(external_RevisionListPresenter_js_RevisionListPresenter).inSingletonScope();
|
|
8
|
+
},
|
|
9
|
+
resolve (container) {
|
|
10
|
+
return {
|
|
11
|
+
presenter: container.resolve(RevisionListPresenter)
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
});
|
|
15
|
+
export { RevisionListFeature };
|
|
16
|
+
|
|
17
|
+
//# sourceMappingURL=feature.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"presentation/pages/RevisionList/feature.js","sources":["../../../../src/presentation/pages/RevisionList/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/admin\";\nimport { RevisionListPresenter as PresenterAbstraction } from \"./abstractions.js\";\nimport { RevisionListPresenter } from \"./RevisionListPresenter.js\";\n\nexport const RevisionListFeature = createFeature({\n name: \"WebsiteBuilder/RevisionList\",\n register(container) {\n container.register(RevisionListPresenter).inSingletonScope();\n },\n resolve(container) {\n return { presenter: container.resolve(PresenterAbstraction) };\n }\n});\n"],"names":["RevisionListFeature","createFeature","container","RevisionListPresenter","PresenterAbstraction"],"mappings":";;;AAIO,MAAMA,sBAAsBC,cAAc;IAC7C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,yDAAuB,gBAAgB;IAC9D;IACA,SAAQD,SAAS;QACb,OAAO;YAAE,WAAWA,UAAU,OAAO,CAACE;QAAsB;IAChE;AACJ"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { RevisionListFeature } from "./feature.js";
|
|
@@ -7,7 +7,7 @@ class RedirectListDataSource extends FolderAwareDataSource {
|
|
|
7
7
|
}), this.listRedirectsUseCase = listRedirectsUseCase, this.cache = cache;
|
|
8
8
|
}
|
|
9
9
|
get rows() {
|
|
10
|
-
return this.queryMatcher.
|
|
10
|
+
return this.queryMatcher.select(this.cache.getItems());
|
|
11
11
|
}
|
|
12
12
|
async fetch(params) {
|
|
13
13
|
return this.listRedirectsUseCase.execute({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presentation/redirects/RedirectList/RedirectListDataSource.js","sources":["../../../../src/presentation/redirects/RedirectList/RedirectListDataSource.ts"],"sourcesContent":["import { FolderAwareDataSource } from \"@webiny/app-admin/presentation/listPresenter/FolderAwareDataSource.js\";\nimport type {\n FetchParams,\n FetchResult\n} from \"@webiny/app-admin/presentation/listPresenter/FolderAwareDataSource.js\";\nimport type { IListRedirectsUseCase } from \"~/features/redirects/listRedirects/abstractions.js\";\nimport type { IGetDescendantFoldersUseCase } from \"@webiny/app-aco/features/folders/getDescendantFolders/abstractions.js\";\nimport type { IListCache } from \"@webiny/app-admin/features/listCache/index.js\";\nimport type { Redirect } from \"~/domain/Redirect/Redirect.js\";\n\nexport class RedirectListDataSource extends FolderAwareDataSource<Redirect> {\n constructor(\n private listRedirectsUseCase: IListRedirectsUseCase,\n private cache: IListCache<Redirect>,\n getDescendantFoldersUseCase?: IGetDescendantFoldersUseCase\n ) {\n super({\n keyField: \"id\",\n getDescendantFolders: getDescendantFoldersUseCase\n });\n }\n\n get rows(): Redirect[] {\n return this.queryMatcher.
|
|
1
|
+
{"version":3,"file":"presentation/redirects/RedirectList/RedirectListDataSource.js","sources":["../../../../src/presentation/redirects/RedirectList/RedirectListDataSource.ts"],"sourcesContent":["import { FolderAwareDataSource } from \"@webiny/app-admin/presentation/listPresenter/FolderAwareDataSource.js\";\nimport type {\n FetchParams,\n FetchResult\n} from \"@webiny/app-admin/presentation/listPresenter/FolderAwareDataSource.js\";\nimport type { IListRedirectsUseCase } from \"~/features/redirects/listRedirects/abstractions.js\";\nimport type { IGetDescendantFoldersUseCase } from \"@webiny/app-aco/features/folders/getDescendantFolders/abstractions.js\";\nimport type { IListCache } from \"@webiny/app-admin/features/listCache/index.js\";\nimport type { Redirect } from \"~/domain/Redirect/Redirect.js\";\n\nexport class RedirectListDataSource extends FolderAwareDataSource<Redirect> {\n constructor(\n private listRedirectsUseCase: IListRedirectsUseCase,\n private cache: IListCache<Redirect>,\n getDescendantFoldersUseCase?: IGetDescendantFoldersUseCase\n ) {\n super({\n keyField: \"id\",\n getDescendantFolders: getDescendantFoldersUseCase\n });\n }\n\n get rows(): Redirect[] {\n return this.queryMatcher.select(this.cache.getItems());\n }\n\n async fetch(params: FetchParams): Promise<FetchResult<Redirect>> {\n return this.listRedirectsUseCase.execute({\n search: params.search,\n where: params.where,\n sort: params.sort,\n limit: params.limit,\n after: params.after\n });\n }\n}\n"],"names":["RedirectListDataSource","FolderAwareDataSource","listRedirectsUseCase","cache","getDescendantFoldersUseCase","params"],"mappings":";AAUO,MAAMA,+BAA+BC;IACxC,YACYC,oBAA2C,EAC3CC,KAA2B,EACnCC,2BAA0D,CAC5D;QACE,KAAK,CAAC;YACF,UAAU;YACV,sBAAsBA;QAC1B,SAPQF,oBAAoB,GAApBA,sBAAAA,IAAAA,CACAC,KAAK,GAALA;IAOZ;IAEA,IAAI,OAAmB;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ;IACvD;IAEA,MAAM,MAAME,MAAmB,EAAkC;QAC7D,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YACrC,QAAQA,OAAO,MAAM;YACrB,OAAOA,OAAO,KAAK;YACnB,MAAMA,OAAO,IAAI;YACjB,OAAOA,OAAO,KAAK;YACnB,OAAOA,OAAO,KAAK;QACvB;IACJ;AACJ"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { observable } from "mobx";
|
|
3
|
+
import { Container } from "@webiny/di";
|
|
4
|
+
import { ListCache } from "@webiny/app-admin/features/listCache/index.js";
|
|
5
|
+
import { ListPresenter } from "@webiny/app-admin/presentation/listPresenter/ListPresenter.js";
|
|
6
|
+
import { FolderTreePresenter } from "@webiny/app-aco/presentation/folderTree/abstractions.js";
|
|
7
|
+
import { GetDescendantFoldersUseCase } from "@webiny/app-aco/features/folders/getDescendantFolders/abstractions.js";
|
|
8
|
+
import { Redirect } from "../../../domain/Redirect/Redirect.js";
|
|
9
|
+
import { RedirectsListCache } from "../../../features/redirects/shared/abstractions.js";
|
|
10
|
+
import { ListRedirectsGateway } from "../../../features/redirects/listRedirects/abstractions.js";
|
|
11
|
+
import { ListRedirectsUseCase } from "../../../features/redirects/listRedirects/ListRedirectsUseCase.js";
|
|
12
|
+
import { ListRedirectsRepository } from "../../../features/redirects/listRedirects/ListRedirectsRepository.js";
|
|
13
|
+
import { CreateRedirectGateway, CreateRedirectUseCase } from "../../../features/redirects/createRedirect/abstractions.js";
|
|
14
|
+
import { CreateRedirectUseCase as CreateRedirectUseCase_js_CreateRedirectUseCase } from "../../../features/redirects/createRedirect/CreateRedirectUseCase.js";
|
|
15
|
+
import { CreateRedirectRepository } from "../../../features/redirects/createRedirect/CreateRedirectRepository.js";
|
|
16
|
+
import { UpdateRedirectGateway, UpdateRedirectUseCase } from "../../../features/redirects/updateRedirect/abstractions.js";
|
|
17
|
+
import { UpdateRedirectUseCase as UpdateRedirectUseCase_js_UpdateRedirectUseCase } from "../../../features/redirects/updateRedirect/UpdateRedirectUseCase.js";
|
|
18
|
+
import { UpdateRedirectRepository } from "../../../features/redirects/updateRedirect/UpdateRedirectRepository.js";
|
|
19
|
+
import { CreateRedirectPresenter, EditRedirectPresenter, RedirectListPresenter } from "./abstractions.js";
|
|
20
|
+
import { RedirectListPresenter as external_RedirectListPresenter_js_RedirectListPresenter } from "./RedirectListPresenter.js";
|
|
21
|
+
const TOTAL_REDIRECTS = 120;
|
|
22
|
+
const PAGE_SIZE = 50;
|
|
23
|
+
const BASE_TIME = Date.UTC(2026, 0, 1);
|
|
24
|
+
const minutes = (n)=>new Date(BASE_TIME + 60000 * n).toISOString();
|
|
25
|
+
function createRedirects(count) {
|
|
26
|
+
return Array.from({
|
|
27
|
+
length: count
|
|
28
|
+
}, (_, i)=>Redirect.create({
|
|
29
|
+
id: `redirect-${i}`,
|
|
30
|
+
location: {
|
|
31
|
+
folderId: "root"
|
|
32
|
+
},
|
|
33
|
+
redirectFrom: `/from-${i}`,
|
|
34
|
+
redirectTo: `/to-${i}`,
|
|
35
|
+
redirectType: "permanent",
|
|
36
|
+
isEnabled: i % 2 === 0,
|
|
37
|
+
createdOn: minutes(i),
|
|
38
|
+
savedOn: minutes(count - i)
|
|
39
|
+
}));
|
|
40
|
+
}
|
|
41
|
+
function sortRedirects(redirects, sort = "createdOn_DESC") {
|
|
42
|
+
const [field, direction] = sort.split("_");
|
|
43
|
+
const multiplier = "ASC" === direction ? 1 : -1;
|
|
44
|
+
return [
|
|
45
|
+
...redirects
|
|
46
|
+
].sort((a, b)=>{
|
|
47
|
+
const left = String(a[field]);
|
|
48
|
+
const right = String(b[field]);
|
|
49
|
+
return left === right ? 0 : multiplier * (left < right ? -1 : 1);
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
function createListGateway(redirects) {
|
|
53
|
+
return {
|
|
54
|
+
execute: vi.fn(async (params)=>{
|
|
55
|
+
const sorted = sortRedirects(redirects, params.sort?.[0]);
|
|
56
|
+
const offset = params.after ? Number(params.after) : 0;
|
|
57
|
+
const limit = params.limit ?? PAGE_SIZE;
|
|
58
|
+
const data = sorted.slice(offset, offset + limit);
|
|
59
|
+
const next = offset + data.length;
|
|
60
|
+
const hasMoreItems = next < sorted.length;
|
|
61
|
+
return {
|
|
62
|
+
data,
|
|
63
|
+
meta: {
|
|
64
|
+
cursor: hasMoreItems ? String(next) : null,
|
|
65
|
+
hasMoreItems,
|
|
66
|
+
totalCount: sorted.length
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
})
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
function createFolderTreePresenter() {
|
|
73
|
+
const vm = observable({
|
|
74
|
+
folders: [],
|
|
75
|
+
tree: [],
|
|
76
|
+
currentFolderId: null,
|
|
77
|
+
currentFolder: null,
|
|
78
|
+
loading: false,
|
|
79
|
+
operation: {
|
|
80
|
+
active: false,
|
|
81
|
+
mode: null
|
|
82
|
+
},
|
|
83
|
+
isRootFolder: true,
|
|
84
|
+
currentFolderTitle: "All redirects",
|
|
85
|
+
childFolders: [],
|
|
86
|
+
loadingNodeIds: []
|
|
87
|
+
});
|
|
88
|
+
return {
|
|
89
|
+
get vm () {
|
|
90
|
+
return vm;
|
|
91
|
+
},
|
|
92
|
+
selectFolder: vi.fn(),
|
|
93
|
+
createFolder: vi.fn(),
|
|
94
|
+
editFolder: vi.fn(),
|
|
95
|
+
deleteFolder: vi.fn().mockResolvedValue(void 0),
|
|
96
|
+
moveFolder: vi.fn().mockResolvedValue(void 0),
|
|
97
|
+
loadChildFolders: vi.fn().mockResolvedValue(void 0),
|
|
98
|
+
canManageStructure: vi.fn().mockReturnValue(true),
|
|
99
|
+
getAncestorIds: vi.fn().mockReturnValue([]),
|
|
100
|
+
submitOperation: vi.fn().mockResolvedValue(true),
|
|
101
|
+
cancelOperation: vi.fn(),
|
|
102
|
+
onFolderChange: vi.fn().mockReturnValue(()=>{})
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
function range(from, to) {
|
|
106
|
+
const step = from <= to ? 1 : -1;
|
|
107
|
+
const ids = [];
|
|
108
|
+
for(let i = from; step > 0 ? i <= to : i >= to; i += step)ids.push(`redirect-${i}`);
|
|
109
|
+
return ids;
|
|
110
|
+
}
|
|
111
|
+
describe("RedirectListPresenter", ()=>{
|
|
112
|
+
let presenter;
|
|
113
|
+
let container;
|
|
114
|
+
let redirects;
|
|
115
|
+
const rowIds = ()=>presenter.vm.list.rows.map((row)=>row.id);
|
|
116
|
+
const waitForQuery = async (field, direction)=>{
|
|
117
|
+
await vi.waitFor(()=>{
|
|
118
|
+
expect(presenter.vm.list.appliedQuery?.sort).toEqual({
|
|
119
|
+
field,
|
|
120
|
+
direction
|
|
121
|
+
});
|
|
122
|
+
expect(presenter.vm.list.pagination.loading).toBe(false);
|
|
123
|
+
});
|
|
124
|
+
};
|
|
125
|
+
const initAndWait = async ()=>{
|
|
126
|
+
presenter.init();
|
|
127
|
+
await waitForQuery("createdOn", "DESC");
|
|
128
|
+
};
|
|
129
|
+
const sortAndWait = async (field, direction)=>{
|
|
130
|
+
presenter.actions.sort.set(field, direction);
|
|
131
|
+
await waitForQuery(field, direction);
|
|
132
|
+
};
|
|
133
|
+
const loadAll = async ()=>{
|
|
134
|
+
while(presenter.vm.list.pagination.hasMore)await presenter.actions.loadMore();
|
|
135
|
+
};
|
|
136
|
+
beforeEach(()=>{
|
|
137
|
+
container = new Container();
|
|
138
|
+
redirects = createRedirects(TOTAL_REDIRECTS);
|
|
139
|
+
container.registerInstance(RedirectsListCache, new ListCache("id"));
|
|
140
|
+
container.registerInstance(ListRedirectsGateway, createListGateway(redirects));
|
|
141
|
+
container.register(ListRedirectsRepository).inSingletonScope();
|
|
142
|
+
container.register(ListRedirectsUseCase);
|
|
143
|
+
container.registerInstance(CreateRedirectGateway, {
|
|
144
|
+
execute: vi.fn(async (params)=>Redirect.create({
|
|
145
|
+
...params,
|
|
146
|
+
id: "redirect-new",
|
|
147
|
+
createdOn: minutes(TOTAL_REDIRECTS + 1),
|
|
148
|
+
savedOn: minutes(TOTAL_REDIRECTS + 1)
|
|
149
|
+
}))
|
|
150
|
+
});
|
|
151
|
+
container.register(CreateRedirectRepository).inSingletonScope();
|
|
152
|
+
container.register(CreateRedirectUseCase_js_CreateRedirectUseCase);
|
|
153
|
+
container.registerInstance(UpdateRedirectGateway, {
|
|
154
|
+
execute: vi.fn(async (params)=>{
|
|
155
|
+
const existing = redirects.find((r)=>r.id === params.id);
|
|
156
|
+
return Redirect.create({
|
|
157
|
+
...existing,
|
|
158
|
+
...params,
|
|
159
|
+
savedOn: minutes(TOTAL_REDIRECTS + 1)
|
|
160
|
+
});
|
|
161
|
+
})
|
|
162
|
+
});
|
|
163
|
+
container.register(UpdateRedirectRepository).inSingletonScope();
|
|
164
|
+
container.register(UpdateRedirectUseCase_js_UpdateRedirectUseCase);
|
|
165
|
+
container.register(ListPresenter);
|
|
166
|
+
container.registerInstance(FolderTreePresenter, createFolderTreePresenter());
|
|
167
|
+
container.registerInstance(GetDescendantFoldersUseCase, {
|
|
168
|
+
execute: ()=>[]
|
|
169
|
+
});
|
|
170
|
+
container.registerInstance(CreateRedirectPresenter, {
|
|
171
|
+
vm: {},
|
|
172
|
+
init: vi.fn(),
|
|
173
|
+
save: vi.fn()
|
|
174
|
+
});
|
|
175
|
+
container.registerInstance(EditRedirectPresenter, {
|
|
176
|
+
vm: {},
|
|
177
|
+
loadRedirect: vi.fn(),
|
|
178
|
+
save: vi.fn()
|
|
179
|
+
});
|
|
180
|
+
container.register(external_RedirectListPresenter_js_RedirectListPresenter);
|
|
181
|
+
presenter = container.resolve(RedirectListPresenter);
|
|
182
|
+
});
|
|
183
|
+
describe("pagination", ()=>{
|
|
184
|
+
it("should show the most recently created redirects first", async ()=>{
|
|
185
|
+
await initAndWait();
|
|
186
|
+
expect(rowIds()).toEqual(range(119, 70));
|
|
187
|
+
});
|
|
188
|
+
it("should append the next batch of redirects to the bottom of the list", async ()=>{
|
|
189
|
+
await initAndWait();
|
|
190
|
+
await presenter.actions.loadMore();
|
|
191
|
+
expect(rowIds()).toEqual(range(119, 20));
|
|
192
|
+
});
|
|
193
|
+
it("should keep all redirects in order after loading everything", async ()=>{
|
|
194
|
+
await initAndWait();
|
|
195
|
+
await loadAll();
|
|
196
|
+
expect(rowIds()).toEqual(range(119, 0));
|
|
197
|
+
});
|
|
198
|
+
});
|
|
199
|
+
describe("changing the sort", ()=>{
|
|
200
|
+
it("should show only the first batch, sorted by the new field", async ()=>{
|
|
201
|
+
await initAndWait();
|
|
202
|
+
await sortAndWait("savedOn", "DESC");
|
|
203
|
+
expect(rowIds()).toEqual(range(0, 49));
|
|
204
|
+
});
|
|
205
|
+
it("should show only the first batch when sorting by a boolean field", async ()=>{
|
|
206
|
+
await initAndWait();
|
|
207
|
+
await sortAndWait("isEnabled", "DESC");
|
|
208
|
+
const expected = sortRedirects(redirects, "isEnabled_DESC").slice(0, PAGE_SIZE).map((r)=>r.id);
|
|
209
|
+
expect(rowIds()).toEqual(expected);
|
|
210
|
+
});
|
|
211
|
+
it("should restore the original order when switching back", async ()=>{
|
|
212
|
+
await initAndWait();
|
|
213
|
+
await presenter.actions.loadMore();
|
|
214
|
+
await sortAndWait("createdOn", "ASC");
|
|
215
|
+
await sortAndWait("createdOn", "DESC");
|
|
216
|
+
expect(rowIds()).toEqual(range(119, 70));
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
describe("local cache changes", ()=>{
|
|
220
|
+
const createRedirect = ()=>container.resolve(CreateRedirectUseCase).execute({
|
|
221
|
+
location: {
|
|
222
|
+
folderId: "root"
|
|
223
|
+
},
|
|
224
|
+
redirectFrom: "/new",
|
|
225
|
+
redirectTo: "/target",
|
|
226
|
+
redirectType: "permanent",
|
|
227
|
+
isEnabled: true
|
|
228
|
+
});
|
|
229
|
+
const updateRedirect = (id)=>{
|
|
230
|
+
const existing = redirects.find((r)=>r.id === id);
|
|
231
|
+
return container.resolve(UpdateRedirectUseCase).execute({
|
|
232
|
+
id,
|
|
233
|
+
redirectFrom: existing.redirectFrom,
|
|
234
|
+
redirectTo: "/changed",
|
|
235
|
+
redirectType: existing.redirectType,
|
|
236
|
+
isEnabled: existing.isEnabled
|
|
237
|
+
});
|
|
238
|
+
};
|
|
239
|
+
it("should show a created redirect at the top when it sorts first", async ()=>{
|
|
240
|
+
await initAndWait();
|
|
241
|
+
await createRedirect();
|
|
242
|
+
expect(rowIds()).toEqual([
|
|
243
|
+
"redirect-new",
|
|
244
|
+
...range(119, 70)
|
|
245
|
+
]);
|
|
246
|
+
});
|
|
247
|
+
it("should not show a created redirect that sorts past the loaded redirects", async ()=>{
|
|
248
|
+
await initAndWait();
|
|
249
|
+
await sortAndWait("createdOn", "ASC");
|
|
250
|
+
await createRedirect();
|
|
251
|
+
expect(rowIds()).toEqual(range(0, 49));
|
|
252
|
+
});
|
|
253
|
+
it("should keep an updated redirect in its position when sorted by createdOn", async ()=>{
|
|
254
|
+
await initAndWait();
|
|
255
|
+
await updateRedirect("redirect-100");
|
|
256
|
+
expect(rowIds()).toEqual(range(119, 70));
|
|
257
|
+
const updated = presenter.vm.list.rows.find((row)=>"redirect-100" === row.id);
|
|
258
|
+
expect(updated?.redirectTo).toBe("/changed");
|
|
259
|
+
});
|
|
260
|
+
it("should move an updated redirect to the top when sorted by savedOn", async ()=>{
|
|
261
|
+
await initAndWait();
|
|
262
|
+
await sortAndWait("savedOn", "DESC");
|
|
263
|
+
await updateRedirect("redirect-30");
|
|
264
|
+
expect(rowIds()).toEqual([
|
|
265
|
+
"redirect-30",
|
|
266
|
+
...range(0, 29),
|
|
267
|
+
...range(31, 49)
|
|
268
|
+
]);
|
|
269
|
+
});
|
|
270
|
+
});
|
|
271
|
+
});
|
|
272
|
+
|
|
273
|
+
//# sourceMappingURL=RedirectListPresenter.test.js.map
|