cleanups

src/App.vue

@@ -11,7 +11,7 @@ import {useRoute, useRouter} from "vue-router";
 import {useLogger} from "src/services/Logger";
 import {useSettingsStore} from "stores/settingsStore";
 import {useAppStore} from "stores/appStore";
-import {usePermissionsStore} from "stores/usePermissionsStore";
+import {usePermissionsStore} from "src/core/stores/usePermissionsStore";
 
 const $q = useQuasar()
 const router = useRouter()

src/app/listeners/BrowserListeners.ts

@@ -10,7 +10,7 @@ import {Tab} from "src/tabsets/models/Tab";
 import {useTabsetService} from "src/tabsets/services/TabsetService2";
 import {Extractor, Extractors, ExtractorType} from "src/core/config/Extractors";
 import {useUtils} from "src/core/services/Utils";
-import {Suggestion, SuggestionState, SuggestionType} from "src/suggestions/models/Suggestion";
+import {SuggestionState} from "src/suggestions/models/Suggestion";
 import {useSuggestionsStore} from "src/suggestions/stores/suggestionsStore";
 import {useTabsStore2} from "src/tabsets/stores/tabsStore2";
 import {useTabsetsStore} from "src/tabsets/stores/tabsetsStore";
@@ -24,7 +24,6 @@ import {ContentItem} from "src/content/models/ContentItem";
 
 const {
   saveText,
-  saveLinksFor,
   addToTabsetId
 } = useTabsetService()
 

src/app/models/AppFeatures.ts

@@ -1,8 +1,8 @@
 import _ from "lodash"
 import {Feature} from "src/features/models/Feature";
 import {FeatureIdent, FeatureType} from "src/app/models/FeatureIdent";
-import {GrantPermissionCommand} from "src/domain/commands/GrantPermissionCommand";
-import {RevokePermissionCommand} from "src/domain/commands/RevokePermissionCommand";
+import {GrantPermissionCommand} from "src/core/domain/commands/GrantPermissionCommand";
+import {RevokePermissionCommand} from "src/core/domain/commands/RevokePermissionCommand";
 
 export class AppFeatures {
   features: Feature[] = [
@@ -116,8 +116,8 @@ export class AppFeatures {
       'Browser Notifications',
       'Allow Tabsets to send Notifications via your Browser. Recommended.',
       'o_notifications', '', ['all']),
-      // .setActivateCommands([new GrantPermissionCommand('notifications')])
-      // .setDeactivateCommands([ne0w RevokePermissionCommand('notifications')]),
+    // .setActivateCommands([new GrantPermissionCommand('notifications')])
+    // .setDeactivateCommands([ne0w RevokePermissionCommand('notifications')]),
 
     new Feature(FeatureIdent.ANNOTATIONS, FeatureType.DISABLED,
       'Annotate Websites',
@@ -152,7 +152,7 @@ export class AppFeatures {
       'Chrome Tab Groups',
       'Utilize Chrome Tab Groups',
       'o_view_list', '', ['chrome_bex']),
-      // .setActivateCommands([new GrantPermissionCommand('tabGroups')]),
+    // .setActivateCommands([new GrantPermissionCommand('tabGroups')]),
 
     new Feature(FeatureIdent.AUTO_TAB_SWITCHER, FeatureType.EXPERIMENTAL,
       'Auto Tab Switcher',
@@ -167,8 +167,8 @@ export class AppFeatures {
     new Feature(FeatureIdent.WEBSITE_CLIP, FeatureType.EXPERIMENTAL,
       'Website Clip',
       'Create an image clip from a website and store it',
-      'filter_center_focus', '', ['bex']),
-    // .setActivateCommands([new GrantPermissionCommand('notifications')]),
+      'filter_center_focus', '', ['bex'])
+      .setActivateCommands([new GrantPermissionCommand('notifications')]),
 
     new Feature(FeatureIdent.DYNAMIC_TABSET, FeatureType.EXPERIMENTAL,
       'Dynamic Tabset',

src/components/DrawerRight.vue

@@ -38,7 +38,7 @@
                 dense
                 maxlength="9"
                 v-model="scope.value"
-                @update:model-value="val => setFilter2( val)"
+                @update:model-value="val => setFilter2( val ? val.toString() : '')"
                 hint="Filter open Tabs"
                 @keyup.enter="scope.set">
                 <template v-slot:after>
@@ -58,32 +58,32 @@
 
   <div class="row greyBorderTop"></div>
 
-<!--  <UnassignedAndOpenTabs v-if="tab === DrawerTabs.UNASSIGNED_TABS"/>-->
+  <!--  <UnassignedAndOpenTabs v-if="tab === DrawerTabs.UNASSIGNED_TABS"/>-->
   <OpenTabsView v-if="tab === DrawerTabs.OPEN_TABS"/>
 
   <BookmarksTree v-else-if="tab === DrawerTabs.BOOKMARKS"
-    :nodes="showOnlyFolders ? useBookmarksStore().nonLeafNodes : useBookmarksStore().bookmarksNodes2"
-    :show-only-folders="showOnlyFolders"
-    @toggle-show-only-folders="toggleShowOnlyFolders()"
-    :in-side-panel="true"/>
+                 :nodes="showOnlyFolders ? useBookmarksStore().nonLeafNodes : useBookmarksStore().bookmarksNodes2"
+                 :show-only-folders="showOnlyFolders"
+                 @toggle-show-only-folders="toggleShowOnlyFolders()"
+                 :in-side-panel="true"/>
 
   <!--      <OpenTabs v-else-if="tab ===  DrawerTabs.OPEN_TABS" :filter="filter"/>-->
   <!--      <UnassignedTabs v-else-if="tab ===  DrawerTabs.UNASSIGNED_TABS" :filter="filter"/>-->
   <ByDomainList v-else-if="tab ===  DrawerTabs.GROUP_BY_HOST_TABS"/>
-<!--  <SavedTabs v-else-if="tab ===  DrawerTabs.SAVED_TABS"/>-->
-<!--  <SavedPdfs v-else-if="tab ===  DrawerTabs.SAVED_TABS_AS_PDF"/>-->
-<!--  <TabsetAsSidebar v-else-if="tab ===  DrawerTabs.SIDEBAR"/>-->
-<!--  <NewTabUrls v-else-if="tab ===  DrawerTabs.NEW_TAB_URLS"/>-->
-<!--  <RssTabs v-else-if="tab ===  DrawerTabs.RSS"/>-->
+  <!--  <SavedTabs v-else-if="tab ===  DrawerTabs.SAVED_TABS"/>-->
+  <!--  <SavedPdfs v-else-if="tab ===  DrawerTabs.SAVED_TABS_AS_PDF"/>-->
+  <!--  <TabsetAsSidebar v-else-if="tab ===  DrawerTabs.SIDEBAR"/>-->
+  <!--  <NewTabUrls v-else-if="tab ===  DrawerTabs.NEW_TAB_URLS"/>-->
+  <!--  <RssTabs v-else-if="tab ===  DrawerTabs.RSS"/>-->
   <!--      <ScheduledTabs v-else-if="tab ===  DrawerTabs.SCHEDULED"/>-->
   <Features v-else-if="tab ===  DrawerTabs.FEATURES"/>
-<!--  <TabDetails v-else-if="tab ===  DrawerTabs.TAB_DETAILS"/>
-  <TabsetDetails v-else-if="tab ===  DrawerTabs.TABSET_DETAILS"/>-->
+  <!--  <TabDetails v-else-if="tab ===  DrawerTabs.TAB_DETAILS"/>
+    <TabsetDetails v-else-if="tab ===  DrawerTabs.TABSET_DETAILS"/>-->
 
-<!--  <TagsListViewer v-else-if="tab ===  DrawerTabs.TAGS_VIEWER"/>-->
+  <!--  <TagsListViewer v-else-if="tab ===  DrawerTabs.TAGS_VIEWER"/>-->
   <TagListViewer v-else-if="tab ===  DrawerTabs.TAG_VIEWER"/>
 
-<!--  <TabsetHelp v-else-if="tab ===  DrawerTabs.HELP"/>-->
+  <!--  <TabsetHelp v-else-if="tab ===  DrawerTabs.HELP"/>-->
 
   <!-- only in sidepanel in chrome extension-->
   <!--  <TagsViewer v-else-if="tab ===  DrawerTabs.TAGS_VIEWER"/>-->
@@ -93,8 +93,8 @@
 </template>
 
 <script lang="ts" setup>
-import {ref, watch, watchEffect} from "vue";
-import {useRoute, useRouter} from "vue-router";
+import {ref, watchEffect} from "vue";
+import {useRoute} from "vue-router";
 import {useSettingsStore} from "src/stores/settingsStore";
 import {DrawerTabs, useUiStore} from "src/ui/stores/uiStore";
 import BookmarksTree from "src/bookmarks/components/BookmarksTree.vue";

src/components/helper/SidePanelFooterLeftButtons.vue

@@ -20,6 +20,11 @@
         <!--        <q-item dense clickable v-close-popup>-->
         <!--          <q-item-section>new window</q-item-section>-->
         <!--        </q-item>-->
+<!--        <SidePanelFooterViewMenuItem :side-panel-view="SidePanelViews.SHARED_TABSETS_LIST"-->
+<!--                                     label="Shared Tabsets"-->
+<!--                                     icon="o_share"-->
+<!--                                     :size="buttonSize"-->
+<!--                                     tooltip="All your shared tabsets"/>-->
         <SidePanelFooterViewMenuItem :side-panel-view="SidePanelViews.BY_DOMAIN_LIST"
                                      label="Tabs By Domain"
                                      icon="o_dns"

src/components/layouts/SearchHit.vue

@@ -111,7 +111,7 @@ const {selectTabset} = useTabsetService()
 
 const tabsetBadges = (hit: Hit): object[] => {
   const badges: object[] = []
-  _.forEach(hit.tabsets, ts => badges.push({
+  _.forEach(hit.tabsets, (ts:string) => badges.push({
     label: TabsetService.nameForTabsetId(ts),
     tabsetId: ts,
     encodedUrl: btoa(hit.url || '')

src/components/views/TagListViewer.vue

@@ -14,7 +14,7 @@
 
 <script setup lang="ts">
 
-import {uid, useQuasar} from "quasar";
+import {uid} from "quasar";
 import {onMounted, ref, watchEffect} from "vue";
 import {Hit} from "src/search/models/Hit";
 import Analytics from "src/core/utils/google-analytics";
@@ -47,7 +47,7 @@ const newSearch = (term: string) => {
       })
     })
 
-    _.forEach(results, h => {
+    _.forEach(results, (h:any) => {
       //console.log("h", h.item.bookmarkId)
       let tabsets: string[] = []
       if (h.url) {

src/components/widgets/BookmarkListElementWidget.vue

@@ -81,7 +81,6 @@ import {Bookmark} from "src/bookmarks/models/Bookmark";
 import {useRouter} from "vue-router";
 import {date} from "quasar";
 import NavigationService from "src/services/NavigationService";
-import BookmarksService from "src/bookmarks/services/BookmarksService";
 import {useTabsetService} from "src/tabsets/services/TabsetService2";
 
 const {formatDate} = useUtils()
@@ -124,7 +123,9 @@ const selectBookmark = (bm: Bookmark) =>
     router.push("/mainpanel/bookmarks/" + bm.chromeBookmark.id) :
     router.push("/bookmarks/" + bm.chromeBookmark.id)
 
-const deleteBookmark = (bm: Bookmark) => BookmarksService.deleteBookmark(bm)
+const deleteBookmark = (bm: Bookmark) => {
+  //BookmarksService.deleteBookmark(bm)
+}
 
 const existsInTabset = (url: string) => useTabsetService().tabsetsFor(url)?.length > 0
 

src/domain/Types.ts

@@ -1,12 +1,6 @@
-// export default interface Types {
 
 import {Tab} from "src/tabsets/models/Tab";
 
-export type Programmer = {
-  name: string;
-  knownFor: string[];
-};
-
 export type TabPredicate = (t: Tab) => boolean;
 export type Predicate<T> = (t: T) => boolean;
 

src/domain/tabs/AddCommentCommand.ts

@@ -1,8 +1,8 @@
 import Command from "src/core/domain/Command";
 import {ExecutionResult} from "src/core/domain/ExecutionResult";
-import {Tab, TabComment} from "src/tabsets/models/Tab";
+import {TabComment} from "src/tabsets/models/Tab";
 import {useTabsetService} from "src/tabsets/services/TabsetService2";
-import {Tabset, TabsetSharing} from "src/tabsets/models/Tabset";
+import {TabsetSharing} from "src/tabsets/models/Tabset";
 import {useUiStore} from "src/ui/stores/uiStore";
 import {useTabsetsStore} from "src/tabsets/stores/tabsetsStore";
 
@@ -37,7 +37,6 @@ export class AddCommentCommand implements Command<any> {
     } else {
       return Promise.reject("There was a problem adding your comment - could not find data for tabId " + this.tabId)
     }
-    return Promise.reject("Could not find Tab")
   }
 
 }

src/domain/tabs/DeleteCommentCommand.ts

@@ -33,7 +33,6 @@ export class DeleteCommentCommand implements Command<any> {
     } else {
       return Promise.reject("There was a problem deleting your comment")
     }
-    return Promise.reject("Could not find Tab")
   }
 
 }

src/domain/tabs/UpdateTabColor.ts

@@ -2,7 +2,6 @@ import Command from "src/core/domain/Command";
 import {ExecutionResult} from "src/core/domain/ExecutionResult";
 import TabsetService from "src/tabsets/services/TabsetService";
 import {Tab} from "src/tabsets/models/Tab";
-import {useSearchStore} from "src/search/stores/searchStore";
 
 export class UpdateTabColorCommand implements Command<any> {
 

src/layouts/FullPageLayout.vue

@@ -198,7 +198,7 @@ import {useSpacesStore} from "src/spaces/stores/spacesStore"
 import SpacesSelectorWidget from 'src/spaces/widgets/SpacesSelectorWidget.vue'
 import {DrawerTabs, useUiStore} from "src/ui/stores/uiStore";
 import NotificationDialog from "components/dialogues/NotificationDialog.vue"
-import {Notification, NotificationStatus} from "src/models/Notification";
+import {Notification} from "src/core/models/Notification";
 import {useUtils} from "src/core/services/Utils";
 import DrawerRight from "components/DrawerRight.vue";
 import {Suggestion, SuggestionState} from "src/suggestions/models/Suggestion";

src/pages/SearchPage.vue

@@ -64,7 +64,7 @@ import SearchHit from "src/components/layouts/SearchHit.vue"
 import {Hit} from "src/search/models/Hit";
 import ReindexDialog from "components/dialogues/ReindexDialog.vue";
 import {useCommandExecutor} from "src/core/services/CommandExecutor";
-import {GrantPermissionCommand} from "src/domain/commands/GrantPermissionCommand";
+import {GrantPermissionCommand} from "src/core/domain/commands/GrantPermissionCommand";
 import InfoMessageWidget from "src/ui/widgets/InfoMessageWidget.vue";
 
 const route = useRoute()