thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

fix: project pages loader (#3461)

Browse Source
This commit is contained in:
Anmol Singh Bhatia 2024-01-25 12:38:55 +05:30 committed by GitHub
parent f007dcff26
commit 7fd625e0e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/components/pages/pages-list/archived-pages-list.tsx
View File

@ -4,13 +4,20 @@ import { observer } from "mobx-react-lite";
import { PagesListView } from "components/pages/pages-list";
// hooks
// ui
import { Loader } from "@plane/ui";
import { Loader, Spinner } from "@plane/ui";
import { useProjectPages } from "hooks/store/use-project-specific-pages";
export const ArchivedPagesList: FC = observer(() => {
const projectPageStore = useProjectPages();
const { archivedPageIds } = projectPageStore;
const { archivedPageIds, archivedProjectLoader } = projectPageStore;
if (archivedProjectLoader) {
return (
<div className="flex items-center justify-center h-full w-full">
<Spinner />
</div>
);
}
if (!archivedPageIds)
return (
<Loader className="space-y-4">

9
web/store/project-page.store.ts
View File

@ -11,6 +11,7 @@ import { isThisWeek, isToday, isYesterday } from "date-fns";
export interface IProjectPageStore {
loader: boolean;
archivedProjectLoader: boolean;
projectPageMap: Record<string, Record<string, IPageStore>>;
projectArchivedPageMap: Record<string, Record<string, IPageStore>>;
@ -32,6 +33,7 @@ export interface IProjectPageStore {
export class ProjectPageStore implements IProjectPageStore {
loader: boolean = false;
archivedProjectLoader: boolean = false;
projectPageMap: Record<string, Record<string, IPageStore>> = {}; // { projectId: [page1, page2] }
projectArchivedPageMap: Record<string, Record<string, IPageStore>> = {}; // { projectId: [page1, page2] }
@ -42,6 +44,7 @@ export class ProjectPageStore implements IProjectPageStore {
constructor(_rootStore: RootStore) {
makeObservable(this, {
loader: observable.ref,
archivedProjectLoader: observable.ref,
projectPageMap: observable,
projectArchivedPageMap: observable,
@ -180,18 +183,18 @@ export class ProjectPageStore implements IProjectPageStore {
*/
fetchArchivedProjectPages = async (workspaceSlug: string, projectId: string) => {
try {
this.loader = true;
this.archivedProjectLoader = true;
await this.pageService.getArchivedPages(workspaceSlug, projectId).then((response) => {
runInAction(() => {
for (const page of response) {
set(this.projectArchivedPageMap, [projectId, page.id], new PageStore(page, this.rootStore));
}
this.loader = false;
this.archivedProjectLoader = false;
});
return response;
});
} catch (e) {
this.loader = false;
this.archivedProjectLoader = false;
throw e;
}
};