diff --git a/src/components/dialogues/EditUrlDialog.vue b/src/components/dialogues/EditUrlDialog.vue
index 9a0e55f0..b6159198 100644
--- a/src/components/dialogues/EditUrlDialog.vue
+++ b/src/components/dialogues/EditUrlDialog.vue
@@ -136,6 +136,4 @@ const updatePlaceholder = (placeholder: string, val: any) => {
const modelFor = (ident: string) => placeholderValues.value.get(ident)
-const tabTitle = () => props.tab.name || props.tab.title
-
diff --git a/src/components/utils/ShortUrl.vue b/src/components/utils/ShortUrl.vue
index 16757911..e66c3a20 100644
--- a/src/components/utils/ShortUrl.vue
+++ b/src/components/utils/ShortUrl.vue
@@ -1,5 +1,5 @@
- {{ shortenUrl() }}
+ {{ props.label ? props.label : shortenUrl() }}
{{ url }}
@@ -8,6 +8,7 @@
const props = defineProps({
url: {type: String, required: true},
+ label: {type: String, required: false},
hostnameOnly: {type: Boolean, default: false}
})
diff --git a/src/components/widgets/PanelTabListElementWidget.vue b/src/components/widgets/PanelTabListElementWidget.vue
index 256c8d4d..30c11edd 100644
--- a/src/components/widgets/PanelTabListElementWidget.vue
+++ b/src/components/widgets/PanelTabListElementWidget.vue
@@ -1,5 +1,6 @@
+
-
+
@@ -72,40 +73,47 @@
-
+
+ @click.stop="gotoTab()">
{{ props.tab.description }}
-
+
-
+
-
-
-
-
-
+
{{ matcherTooltip() }}
+
+
-
+
+
-
+
@@ -171,7 +180,7 @@
-
+
@@ -217,6 +226,8 @@ import {useUtils} from "src/services/Utils";
import {useRouter} from "vue-router";
import {useGroupsStore} from "stores/groupsStore";
import {DeleteChromeGroupCommand} from "src/domain/groups/DeleteChromeGroupCommand";
+import {PlaceholdersType} from "src/models/Placeholders";
+import {uid} from "quasar";
const {inBexMode} = useUtils()
@@ -242,6 +253,7 @@ const tsBadges = ref([])
const newState = ref(false)
const groupName = ref(undefined)
const groups = ref>(new Map())
+const placeholders = ref([])
onMounted(() => {
if ((new Date().getTime() - props.tab.created) < 500) {
@@ -292,6 +304,31 @@ watchEffect(() => {
}
})
+watchEffect(() => {
+ if (props.tab) {
+ const t = props.tab
+ if (t.placeholders && t.placeholders.type === PlaceholdersType.URL_SUBSTITUTION) {
+ const subs = t.placeholders.config
+ Object.entries(subs).forEach(e => {
+ const name = e[0]
+ const val = e[1]
+ val.split(",").forEach((v: string) => {
+ const substitution = v.trim()
+ if (substitution.length > 0) {
+ let useUrl = t.url || ''
+ let useName = t.name || t.title || ''
+ Object.entries(subs).forEach(e1 => {
+ useUrl = useUrl.replaceAll("${" + name + "}", substitution)
+ useName = useName.replaceAll("${" + name + "}", substitution)
+ })
+ placeholders.value.push({url: useUrl, name: substitution})
+ }
+ })
+ })
+ }
+ }
+})
+
const nameOrTitle = (tab: Tab) => {
let nameOrTitle = tab.name ? tab.name : tab.title
if (usePermissionsStore().hasFeature(FeatureIdent.ANNOTATIONS) && tab.annotations?.length > 0) {
@@ -397,6 +434,9 @@ const switchGroup = (group: chrome.tabGroups.TabGroup): void => {
}
}
+const gotoTab = () => NavigationService.openOrCreateTab(props.tab.url || '', props.tab.matcher, props.tab.groupName)
+
+
diff --git a/src/domain/tabs/AddTabToTabset.ts b/src/domain/tabs/AddTabToTabset.ts
index d89ec750..e5b6d30d 100644
--- a/src/domain/tabs/AddTabToTabset.ts
+++ b/src/domain/tabs/AddTabToTabset.ts
@@ -10,6 +10,7 @@ import {useUtils} from "src/services/Utils";
import {useSearchStore} from "stores/searchStore";
import {uid, useQuasar} from "quasar";
import {useGroupsStore} from "stores/groupsStore";
+import PlaceholderUtils from "src/utils/PlaceholderUtils";
const {saveTabset} = useTabsetService()
const {sendMsg} = useUtils()
@@ -41,21 +42,20 @@ export class AddTabToTabsetCommand implements Command {
}
const tabset: Tabset = await useTabsetService().addToTabsetId(this.tabset.id, this.tab, 0)
- // .then((tabset) => {
console.log("sharing...")
// Sharing
if (tabset.sharedId && tabset.sharing === TabsetSharing.PUBLIC) {
tabset.sharing = TabsetSharing.PUBLIC_OUTDATED
}
+ // Placeholder Defaults Application
+ this.tab = PlaceholderUtils.applyForDefaultDomains(this.tab)
+
// the tab has been added to the tabset, but not saved yet
const content = await TabsetService.getContentFor(this.tab)
- // .then((content) => {
- //console.log("got content", content)
let res: any = null
if (content) {
const res2 = await useTabsetService().saveText(this.tab, content['content' as keyof object], content['metas' as keyof object])
- // .then((res) => {
// add to search index
useSearchStore().addToIndex(
uid(), this.tab.name || '',
@@ -64,16 +64,9 @@ export class AddTabToTabsetCommand implements Command {
this.tab.description, content['content' as keyof object],
[this.tabset.id],
this.tab.favIconUrl || '')
- // return res
- // })
- // .then((res) => {
res = new ExecutionResult("result", "Tab was added",)
- // })
} else {
- //console.log("this tabset tabs",this.tabset.tabs)
const res2 = saveTabset(this.tabset)
- // .then((res) => {
- // add to search index
useSearchStore().addToIndex(
uid(), this.tab.name || '',
this.tab.title || '',
@@ -81,18 +74,8 @@ export class AddTabToTabsetCommand implements Command {
this.tab.description, '',
[this.tabset.id],
this.tab.favIconUrl || '')
- // return res
- // })
- // .then(result => {
res = new ExecutionResult(res2, "Tab was added")
- // })
- // .catch((err: any) => {
- // console.error("we are here", err)
- // return Promise.reject("problem")
- // })
}
- // })
- // .then((res) => {
sendMsg('tab-added', {tabsetId: tabset.id})
return res
// })
diff --git a/src/services/ChromeApi.ts b/src/services/ChromeApi.ts
index d09b7397..8e6479c8 100644
--- a/src/services/ChromeApi.ts
+++ b/src/services/ChromeApi.ts
@@ -57,7 +57,6 @@ const persistenceService = IndexedDbPersistenceService
class ChromeApi {
onHeadersReceivedListener = function (details: any) {
- console.log("headerDetails", details)
if (details.url) {
persistenceService.saveRequest(details.url, new RequestInfo(details.statusCode as number, details.responseHeaders || []))
.then(() => console.debug("added request"))
diff --git a/src/services/ChromeListeners.ts b/src/services/ChromeListeners.ts
index 6403e357..8365ce1d 100644
--- a/src/services/ChromeListeners.ts
+++ b/src/services/ChromeListeners.ts
@@ -500,7 +500,6 @@ class ChromeListeners {
if (inIgnoredMessages(request)) {
return true
}
- console.log("handling request", request)
if (request.msg === 'captureThumbnail') {
const screenShotWindow = useWindowsStore().screenshotWindow
this.handleCapture(sender, screenShotWindow, sendResponse)
@@ -599,7 +598,7 @@ class ChromeListeners {
private handleHtml2Links(request: any, sender: chrome.runtime.MessageSender, sendResponse: any) {
if (sender.tab) {
- console.log("handleHtml2Links")
+ console.debug("handleHtml2Links")
saveMetaLinksFor(sender.tab, request.links)
saveLinksFor(sender.tab, request.anchors)
diff --git a/src/services/NavigationService.ts b/src/services/NavigationService.ts
index 58eafd63..6d279ee4 100644
--- a/src/services/NavigationService.ts
+++ b/src/services/NavigationService.ts
@@ -11,11 +11,14 @@ import {FeatureIdent} from "src/models/AppFeature";
class NavigationService {
+ placeholderPattern = /\${[^}]*}/gm
+
async openOrCreateTab(
withUrl: string,
matcher: string | undefined = undefined,
group: string | undefined = undefined
) {
+ withUrl = withUrl.replace(this.placeholderPattern, "")
const useWindowIdent = useTabsStore().getCurrentTabset?.window || 'current'
console.log(`opening url ${withUrl} in window ${useWindowIdent}, group: ${group}, mode: ${process.env.MODE}`)
diff --git a/src/services/TabsetService.ts b/src/services/TabsetService.ts
index 32443cf9..b7ab3865 100644
--- a/src/services/TabsetService.ts
+++ b/src/services/TabsetService.ts
@@ -12,6 +12,7 @@ import {useDB} from "src/services/usePersistenceService";
import {useSpacesStore} from "stores/spacesStore";
import {FirebaseCall} from "src/services/firebase/FirebaseCall";
import {Placeholders, PlaceholdersType} from "src/models/Placeholders";
+import PlaceholderUtils from "src/utils/PlaceholderUtils";
const {getTabset, getCurrentTabset, saveTabset, saveCurrentTabset, tabsetsFor, addToTabset} = useTabsetService()
diff --git a/src/services/TabsetService2.ts b/src/services/TabsetService2.ts
index 641d48fa..9f4f9d92 100644
--- a/src/services/TabsetService2.ts
+++ b/src/services/TabsetService2.ts
@@ -623,37 +623,37 @@ export function useTabsetService() {
let tabs: Tab[] = tabset.tabs
// Tabs with placeholder
- let placeholderTabs: Tab[] = []
- let removeTabIds: string[] = []
- tabs.forEach((t: Tab) => {
- if (t.placeholders && t.placeholders.type === PlaceholdersType.URL_SUBSTITUTION) {
- const subs = t.placeholders.config
- Object.entries(subs).forEach(e => {
- const name = e[0]
- const val = e[1]
- val.split(",").forEach((v: string) => {
- const substitution = v.trim()
- if (substitution.length > 0) {
- const clonedTab = JSON.parse(JSON.stringify(t));
- clonedTab.id = uid()
- clonedTab.description = undefined
- let useUrl = t.url || ''
- let useName = t.name || t.title || ''
- Object.entries(subs).forEach(e1 => {
- useUrl = useUrl.replaceAll("${" + e1[0] + "}", substitution)
- useName = useName.replaceAll("${" + e1[0] + "}", substitution)
- })
- clonedTab.url = useUrl
- clonedTab.name = useName
- placeholderTabs.push(clonedTab)
- removeTabIds.push(t.id)
- }
- })
- })
- }
- })
- tabs = _.filter(tabs, (t: Tab) => removeTabIds.indexOf(t.id) < 0)
- tabs = tabs.concat(placeholderTabs)
+ // let placeholderTabs: Tab[] = []
+ // let removeTabIds: string[] = []
+ // tabs.forEach((t: Tab) => {
+ // if (t.placeholders && t.placeholders.type === PlaceholdersType.URL_SUBSTITUTION) {
+ // const subs = t.placeholders.config
+ // Object.entries(subs).forEach(e => {
+ // const name = e[0]
+ // const val = e[1]
+ // val.split(",").forEach((v: string) => {
+ // const substitution = v.trim()
+ // if (substitution.length > 0) {
+ // const clonedTab = JSON.parse(JSON.stringify(t));
+ // clonedTab.id = uid()
+ // clonedTab.description = undefined
+ // let useUrl = t.url || ''
+ // let useName = t.name || t.title || ''
+ // Object.entries(subs).forEach(e1 => {
+ // useUrl = useUrl.replaceAll("${" + e1[0] + "}", substitution)
+ // useName = useName.replaceAll("${" + e1[0] + "}", substitution)
+ // })
+ // clonedTab.url = useUrl
+ // clonedTab.name = useName
+ // placeholderTabs.push(clonedTab)
+ // removeTabIds.push(t.id)
+ // }
+ // })
+ // })
+ // }
+ // })
+ // tabs = _.filter(tabs, (t: Tab) => removeTabIds.indexOf(t.id) < 0)
+ // tabs = tabs.concat(placeholderTabs)
// TODO order??
diff --git a/src/stores/tabsStore.ts b/src/stores/tabsStore.ts
index 02277427..06d4ce17 100644
--- a/src/stores/tabsStore.ts
+++ b/src/stores/tabsStore.ts
@@ -15,7 +15,6 @@ import {useTabsetService} from "src/services/TabsetService2";
import {useWindowsStore} from "src/stores/windowsStore";
async function queryTabs(): Promise {
- console.log("hier")
// @ts-ignore
return await chrome.tabs.query({currentWindow: true});
}
diff --git a/src/utils/PlaceholderUtils.ts b/src/utils/PlaceholderUtils.ts
new file mode 100644
index 00000000..b06e4e89
--- /dev/null
+++ b/src/utils/PlaceholderUtils.ts
@@ -0,0 +1,59 @@
+import {Tab} from "src/models/Tab";
+import {Placeholders, PlaceholdersType} from "src/models/Placeholders";
+
+class PH {
+
+ constructor(public replacement: string, public values: Map) {
+ }
+
+}
+
+class PlaceholderUtils {
+
+ defaultPlaceholders: Map = new Map(
+ [
+ [/^(.*)(github\.com)\/([^\/]*)\/([^\/]*)\/($)/gm, new PH("$1$2/$3/$4/${path}", new Map([['path', 'actions,issues']]))],
+ [/^(.*)(sueddeutsche\.de)\/($)/gm, new PH("$1$2/$3${path}", new Map([['path', 'muenchen,sport,bayern']]))]
+ ]
+ )
+
+
+ applyForDefaultDomains(tab: Tab): Tab {
+ console.log("in applyForDefaultDomains", tab)
+ const url = tab.url
+ if (url) {
+ for (const regex of this.defaultPlaceholders.keys()) {
+ if (url.match(regex)) {
+ console.log("got match", url, regex)
+ const val = this.defaultPlaceholders.get(regex)
+ if (val) {
+ console.log("found val", val)
+ const substitutions = [...val.values.keys()]
+ console.log("found substitutions", substitutions)
+ const replacement = url.replace(regex, val['replacement' as keyof object])
+ console.log("replacement", replacement)
+ tab.url = replacement
+ tab = this.apply(tab, substitutions, val.values)
+ }
+ }
+ }
+ }
+ return tab
+ }
+
+ apply(tab: Tab, placeholders: string[], placeholderValues: Map) {
+ var config: { [k: string]: any } = {};
+ for (const p of placeholders) {
+ config[p] = placeholderValues.get(p)
+ }
+ console.log("got config", config, Object.keys(config))
+ Object.keys(config).length > 0 ?
+ tab.placeholders = new Placeholders(PlaceholdersType.URL_SUBSTITUTION, tab.id, config) :
+ tab.placeholders = undefined
+ return tab
+ }
+
+
+}
+
+export default new PlaceholderUtils();