Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions src/application/services/useNavbar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ interface useNavbarComposableState {
*/
patchOpenedPageByUrl: (url: OpenedPage['url'], page: OpenedPage) => void;

/**
* Delete all opened pages excluding Home page
*/
deleteOpenedPages: () => void;

/**
* There would be stored all currently opened pages
*/
Expand Down Expand Up @@ -71,6 +76,13 @@ export default function useNavbar(): useNavbarComposableState {
workspaceService.patchOpenedPageByUrl(url, page);
};

/**
* Delete all opened pages excluding Home page
*/
function deleteOpenedPages(): void {
workspaceService.deleteOpenedPages();
}

/**
* Hook for adding new page to storage when user changes route
*/
Expand Down Expand Up @@ -120,5 +132,6 @@ export default function useNavbar(): useNavbarComposableState {
deleteOpenedPageByUrl,
patchOpenedPageByUrl,
currentOpenedPages,
deleteOpenedPages,
};
}
5 changes: 5 additions & 0 deletions src/domain/workspace.repository.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,9 @@ export default interface WorkspaceRepositoryInterface {
*/
patchOpenedPageByUrl: (url: OpenedPage['url'], page: OpenedPage) => void;

/**
* Delete all opened pages excluding Home page
*/
deleteOpenedPages: () => void;

}
7 changes: 7 additions & 0 deletions src/domain/workspace.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,11 @@ export default class WorkspaceService {
public patchOpenedPageByUrl(url: OpenedPage['url'], page: OpenedPage): void {
this.repository.patchOpenedPageByUrl(url, page);
}

/**
* Delete opened pages excluding Home Page
*/
public deleteOpenedPages(): void {
this.repository.deleteOpenedPages();
}
}
11 changes: 11 additions & 0 deletions src/infrastructure/storage/openedPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,15 @@ export class OpenedPagesStore extends PersistantStore<OpenedPagesStoreData> {
url: currentPage.url };
});
}

/**
* Delete all opened pages excluding Home page
*/
public deleteOpenedPages(): void {
this.data.openedPages?.forEach((currentPage) => {
if (currentPage.url !== '/') {
this.deleteOpenedPageByUrl(currentPage.url);
}
});
}
}
7 changes: 7 additions & 0 deletions src/infrastructure/workspace.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,11 @@ export default class WorkspaceRepository extends Repository<OpenedPagesStore, Op
public patchOpenedPageByUrl(url: OpenedPage['url'], page: OpenedPage): void {
return this.store.patchOpenedPageByUrl(url, page);
}

/**
* Delete all opened pages excluding Home page
*/
public deleteOpenedPages(): void {
this.store.deleteOpenedPages();
}
}
4 changes: 2 additions & 2 deletions src/presentation/pages/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ const { t } = useI18n();
const router = useRouter();
const { logout } = useAuth();
const { removeTool } = useUserSettings();
const { deleteOpenedPageByUrl } = useNavbar();
const { deleteOpenedPages } = useNavbar();
const { themeBase, themeAccent, colorScheme, setBaseTheme, setAccentTheme, setColorScheme } = useTheme();

/**
Expand Down Expand Up @@ -209,7 +209,7 @@ async function userLogout() {
/**
* Delete user opened page
*/
deleteOpenedPageByUrl('/settings');
deleteOpenedPages();

router.replace({ path: '/' });
}
Expand Down