@@ -92,25 +121,42 @@
-
- Open Settings
-
+
- Documentation
-
+
+
- Feedback
-
-
- Issues
-
-
- Restart
-
+
+
@@ -185,7 +231,7 @@ import {useSuggestionsStore} from "src/suggestions/stores/suggestionsStore";
import _ from "lodash";
import {Suggestion, SuggestionState} from "src/suggestions/models/Suggestion";
import SuggestionDialog from "src/suggestions/dialogues/SuggestionDialog.vue";
-import {Tabset} from "src/tabsets/models/Tabset";
+import {Tabset, TabsetStatus} from "src/tabsets/models/Tabset";
import {ToastType} from "src/core/models/Toast";
import SidePanelFooterLeftButtons from "components/helper/SidePanelFooterLeftButtons.vue";
import {useAuthStore} from "stores/authStore";
@@ -206,6 +252,11 @@ import {AddTabToTabsetCommand} from "src/tabsets/commands/AddTabToTabsetCommand"
import {Tab, TabSnippet} from "src/tabsets/models/Tab";
import BrowserApi from "src/app/BrowserApi";
import {useContentStore} from "src/content/stores/contentStore";
+import ContextMenuItem from "src/core/components/helper/ContextMenuItem.vue";
+import {useTabsetsUiStore} from "../tabsets/stores/tabsetsUiStore";
+import {useTabsetService} from "src/tabsets/services/TabsetService2";
+import {MarkTabsetAsFavoriteCommand} from "src/tabsets/commands/MarkTabsetAsFavorite";
+import {MarkTabsetAsDefaultCommand} from "src/tabsets/commands/MarkTabsetAsDefault";
const {handleSuccess, handleError} = useNotificationHandler()
@@ -215,7 +266,6 @@ const $q = useQuasar()
const route = useRoute()
const router = useRouter()
-const authStore = useAuthStore()
const currentChromeTabs = ref
([])
const currentTabs = ref([])
@@ -235,11 +285,32 @@ const animateSettingsButton = ref(false)
const windowHolderRows = ref([])
const windowsToOpenOptions = ref([])
const tabsetsMangedWindows = ref([])
+const lastTabsets = ref[]>([])
onMounted(() => {
windowHolderRows.value = calcWindowHolderRows()
})
+watch(() => useSpacesStore().space, (now: any, before: any) => {
+ console.log(`space switched from ${before?.id} to ${now?.id}`)
+ useTabsetsUiStore().load()
+})
+
+watchEffect(() => {
+ if (useTabsetsUiStore().lastUpdate) {
+ const lastTsIds = useTabsetsUiStore().lastUsedTabsets
+ console.log("got useTabsetsUiStore().lastUpdate", useTabsetsUiStore().lastUpdate, lastTsIds)
+ lastTabsets.value = lastTsIds.map((tsId: string) => {
+ const ts = useTabsetsStore().getTabset(tsId)
+ return {
+ id: ts?.id || "",
+ name: ts?.name || "???",
+ status: ts?.status || TabsetStatus.DEFAULT
+ }
+ })
+ }
+})
+
watchEffect(() => {
const windowId = useWindowsStore().currentChromeWindow?.id || 0
if (useWindowsStore().windowForId(windowId)?.open) {
@@ -299,6 +370,15 @@ watchEffect(() => {
}
})
+const toggleFavorite = (t: Pick) => {
+ if (t.status !== TabsetStatus.FAVORITE) {
+ useCommandExecutor().executeFromUi(new MarkTabsetAsFavoriteCommand(t.id))
+ } else {
+ useCommandExecutor().executeFromUi(new MarkTabsetAsDefaultCommand(t.id))
+ }
+ useTabsetsUiStore().load()
+}
+
const getAdditionalActions = (windowName: string) => {
const additionalActions: WindowAction[] = []
if (!windowIsManaged(windowName)) {
@@ -375,7 +455,7 @@ const settingsTooltip = () => {
const rightButtonClass = () => "q-my-xs q-px-xs q-mr-none"
const dependingOnStates = () =>
- _.find(useSuggestionsStore().getSuggestions([SuggestionState.NEW, SuggestionState.DECISION_DELAYED]), (s:Suggestion) => s.state === SuggestionState.NEW) ? 'warning' : 'primary'
+ _.find(useSuggestionsStore().getSuggestions([SuggestionState.NEW, SuggestionState.DECISION_DELAYED]), (s: Suggestion) => s.state === SuggestionState.NEW) ? 'warning' : 'primary'
const suggestionDialog = () => {
doShowSuggestionButton.value = false
@@ -479,7 +559,7 @@ const calcWindowHolderRows = (): WindowHolder[] => {
const windowIsManaged = (windowName: string) => {
//console.log("managed?", tabsetsMangedWindows.value, windowName)
- return _.find(tabsetsMangedWindows.value, (tmw:any) => tmw['label' as keyof object] === windowName) !== undefined
+ return _.find(tabsetsMangedWindows.value, (tmw: any) => tmw['label' as keyof object] === windowName) !== undefined
}
const saveAsTabset = (windowId: number, name: string) => {
@@ -513,7 +593,7 @@ const drop = (evt: any) => {
const existing: Tab | undefined = useTabsetsStore().tabForUrlInSelectedTabset(currentTabUrl!)
if (existing) {
existing.snippets.push(new TabSnippet(text, html))
- existing.title = "Snippet ("+existing.snippets.length+")"
+ existing.title = "Snippet (" + existing.snippets.length + ")"
const currentTabset = useTabsetsStore().getCurrentTabset
if (currentTabset) {
useTabsetsStore().saveTabset(currentTabset)
diff --git a/src/components/layouts/SearchHit.vue b/src/components/layouts/SearchHit.vue
index 25319534..d42a10ba 100644
--- a/src/components/layouts/SearchHit.vue
+++ b/src/components/layouts/SearchHit.vue
@@ -8,10 +8,10 @@
+ class="rounded-borders"
+ width="16px"
+ height="16px"
+ :src="getFaviconUrl(hit.id, hit.url, hit.favIconUrl)">
@@ -92,10 +92,11 @@ import {ListDetailLevel, useUiStore} from "src/ui/stores/uiStore";
import ShortUrl from "src/core/utils/ShortUrl.vue";
import {FeatureIdent} from "src/app/models/FeatureIdent";
import {useCommandExecutor} from "src/core/services/CommandExecutor";
-import {SelectTabsetCommand} from "src/tabsets/commands/SelectTabset";
+import {SelectTabsetCommand} from "src/tabsets/commands/SelectTabsetCommand";
import {useTabsetsStore} from "src/tabsets/stores/tabsetsStore";
import {useFeaturesStore} from "src/features/stores/featuresStore";
import {useSpacesStore} from "src/spaces/stores/spacesStore";
+import {useTabsetsUiStore} from "src/tabsets/stores/tabsetsUiStore";
const props = defineProps({
hit: {type: Hit, required: true},
@@ -111,7 +112,7 @@ const {selectTabset} = useTabsetService()
const tabsetBadges = (hit: Hit): object[] => {
const badges: object[] = []
- _.forEach(hit.tabsets, (ts:string) => badges.push({
+ _.forEach(hit.tabsets, (ts: string) => badges.push({
label: TabsetService.nameForTabsetId(ts),
tabsetId: ts,
encodedUrl: btoa(hit.url || '')
@@ -144,14 +145,14 @@ const openTabset = (tabsetId: string, encodedUrl: string | undefined = undefined
const openBookmark = (badge: any) => {
console.log("badge", badge)
BookmarksService.expandTreeForBookmarkId(badge.bookmarkId)
- .then(parentId => {
- if (props.inSidePanel) {
- const url = chrome.runtime.getURL("www/index.html#/mainpanel/bookmarks/" + parentId + "?highlight=" + badge.bookmarkId)
- NavigationService.openOrCreateTab([url])
- } else {
- router.push("/bookmarks/" + parentId + "?highlight=" + badge.bookmarkId)
- }
- })
+ .then(parentId => {
+ if (props.inSidePanel) {
+ const url = chrome.runtime.getURL("www/index.html#/mainpanel/bookmarks/" + parentId + "?highlight=" + badge.bookmarkId)
+ NavigationService.openOrCreateTab([url])
+ } else {
+ router.push("/bookmarks/" + parentId + "?highlight=" + badge.bookmarkId)
+ }
+ })
}
const getFaviconUrl = (hitId: string, url: string, favIconUrl: string | undefined) => {
@@ -190,13 +191,14 @@ const open = (hit: Hit) => {
const tabsetId = hit.tabsets[0]
if (useFeaturesStore().hasFeature(FeatureIdent.SPACES)) {
const tabset = useTabsetsStore().getTabset(tabsetId)
- const spaceId = (tabset && tabset.spaces.length > 0) ? tabset.spaces[0] : undefined
+ const spaceId = (tabset && tabset.spaces.length > 0) ? tabset.spaces[0] : undefined
console.log("selecting tabset/space", tabsetId, spaceId)
- useCommandExecutor().execute(new SelectTabsetCommand(tabsetId, spaceId))
useSpacesStore().setSpace(spaceId)
+ useCommandExecutor().execute(new SelectTabsetCommand(tabsetId))
} else {
useCommandExecutor().execute(new SelectTabsetCommand(tabsetId))
}
+ //useTabsetsUiStore().addTabsetToLastUsedList(tabsetId)
openTabset(tabsetId)
} else {
NavigationService.openOrCreateTab([hit.url || ''])
diff --git a/src/components/widgets/SidePanelTabsetsSelectorWidget.vue b/src/components/widgets/SidePanelTabsetsSelectorWidget.vue
index 9e443bf2..a16fad00 100644
--- a/src/components/widgets/SidePanelTabsetsSelectorWidget.vue
+++ b/src/components/widgets/SidePanelTabsetsSelectorWidget.vue
@@ -102,7 +102,7 @@ import {ref, watchEffect} from "vue";
import {useRouter} from "vue-router";
import {useQuasar} from "quasar";
import _ from "lodash";
-import {SelectTabsetCommand} from "src/tabsets/commands/SelectTabset";
+import {SelectTabsetCommand} from "src/tabsets/commands/SelectTabsetCommand";
import {useCommandExecutor} from "src/core/services/CommandExecutor";
import NewTabsetDialog from "src/tabsets/dialogues/NewTabsetDialog.vue";
import {FeatureIdent} from "src/app/models/FeatureIdent";
@@ -114,6 +114,7 @@ import DeleteTabsetDialog from "src/tabsets/dialogues/DeleteTabsetDialog.vue";
import {useUiStore} from "src/ui/stores/uiStore";
import {useTabsetsStore} from "src/tabsets/stores/tabsetsStore";
import {useFeaturesStore} from "src/features/stores/featuresStore";
+import {useTabsetsUiStore} from "src/tabsets/stores/tabsetsUiStore";
const props = defineProps({
fromPanel: {type: Boolean, default: true},
@@ -209,32 +210,13 @@ const openEditTabsetDialog = () => {
})
}
-const switchTabset = (ts: any) => {
- console.log("settings tabset to ", ts)
- useCommandExecutor()
- .execute(new SelectTabsetCommand(ts.id, useSpacesStore().space?.id))
- .then((res: ExecutionResult) => {
- useUiStore().sidePanelSetActiveView(SidePanelViews.MAIN)
- if (!props.fromPanel) {
- router.push("/tabsets/" + ts.id)
- }
- })
-}
-
-const tabsetsWithTypes = (types: TabsetType[]) => {
- let tabsets = [...useTabsetsStore().tabsets.values()]
- return _.sortBy(
- _.filter(tabsets, (ts: Tabset) =>
- types.findIndex(t => ts.type === t && TabsetStatus.DELETED !== ts.status) >= 0),
- ['name'])
-}
-
const switchToTabset = (ts: Tabset) => {
console.log("settings tabset to ", ts)
useCommandExecutor()
- .execute(new SelectTabsetCommand(ts.id, useSpacesStore().space?.id))
+ .execute(new SelectTabsetCommand(ts.id))
.then((res: ExecutionResult) => {
//useUiStore().sidePanelSetActiveView(SidePanelViews.MAIN)
+ //useTabsetsUiStore().addTabsetToLastUsedList(ts.id)
if (!props.useAsTabsetsSwitcher) {
router.push("/sidepanel/tabsets/" + ts.id)
}
diff --git a/src/domain/tabsets/CopyTabset.ts b/src/domain/tabsets/CopyTabset.ts
index 42002e87..4b18cfb7 100644
--- a/src/domain/tabsets/CopyTabset.ts
+++ b/src/domain/tabsets/CopyTabset.ts
@@ -3,7 +3,7 @@ import {ExecutionResult} from "src/core/domain/ExecutionResult";
import {useTabsetService} from "src/tabsets/services/TabsetService2";
import {Tabset} from "src/tabsets/models/Tabset";
import {useSpacesStore} from "src/spaces/stores/spacesStore";
-import {DeleteTabsetCommand} from "src/tabsets/commands/DeleteTabset";
+import {DeleteTabsetCommand} from "src/tabsets/commands/DeleteTabsetCommand";
class UndoCopyTabsetCommand implements Command {
diff --git a/src/pages/SidePanelCollectionsPage.vue b/src/pages/SidePanelCollectionsPage.vue
index 7f2f86b8..2538f439 100644
--- a/src/pages/SidePanelCollectionsPage.vue
+++ b/src/pages/SidePanelCollectionsPage.vue
@@ -46,7 +46,7 @@ import {useI18n} from 'vue-i18n'
import {Tabset, TabsetStatus} from "src/tabsets/models/Tabset";
import _ from "lodash"
import {useTabsetsStore} from "src/tabsets/stores/tabsetsStore";
-import {SelectTabsetCommand} from "src/tabsets/commands/SelectTabset";
+import {SelectTabsetCommand} from "src/tabsets/commands/SelectTabsetCommand";
import {useCommandExecutor} from "src/core/services/CommandExecutor";
import {ExecutionResult} from "src/core/domain/ExecutionResult";
import {useRouter} from "vue-router";
@@ -58,6 +58,7 @@ import {dragContext, Draggable, OpenIcon} from "@he-tree/vue";
import '@he-tree/vue/style/default.css'
import {useTabsetService} from "src/tabsets/services/TabsetService2";
import {DeleteTabsetFolderCommand} from "src/tabsets/commands/DeleteTabsetFolderCommand";
+import {useTabsetsUiStore} from "src/tabsets/stores/tabsetsUiStore";
const {t} = useI18n({locale: navigator.language, useScope: "global"})
@@ -237,9 +238,9 @@ watchEffect(async () => {
})
const handleTreeClick = (node: NodeTreeObject) => {
- // console.log("clicked", node)
useCommandExecutor().execute(new SelectTabsetCommand(node.tsId, node.id))
.then((res: ExecutionResult) => {
+ //useTabsetsUiStore().addTabsetToLastUsedList(node.tsId)
if (res.result) {
router.push("/sidepanel")
}
diff --git a/src/pages/sidepanel/SidePanelPageContextMenu.vue b/src/pages/sidepanel/SidePanelPageContextMenu.vue
index 6d1bd7e6..7b9c55d4 100644
--- a/src/pages/sidepanel/SidePanelPageContextMenu.vue
+++ b/src/pages/sidepanel/SidePanelPageContextMenu.vue
@@ -158,7 +158,7 @@ import {NotificationType} from "src/core/services/ErrorHandler";
import NewSubfolderDialog from "src/tabsets/dialogues/NewSubfolderDialog.vue";
import {useTabsetsStore} from "src/tabsets/stores/tabsetsStore";
import {useFeaturesStore} from "src/features/stores/featuresStore";
-import {DeleteTabsetCommand} from "src/tabsets/commands/DeleteTabset";
+import {DeleteTabsetCommand} from "src/tabsets/commands/DeleteTabsetCommand";
import {CreateNotebookCommand} from "src/notes/commands/CreateNotebookCommand"
const {inBexMode} = useUtils()
diff --git a/src/pages/sidepanel/SidePanelTabDetails.vue b/src/pages/sidepanel/SidePanelTabDetails.vue
index 76e4e98c..0ba69c10 100644
--- a/src/pages/sidepanel/SidePanelTabDetails.vue
+++ b/src/pages/sidepanel/SidePanelTabDetails.vue
@@ -342,7 +342,7 @@ import {useFeaturesStore} from "src/features/stores/featuresStore";
import TabFaviconWidget from "src/tabsets/widgets/TabFaviconWidget.vue";
import {useTabsetService} from "src/tabsets/services/TabsetService2";
import {useTabsetsStore} from "src/tabsets/stores/tabsetsStore";
-import {SelectTabsetCommand} from "src/tabsets/commands/SelectTabset";
+import {SelectTabsetCommand} from "src/tabsets/commands/SelectTabsetCommand";
import TabsetService from "src/tabsets/services/TabsetService";
import {Tab} from "src/tabsets/models/Tab";
import {useThumbnailsService} from "src/thumbnails/services/ThumbnailsService";
@@ -363,6 +363,7 @@ import {useSnapshotsService} from "src/snapshots/services/SnapshotsService";
import {TabReferenceType} from "src/content/models/TabReference";
import {useRequestsService} from "src/requests/services/RequestsService";
import {RequestInfo} from "src/requests/models/RequestInfo";
+import {useTabsetsUiStore} from "src/tabsets/stores/tabsetsUiStore";
const {inBexMode} = useUtils()
diff --git a/src/search b/src/search
index f5e09d6c..cf27b378 160000
--- a/src/search
+++ b/src/search
@@ -1 +1 @@
-Subproject commit f5e09d6c13b598a3a4d53497dbbccc0cdbec89d0
+Subproject commit cf27b378605512f608c2df13fe75693055d4877b
diff --git a/src/services/usePersistenceService.ts b/src/services/usePersistenceService.ts
index e73d2691..48a99a8b 100644
--- a/src/services/usePersistenceService.ts
+++ b/src/services/usePersistenceService.ts
@@ -1,6 +1,5 @@
import IndexedDbPersistenceService from "src/services/IndexedDbPersistenceService";
-import {LocalStorage, QVueGlobals, useQuasar} from "quasar";
-import {LocalStoragePersistenceService} from "src/services/storage/LocalStoragePersistenceService";
+import {QVueGlobals} from "quasar";
import PersistenceService from "src/services/PersistenceService";
import SpacesPersistence from "src/spaces/persistence/SpacesPersistence";
import IndexedDbSpacesStorage from "src/spaces/persistence/IndexedDbSpacesPersistence";
@@ -15,6 +14,7 @@ import TabsetsGroupsPersistence from "src/tabsets/persistence/TabsetsGroupsPersi
import IndexedDbNotesPersistence from "src/notes/persistence/IndexedDbNotesPersistence";
import ThumbnailsPersistence from "src/thumbnails/persistence/ThumbnailsPersistence";
import IndexedDbThumbnailsPersistence from "src/thumbnails/persistence/IndexedDbThumbnailsPersistence";
+import {LocalStorageTabsetsPersistence} from "src/tabsets/persistence/LocalStorageTabsetsPersistence";
export function useDB(quasar: QVueGlobals | undefined = undefined) {
@@ -26,20 +26,20 @@ export function useDB(quasar: QVueGlobals | undefined = undefined) {
const groupsIndexedDb: TabsetsGroupsPersistence = IndexedDbTabsetsGroupsPersistence
const snapshotsDb: SnapshotsPersistence = IndexedDbSnapshotPersistence
- const notesDb = IndexedDbNotesPersistence
+ const notesDb = IndexedDbNotesPersistence
const thumbnailsDb: ThumbnailsPersistence = IndexedDbThumbnailsPersistence
- //let localDb = undefined as unknown as PersistenceService
+ let localStorageTabsetsDb: LocalStorageTabsetsPersistence = new LocalStorageTabsetsPersistence()
+
let featuresDb: FeaturesPersistence = undefined as unknown as FeaturesPersistence
if (quasar) {
- //localDb = new LocalStoragePersistenceService(quasar)
featuresDb = new LocalStorageFeaturesPersistence(quasar)
}
return {
db, spacesDb,
- tabsetsIndexedDb,
+ tabsetsIndexedDb, localStorageTabsetsDb,
featuresDb,
snapshotsDb,
thumbnailsDb,
diff --git a/src/spaces b/src/spaces
index 793f6423..14eab64f 160000
--- a/src/spaces
+++ b/src/spaces
@@ -1 +1 @@
-Subproject commit 793f642344a0f81c07cf25c8da04c09f7869acd1
+Subproject commit 14eab64f827144768aa133409286053645e2e86a
diff --git a/src/tabsets b/src/tabsets
index fc2f9f42..6156a5ee 160000
--- a/src/tabsets
+++ b/src/tabsets
@@ -1 +1 @@
-Subproject commit fc2f9f427f07c1025f3076ec955e15a1d2c76b05
+Subproject commit 6156a5eec53fc00cea5964daeeeecfc53662cb58
diff --git a/test/vitest/__tests__/stores/tabsetsUiStore.test.ts b/test/vitest/__tests__/stores/tabsetsUiStore.test.ts
new file mode 100644
index 00000000..55a46f77
--- /dev/null
+++ b/test/vitest/__tests__/stores/tabsetsUiStore.test.ts
@@ -0,0 +1,139 @@
+import {installQuasarPlugin} from '@quasar/quasar-app-extension-testing-unit-vitest';
+import {afterEach, beforeEach, describe, expect, it} from 'vitest';
+import {createPinia, setActivePinia} from "pinia";
+import {useTabsetsUiStore} from "src/tabsets/stores/tabsetsUiStore";
+import {LocalStorageTabsetsPersistence} from "src/tabsets/persistence/LocalStorageTabsetsPersistence";
+import {useCommandExecutor} from "src/core/services/CommandExecutor";
+import {CreateTabsetCommand} from "src/tabsets/commands/CreateTabsetCommand";
+import {ExecutionResult} from "src/core/domain/ExecutionResult";
+import {SaveOrReplaceResult} from "src/tabsets/models/SaveOrReplaceResult";
+import {TabsetStatus} from "src/tabsets/models/Tabset";
+import {useTabsetsStore} from "src/tabsets/stores/tabsetsStore";
+import {useDB} from "src/services/usePersistenceService";
+import {useTabsetService} from "src/tabsets/services/TabsetService2";
+import TabsetsPersistence from "src/tabsets/persistence/TabsetsPersistence";
+import {useSpacesStore} from "src/spaces/stores/spacesStore";
+import SpacesPersistence from "src/spaces/persistence/SpacesPersistence";
+import {CreateSpaceCommand} from "src/spaces/commands/CreateSpaceCommand";
+import {Space} from "src/spaces/models/Space";
+
+installQuasarPlugin();
+
+const storage = new LocalStorageTabsetsPersistence()
+
+describe('tabsetsUiStore', () => {
+
+ let startTime = 0
+ let db = null as unknown as TabsetsPersistence
+ let spacesDb = null as unknown as SpacesPersistence
+
+ beforeEach(async () => {
+ setActivePinia(createPinia())
+ await useTabsetsUiStore().initialize(storage)
+ db = useDB(undefined).tabsetsIndexedDb
+ await useTabsetsStore().initialize(db)
+ await useTabsetService().init()
+ spacesDb = useDB(undefined).spacesDb
+ await useSpacesStore().initialize(spacesDb)
+ startTime = useTabsetsUiStore().lastUpdate
+ })
+
+ afterEach(async () => {
+ db.clear("tabsets")
+ spacesDb.clear("spaces")
+ storage.clear(undefined)
+ })
+
+ it('initial load yields empty list', () =>
+ {
+ useTabsetsUiStore().load()
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(0)
+ })
+
+ it('addTabsetToLastUsedList adds tabset id to list', () =>
+ {
+ useTabsetsUiStore().load()
+
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId")
+
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(1)
+ expect(useTabsetsUiStore().lastUpdate).greaterThanOrEqual(startTime)
+ })
+
+ it('addTabsetToLastUsedList adds tabset id to list for space', async () =>
+ {
+ useTabsetsUiStore().load()
+
+ const res:ExecutionResult = await useCommandExecutor().execute(new CreateSpaceCommand("spaceA"))
+ useSpacesStore().space = res.result
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId")
+
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(1)
+ expect(useTabsetsUiStore().lastUpdate).greaterThanOrEqual(startTime)
+
+ useSpacesStore().space = null as unknown as Space
+ useTabsetsUiStore().load()
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(0)
+ })
+
+ it('favorite tabsets are added to list', async () =>
+ {
+ const res:ExecutionResult = await useCommandExecutor().execute(new CreateTabsetCommand("tabsetName"))
+ const ts = res.result.tabset
+ ts.status = TabsetStatus.FAVORITE
+ await useTabsetsStore().saveTabset(ts)
+
+ useTabsetsUiStore().load()
+
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(1)
+ expect(useTabsetsUiStore().lastUpdate).greaterThanOrEqual(startTime)
+ })
+
+ it('favorite and added tabsets are combined', async () =>
+ {
+ const res:ExecutionResult = await useCommandExecutor().execute(new CreateTabsetCommand("tabsetName"))
+ const ts = res.result.tabset
+ ts.status = TabsetStatus.FAVORITE
+ await useTabsetsStore().saveTabset(ts)
+
+ useTabsetsUiStore().load()
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId")
+
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(2)
+ expect(useTabsetsUiStore().lastUpdate).greaterThanOrEqual(startTime)
+ })
+
+ it('id is added only once', async () =>
+ {
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId")
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId")
+
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(1)
+ })
+
+ it('limit is kept', async () =>
+ {
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId1")
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId2")
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId3")
+
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(3)
+
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId4")
+
+ const tsIds = useTabsetsUiStore().lastUsedTabsets
+ expect(tsIds.length).toBe(3)
+ expect(tsIds.join(",")).toBe("tsId2,tsId3,tsId4")
+ })
+
+ it('id can be removed', async () =>
+ {
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId1")
+ useTabsetsUiStore().addTabsetToLastUsedList("tsId2")
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(2)
+
+ useTabsetsUiStore().clearFromLastUsedTabsets(undefined, "tsId1")
+ expect(useTabsetsUiStore().lastUsedTabsets.length).toBe(1)
+ })
+
+});
diff --git a/tests-examples/demo-todo-app.spec.ts b/tests-examples/demo-todo-app.spec.ts
deleted file mode 100644
index 8641cb5f..00000000
--- a/tests-examples/demo-todo-app.spec.ts
+++ /dev/null
@@ -1,437 +0,0 @@
-import { test, expect, type Page } from '@playwright/test';
-
-test.beforeEach(async ({ page }) => {
- await page.goto('https://demo.playwright.dev/todomvc');
-});
-
-const TODO_ITEMS = [
- 'buy some cheese',
- 'feed the cat',
- 'book a doctors appointment'
-] as const;
-
-test.describe('New Todo', () => {
- test('should allow me to add todo items', async ({ page }) => {
- // create a new todo locator
- const newTodo = page.getByPlaceholder('What needs to be done?');
-
- // Create 1st todo.
- await newTodo.fill(TODO_ITEMS[0]);
- await newTodo.press('Enter');
-
- // Make sure the list only has one todo item.
- await expect(page.getByTestId('todo-title')).toHaveText([
- TODO_ITEMS[0]
- ]);
-
- // Create 2nd todo.
- await newTodo.fill(TODO_ITEMS[1]);
- await newTodo.press('Enter');
-
- // Make sure the list now has two todo items.
- await expect(page.getByTestId('todo-title')).toHaveText([
- TODO_ITEMS[0],
- TODO_ITEMS[1]
- ]);
-
- await checkNumberOfTodosInLocalStorage(page, 2);
- });
-
- test('should clear text input field when an item is added', async ({ page }) => {
- // create a new todo locator
- const newTodo = page.getByPlaceholder('What needs to be done?');
-
- // Create one todo item.
- await newTodo.fill(TODO_ITEMS[0]);
- await newTodo.press('Enter');
-
- // Check that input is empty.
- await expect(newTodo).toBeEmpty();
- await checkNumberOfTodosInLocalStorage(page, 1);
- });
-
- test('should append new items to the bottom of the list', async ({ page }) => {
- // Create 3 items.
- await createDefaultTodos(page);
-
- // create a todo count locator
- const todoCount = page.getByTestId('todo-count')
-
- // Check test using different methods.
- await expect(page.getByText('3 items left')).toBeVisible();
- await expect(todoCount).toHaveText('3 items left');
- await expect(todoCount).toContainText('3');
- await expect(todoCount).toHaveText(/3/);
-
- // Check all items in one call.
- await expect(page.getByTestId('todo-title')).toHaveText(TODO_ITEMS);
- await checkNumberOfTodosInLocalStorage(page, 3);
- });
-});
-
-test.describe('Mark all as completed', () => {
- test.beforeEach(async ({ page }) => {
- await createDefaultTodos(page);
- await checkNumberOfTodosInLocalStorage(page, 3);
- });
-
- test.afterEach(async ({ page }) => {
- await checkNumberOfTodosInLocalStorage(page, 3);
- });
-
- test('should allow me to mark all items as completed', async ({ page }) => {
- // Complete all todos.
- await page.getByLabel('Mark all as complete').check();
-
- // Ensure all todos have 'completed' class.
- await expect(page.getByTestId('todo-item')).toHaveClass(['completed', 'completed', 'completed']);
- await checkNumberOfCompletedTodosInLocalStorage(page, 3);
- });
-
- test('should allow me to clear the complete state of all items', async ({ page }) => {
- const toggleAll = page.getByLabel('Mark all as complete');
- // Check and then immediately uncheck.
- await toggleAll.check();
- await toggleAll.uncheck();
-
- // Should be no completed classes.
- await expect(page.getByTestId('todo-item')).toHaveClass(['', '', '']);
- });
-
- test('complete all checkbox should update state when items are completed / cleared', async ({ page }) => {
- const toggleAll = page.getByLabel('Mark all as complete');
- await toggleAll.check();
- await expect(toggleAll).toBeChecked();
- await checkNumberOfCompletedTodosInLocalStorage(page, 3);
-
- // Uncheck first todo.
- const firstTodo = page.getByTestId('todo-item').nth(0);
- await firstTodo.getByRole('checkbox').uncheck();
-
- // Reuse toggleAll locator and make sure its not checked.
- await expect(toggleAll).not.toBeChecked();
-
- await firstTodo.getByRole('checkbox').check();
- await checkNumberOfCompletedTodosInLocalStorage(page, 3);
-
- // Assert the toggle all is checked again.
- await expect(toggleAll).toBeChecked();
- });
-});
-
-test.describe('Item', () => {
-
- test('should allow me to mark items as complete', async ({ page }) => {
- // create a new todo locator
- const newTodo = page.getByPlaceholder('What needs to be done?');
-
- // Create two items.
- for (const item of TODO_ITEMS.slice(0, 2)) {
- await newTodo.fill(item);
- await newTodo.press('Enter');
- }
-
- // Check first item.
- const firstTodo = page.getByTestId('todo-item').nth(0);
- await firstTodo.getByRole('checkbox').check();
- await expect(firstTodo).toHaveClass('completed');
-
- // Check second item.
- const secondTodo = page.getByTestId('todo-item').nth(1);
- await expect(secondTodo).not.toHaveClass('completed');
- await secondTodo.getByRole('checkbox').check();
-
- // Assert completed class.
- await expect(firstTodo).toHaveClass('completed');
- await expect(secondTodo).toHaveClass('completed');
- });
-
- test('should allow me to un-mark items as complete', async ({ page }) => {
- // create a new todo locator
- const newTodo = page.getByPlaceholder('What needs to be done?');
-
- // Create two items.
- for (const item of TODO_ITEMS.slice(0, 2)) {
- await newTodo.fill(item);
- await newTodo.press('Enter');
- }
-
- const firstTodo = page.getByTestId('todo-item').nth(0);
- const secondTodo = page.getByTestId('todo-item').nth(1);
- const firstTodoCheckbox = firstTodo.getByRole('checkbox');
-
- await firstTodoCheckbox.check();
- await expect(firstTodo).toHaveClass('completed');
- await expect(secondTodo).not.toHaveClass('completed');
- await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-
- await firstTodoCheckbox.uncheck();
- await expect(firstTodo).not.toHaveClass('completed');
- await expect(secondTodo).not.toHaveClass('completed');
- await checkNumberOfCompletedTodosInLocalStorage(page, 0);
- });
-
- test('should allow me to edit an item', async ({ page }) => {
- await createDefaultTodos(page);
-
- const todoItems = page.getByTestId('todo-item');
- const secondTodo = todoItems.nth(1);
- await secondTodo.dblclick();
- await expect(secondTodo.getByRole('textbox', { name: 'Edit' })).toHaveValue(TODO_ITEMS[1]);
- await secondTodo.getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
- await secondTodo.getByRole('textbox', { name: 'Edit' }).press('Enter');
-
- // Explicitly assert the new text value.
- await expect(todoItems).toHaveText([
- TODO_ITEMS[0],
- 'buy some sausages',
- TODO_ITEMS[2]
- ]);
- await checkTodosInLocalStorage(page, 'buy some sausages');
- });
-});
-
-test.describe('Editing', () => {
- test.beforeEach(async ({ page }) => {
- await createDefaultTodos(page);
- await checkNumberOfTodosInLocalStorage(page, 3);
- });
-
- test('should hide other controls when editing', async ({ page }) => {
- const todoItem = page.getByTestId('todo-item').nth(1);
- await todoItem.dblclick();
- await expect(todoItem.getByRole('checkbox')).not.toBeVisible();
- await expect(todoItem.locator('label', {
- hasText: TODO_ITEMS[1],
- })).not.toBeVisible();
- await checkNumberOfTodosInLocalStorage(page, 3);
- });
-
- test('should save edits on blur', async ({ page }) => {
- const todoItems = page.getByTestId('todo-item');
- await todoItems.nth(1).dblclick();
- await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
- await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).dispatchEvent('blur');
-
- await expect(todoItems).toHaveText([
- TODO_ITEMS[0],
- 'buy some sausages',
- TODO_ITEMS[2],
- ]);
- await checkTodosInLocalStorage(page, 'buy some sausages');
- });
-
- test('should trim entered text', async ({ page }) => {
- const todoItems = page.getByTestId('todo-item');
- await todoItems.nth(1).dblclick();
- await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill(' buy some sausages ');
- await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Enter');
-
- await expect(todoItems).toHaveText([
- TODO_ITEMS[0],
- 'buy some sausages',
- TODO_ITEMS[2],
- ]);
- await checkTodosInLocalStorage(page, 'buy some sausages');
- });
-
- test('should remove the item if an empty text string was entered', async ({ page }) => {
- const todoItems = page.getByTestId('todo-item');
- await todoItems.nth(1).dblclick();
- await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('');
- await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Enter');
-
- await expect(todoItems).toHaveText([
- TODO_ITEMS[0],
- TODO_ITEMS[2],
- ]);
- });
-
- test('should cancel edits on escape', async ({ page }) => {
- const todoItems = page.getByTestId('todo-item');
- await todoItems.nth(1).dblclick();
- await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
- await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Escape');
- await expect(todoItems).toHaveText(TODO_ITEMS);
- });
-});
-
-test.describe('Counter', () => {
- test('should display the current number of todo items', async ({ page }) => {
- // create a new todo locator
- const newTodo = page.getByPlaceholder('What needs to be done?');
-
- // create a todo count locator
- const todoCount = page.getByTestId('todo-count')
-
- await newTodo.fill(TODO_ITEMS[0]);
- await newTodo.press('Enter');
-
- await expect(todoCount).toContainText('1');
-
- await newTodo.fill(TODO_ITEMS[1]);
- await newTodo.press('Enter');
- await expect(todoCount).toContainText('2');
-
- await checkNumberOfTodosInLocalStorage(page, 2);
- });
-});
-
-test.describe('Clear completed button', () => {
- test.beforeEach(async ({ page }) => {
- await createDefaultTodos(page);
- });
-
- test('should display the correct text', async ({ page }) => {
- await page.locator('.todo-list li .toggle').first().check();
- await expect(page.getByRole('button', { name: 'Clear completed' })).toBeVisible();
- });
-
- test('should remove completed items when clicked', async ({ page }) => {
- const todoItems = page.getByTestId('todo-item');
- await todoItems.nth(1).getByRole('checkbox').check();
- await page.getByRole('button', { name: 'Clear completed' }).click();
- await expect(todoItems).toHaveCount(2);
- await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
- });
-
- test('should be hidden when there are no items that are completed', async ({ page }) => {
- await page.locator('.todo-list li .toggle').first().check();
- await page.getByRole('button', { name: 'Clear completed' }).click();
- await expect(page.getByRole('button', { name: 'Clear completed' })).toBeHidden();
- });
-});
-
-test.describe('Persistence', () => {
- test('should persist its data', async ({ page }) => {
- // create a new todo locator
- const newTodo = page.getByPlaceholder('What needs to be done?');
-
- for (const item of TODO_ITEMS.slice(0, 2)) {
- await newTodo.fill(item);
- await newTodo.press('Enter');
- }
-
- const todoItems = page.getByTestId('todo-item');
- const firstTodoCheck = todoItems.nth(0).getByRole('checkbox');
- await firstTodoCheck.check();
- await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
- await expect(firstTodoCheck).toBeChecked();
- await expect(todoItems).toHaveClass(['completed', '']);
-
- // Ensure there is 1 completed item.
- await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-
- // Now reload.
- await page.reload();
- await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
- await expect(firstTodoCheck).toBeChecked();
- await expect(todoItems).toHaveClass(['completed', '']);
- });
-});
-
-test.describe('Routing', () => {
- test.beforeEach(async ({ page }) => {
- await createDefaultTodos(page);
- // make sure the app had a chance to save updated todos in storage
- // before navigating to a new view, otherwise the items can get lost :(
- // in some frameworks like Durandal
- await checkTodosInLocalStorage(page, TODO_ITEMS[0]);
- });
-
- test('should allow me to display active items', async ({ page }) => {
- const todoItem = page.getByTestId('todo-item');
- await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
-
- await checkNumberOfCompletedTodosInLocalStorage(page, 1);
- await page.getByRole('link', { name: 'Active' }).click();
- await expect(todoItem).toHaveCount(2);
- await expect(todoItem).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
- });
-
- test('should respect the back button', async ({ page }) => {
- const todoItem = page.getByTestId('todo-item');
- await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
-
- await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-
- await test.step('Showing all items', async () => {
- await page.getByRole('link', { name: 'All' }).click();
- await expect(todoItem).toHaveCount(3);
- });
-
- await test.step('Showing active items', async () => {
- await page.getByRole('link', { name: 'Active' }).click();
- });
-
- await test.step('Showing completed items', async () => {
- await page.getByRole('link', { name: 'Completed' }).click();
- });
-
- await expect(todoItem).toHaveCount(1);
- await page.goBack();
- await expect(todoItem).toHaveCount(2);
- await page.goBack();
- await expect(todoItem).toHaveCount(3);
- });
-
- test('should allow me to display completed items', async ({ page }) => {
- await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
- await checkNumberOfCompletedTodosInLocalStorage(page, 1);
- await page.getByRole('link', { name: 'Completed' }).click();
- await expect(page.getByTestId('todo-item')).toHaveCount(1);
- });
-
- test('should allow me to display all items', async ({ page }) => {
- await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
- await checkNumberOfCompletedTodosInLocalStorage(page, 1);
- await page.getByRole('link', { name: 'Active' }).click();
- await page.getByRole('link', { name: 'Completed' }).click();
- await page.getByRole('link', { name: 'All' }).click();
- await expect(page.getByTestId('todo-item')).toHaveCount(3);
- });
-
- test('should highlight the currently applied filter', async ({ page }) => {
- await expect(page.getByRole('link', { name: 'All' })).toHaveClass('selected');
-
- //create locators for active and completed links
- const activeLink = page.getByRole('link', { name: 'Active' });
- const completedLink = page.getByRole('link', { name: 'Completed' });
- await activeLink.click();
-
- // Page change - active items.
- await expect(activeLink).toHaveClass('selected');
- await completedLink.click();
-
- // Page change - completed items.
- await expect(completedLink).toHaveClass('selected');
- });
-});
-
-async function createDefaultTodos(page: Page) {
- // create a new todo locator
- const newTodo = page.getByPlaceholder('What needs to be done?');
-
- for (const item of TODO_ITEMS) {
- await newTodo.fill(item);
- await newTodo.press('Enter');
- }
-}
-
-async function checkNumberOfTodosInLocalStorage(page: Page, expected: number) {
- return await page.waitForFunction(e => {
- return JSON.parse(localStorage['react-todos']).length === e;
- }, expected);
-}
-
-async function checkNumberOfCompletedTodosInLocalStorage(page: Page, expected: number) {
- return await page.waitForFunction(e => {
- return JSON.parse(localStorage['react-todos']).filter((todo: any) => todo.completed).length === e;
- }, expected);
-}
-
-async function checkTodosInLocalStorage(page: Page, title: string) {
- return await page.waitForFunction(t => {
- return JSON.parse(localStorage['react-todos']).map((todo: any) => todo.title).includes(t);
- }, title);
-}