tabsets merge

Author: evandor

commands/CreateTabsetCommand.ts

@@ -6,7 +6,7 @@ import { useUtils } from 'src/core/services/Utils'
 import Analytics from 'src/core/utils/google-analytics'
 import { useFeaturesStore } from 'src/features/stores/featuresStore'
 import { useLogger } from 'src/services/Logger'
-import { StaticSuggestionIdent, Suggestion } from 'src/suggestions/models/Suggestion'
+import { StaticSuggestionIdent, Suggestion } from 'src/suggestions/domain/models/Suggestion'
 import { useSuggestionsStore } from 'src/suggestions/stores/suggestionsStore'
 import { SaveOrReplaceResult } from 'src/tabsets/models/SaveOrReplaceResult'
 import { TabsetType } from 'src/tabsets/models/Tabset'
@@ -56,18 +56,14 @@ export class CreateTabsetCommand implements Command<SaveOrReplaceResult> {
             !useFeaturesStore().hasFeature(FeatureIdent.BOOKMARKS) &&
             process.env.MODE === 'bex'
           ) {
-            useSuggestionsStore().addSuggestion(
-              Suggestion.getStaticSuggestion(StaticSuggestionIdent.TRY_BOOKMARKS_FEATURE),
-            )
+            useSuggestionsStore().addSuggestion(Suggestion.getStaticSuggestion('TRY_BOOKMARKS_FEATURE'))
           }
           if (
             useTabsetsStore().tabsets.size >= 15 &&
             !useFeaturesStore().hasFeature(FeatureIdent.SPACES) &&
             process.env.MODE === 'bex'
           ) {
-            useSuggestionsStore().addSuggestion(
-              Suggestion.getStaticSuggestion(StaticSuggestionIdent.TRY_SPACES_FEATURE),
-            )
+            useSuggestionsStore().addSuggestion(Suggestion.getStaticSuggestion('TRY_SPACES_FEATURE'))
             // } else if (useTabsetsStore().tabsets.size >= 3 &&
             //     useTabsetsStore().allTabsCount > 10 &&
             //     !useFeaturesStore().hasFeature(FeatureIdent.NEWEST_TABS) &&

pages/TabsetPage.vue

@@ -41,7 +41,12 @@
             </span>
           </template>
           <template v-else>
-            <TabsetsSelectorWidget />
+            <div>
+              <TabsetsSelectorWidget />
+              <span v-if="tabset.sharedId" class="text-caption"
+                >shared by {{ tabset.sharedBy }}, {{ date.formatDate(tabset.sharedAt, 'DD.MM.YYYY HH:mm') }}</span
+              >
+            </div>
           </template>
           <q-icon
             v-if="showEditButton"
@@ -176,11 +181,10 @@
     v-model="tab"
     dense
     class="text-grey q-ma-none q-pa-none"
-    active-color="primary"
     indicator-color="primary"
     align="left"
     narrow-indicator>
-    <q-tab name="grid" label="As Grid" />
+    <q-tab name="grid" label="As Grid" v-if="inBexMode()" />
     <q-tab name="list" label="As List" />
     <q-tab name="export" label="Export" />
   </q-tabs>
@@ -249,6 +253,7 @@ a tab's url starts with one of the urls of this tabset, it will be ignored and n
 import TabsetsSelectorWidget from 'components/widgets/TabsetsSelectorWidget.vue'
 import { date, uid, useQuasar } from 'quasar'
 import { useCommandExecutor } from 'src/core/services/CommandExecutor'
+import { useUtils } from 'src/core/services/Utils'
 import Analytics from 'src/core/utils/google-analytics'
 import { RenameTabsetCommand } from 'src/tabsets/commands/RenameTabset'
 import { ToggleSortingCommand } from 'src/tabsets/commands/ToggleSorting'
@@ -271,6 +276,8 @@ const router = useRouter()
 
 const $q = useQuasar()
 
+const { inBexMode } = useUtils()
+
 const tabsetId = ref(null as unknown as string)
 const tabset = ref<Tabset>(new Tabset(uid(), 'empty', []))
 const tabsetFolder = ref<Tabset>(new Tabset(uid(), 'empty', []))
@@ -295,7 +302,7 @@ watchEffect(() => {
   tabsetId.value = route?.params.tabsetId as string
   tabset.value = useTabsetsStore().getTabset(tabsetId.value) || new Tabset(uid(), 'empty', [])
   console.log('watch effect in tabsetpage', tabsetId.value)
-  tab.value = route.query['tab'] ? (route.query['tab'] as string) : 'grid'
+  tab.value = route.query['tab'] ? (route.query['tab'] as string) : 'list'
   tabsetFolder.value = useTabsetsStore().getActiveFolder(tabset.value) || tabset.value
 })
 

widgets/PanelTabListElementWidget.vue

@@ -231,8 +231,8 @@
               name="o_notifications"
               class="q-mr-xs"
               size="xs"
-              :color="suggestion.state === SuggestionState.NOTIFICATION ? 'negative' : 'accent'">
-              <q-tooltip class="tooltip-small" v-if="suggestion.state === SuggestionState.NOTIFICATION"
+              :color="suggestion.state === 'NOTIFICATION' ? 'negative' : 'accent'">
+              <q-tooltip class="tooltip-small" v-if="suggestion.state === 'NOTIFICATION'"
                 >There is a new notification for this tab
               </q-tooltip>
               <q-tooltip class="tooltip-small" v-else>There is a notification for this tab</q-tooltip>
@@ -391,7 +391,7 @@ import { useFeaturesStore } from 'src/features/stores/featuresStore'
 import NavigationService from 'src/services/NavigationService'
 import TabService from 'src/services/TabService'
 import { SavedBlob } from 'src/snapshots/models/SavedBlob'
-import { Suggestion, SuggestionState } from 'src/suggestions/models/Suggestion'
+import { Suggestion, SuggestionState } from 'src/suggestions/domain/models/Suggestion'
 import { useSuggestionsStore } from 'src/suggestions/stores/suggestionsStore'
 import { DeleteChromeGroupCommand } from 'src/tabsets/commands/DeleteChromeGroupCommand'
 import { DeleteCommentCommand } from 'src/tabsets/commands/DeleteCommentCommand'