Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

:sparkles: Adds launch app functionality in context menu

Alicia Sykes9370f2d1df45
diff --git a/src/components/LinkItems/ContextMenu.vue b/src/components/LinkItems/ContextMenu.vue
index 68378093..3e8de908 100644
--- a/src/components/LinkItems/ContextMenu.vue
+++ b/src/components/LinkItems/ContextMenu.vue
@@ -1,12 +1,24 @@
<template>
<transition name="slide">
- <div class="context-menu" v-if="show"
+ <div class="context-menu" v-if="show && menuEnabled"
:style="posX && posY ? `top:${posY}px;left:${posX}px;` : ''">
<ul>
- <li><SameTabOpenIcon /> Open in Current Tab</li>
- <li><NewTabOpenIcon /> Open in New Tab</li>
- <li><IframeOpenIcon /> Open in Pop-Up Modal</li>
- <li><WorkspaceOpenIcon /> Open in Workspace View </li>
+ <li @click="launch('sametab')">
+ <SameTabOpenIcon />
+ <span>Open in Current Tab</span>
+ </li>
+ <li @click="launch('newtab')">
+ <NewTabOpenIcon />
+ <span>Open in New Tab</span>
+ </li>
+ <li @click="launch('modal')">
+ <IframeOpenIcon />
+ <span>Open in Pop-Up Modal</span>
+ </li>
+ <li @click="launch('workspace')">
+ <WorkspaceOpenIcon />
+ <span>Open in Workspace View</span>
+ </li>
</ul>
</div>
</transition>
@@ -29,9 +41,28 @@ export default {
WorkspaceOpenIcon,
},
props: {
- posX: Number,
- posY: Number,
- show: Boolean,
+ posX: Number, // The X coordinate for positioning
+ posY: Number, // The Y coordinate for positioning
+ show: Boolean, // Should show or hide the menu
+ },
+ data() {
+ return {
+ menuEnabled: !this.isMenuDisabled(), // Specifies if the context menu should be used
+ };
+ },
+ methods: {
+ /* Called on item click, emits an event up to Item */
+ /* in order to launch the current app to a given target */
+ launch(target) {
+ this.$emit('contextItemClick', target);
+ },
+ /* Checks if the user as disabled context menu in config */
+ isMenuDisabled() {
+ if (this.config && this.config.appConfig) {
+ return !!this.config.appConfig.disableContextMenu;
+ }
+ return false;
+ },
},
};
</script>
diff --git a/src/components/LinkItems/Item.vue b/src/components/LinkItems/Item.vue
index 5c5cf412..6bc9ba40 100644
--- a/src/components/LinkItems/Item.vue
+++ b/src/components/LinkItems/Item.vue
@@ -3,7 +3,7 @@
<a @click="itemOpened"
@mouseup.right="openContextMenu"
@contextmenu.prevent
- :href="target !== 'iframe' ? url : '#'"
+ :href="target !== 'modal' ? url : '#'"
:target="target === 'newtab' ? '_blank' : ''"
:class="`item ${!icon? 'short': ''} size-${itemSize}`"
v-tooltip="getTooltipOptions()"
@@ -36,12 +36,14 @@
:posX="contextPos.posX"
:posY="contextPos.posY"
:id="`context-menu-${id}`"
+ @contextItemClick="contextItemClick"
/>
</div>
</template>
<script>
import axios from 'axios';
+import router from '@/router';
import Icon from '@/components/LinkItems/ItemIcon.vue';
import ItemOpenMethodIcon from '@/components/LinkItems/ItemOpenMethodIcon';
import StatusIndicator from '@/components/LinkItems/StatusIndicator';
@@ -58,10 +60,10 @@ export default {
color: String, // Optional text and icon color, specified in hex code
backgroundColor: String, // Optional item background color
url: String, // URL to the resource, optional but recommended
- target: { // Where resource will open, either 'newtab', 'sametab' or 'iframe'
+ target: { // Where resource will open, either 'newtab', 'sametab' or 'modal'
type: String,
default: 'newtab',
- validator: (value) => ['newtab', 'sametab', 'iframe'].indexOf(value) !== -1,
+ validator: (value) => ['newtab', 'sametab', 'modal', 'workspace'].indexOf(value) !== -1,
},
itemSize: String,
enableStatusCheck: Boolean,
@@ -89,9 +91,9 @@ export default {
ContextMenu,
},
methods: {
- /* Called when an item is clicked, manages the opening of iframe & resets the search field */
+ /* Called when an item is clicked, manages the opening of modal & resets the search field */
itemOpened(e) {
- if (e.altKey || this.target === 'iframe') {
+ if (e.altKey || this.target === 'modal') {
e.preventDefault();
this.$emit('triggerModal', this.url);
} else {
@@ -101,7 +103,13 @@ export default {
/* Open custom context menu, and set position */
openContextMenu(e) {
this.contextMenuOpen = !this.contextMenuOpen;
- if (e) this.contextPos = { posX: e.clientX, posY: e.clientY };
+ if (e && window) {
+ // Calculate placement based on cursor and scroll position
+ this.contextPos = {
+ posX: e.clientX + window.pageXOffset,
+ posY: e.clientY + window.pageYOffset,
+ };
+ }
},
/* Closes the context menu, called when user clicks literally anywhere */
closeContextMenu() {
@@ -125,7 +133,7 @@ export default {
switch (this.target) {
case 'newtab': return '"\\f360"';
case 'sametab': return '"\\f24d"';
- case 'iframe': return '"\\f2d0"';
+ case 'modal': return '"\\f2d0"';
default: return '"\\f054"';
}
},
@@ -145,6 +153,26 @@ export default {
};
});
},
+ /* Handle navigation options from the context menu */
+ contextItemClick(method) {
+ const { url } = this;
+ this.contextMenuOpen = false;
+ switch (method) {
+ case 'newtab':
+ window.open(url, '_blank');
+ break;
+ case 'sametab':
+ window.open(url, '_self');
+ break;
+ case 'modal':
+ this.$emit('triggerModal', url);
+ break;
+ case 'workspace':
+ router.push({ name: 'workspace', query: { url } });
+ break;
+ default: window.open(url, '_blank');
+ }
+ },
},
mounted() {
// If ststus checking is enabled, then check service status