bfg-common 1.5.290 → 1.5.293

package/components/common/spiceConsole/SpiceConsole.vue

@@ -1,84 +1,127 @@
-<template>
-  <div ref="fullScreen" class="spice-console">
-    <div id="vmw" ref="vmScreen" @scroll="onConsoleScroll"></div>
-    <common-spice-console-drawer
-      @toggle-fullscreen="toggle"
-      @send-alt-command="onSendAltCommand"
-    />
-  </div>
-</template>
-<script setup lang="ts">
-import { useFullscreen } from '@vueuse/core'
-import RFB from '@novnc/novnc/core/rfb.js'
-import SpiceConsole from '~/plugins/spice-console/spice.console'
-
-const props = defineProps<{
-  wsUrl: string
-  vmType: string
-  vmId: string
-  host: string
-  port: number
-}>()
-
-let rfb: any
-const vmScreen = ref<any>(null)
-const fullScreen = ref<any>(null)
-const { toggle } = useFullscreen(fullScreen)
-
-const connectWS = (): void => {
-  if (props.vmType === 'VNC') {
-    connectVNC()
-  } else if (props.vmType === 'SPICE') {
-    SpiceConsole.init(props.wsUrl)
-  }
-}
-
-const connectVNC = (): void => {
-  rfb = new RFB(vmScreen.value, props.wsUrl, {
-    protocols: {},
-  })
-}
-
-const vmDisconnect = (): void => {
-  if (props.vmType === 'VNC') {
-    if (rfb) {
-      rfb.disconnect()
-    }
-  }
-}
-
-const onSendAltCommand = (): void => {
-  // @ts-ignore
-  window.app.sendCtrlAltDelete()
-}
-
-const onConsoleScroll = (event: any): void => {
-  app.clientGui.setClientOffset(
-    app.clientGui.clientOffsetX,
-    event.target.scrollTop
-  )
-}
-
-onMounted(() => {
-  connectWS()
-})
-
-onBeforeUnmount(() => {
-  vmDisconnect()
-})
-</script>
-<style scoped lang="scss">
-.spice-console {
-  width: 100vw;
-  height: 100vh;
-  overflow: hidden;
-  position: relative;
-}
-#vmw {
-  overflow-y: auto;
-  overflow-x: auto;
-  position: relative;
-  height: 100vh;
-  background-color: #000;
-}
-</style>
+<template>
+  <div ref="fullScreen" class="spice-console">
+    <div id="vmw" ref="vmScreen" @scroll="onConsoleScroll"></div>
+    <common-spice-console-drawer
+      @toggle-fullscreen="toggle"
+      @send-alt-command="onSendAltCommand"
+    />
+  </div>
+</template>
+<script setup lang="ts">
+import { useFullscreen } from '@vueuse/core'
+import RFB from '@novnc/novnc/core/rfb.js'
+import SpiceConsole from '~/plugins/spice-console/spice.console'
+
+const props = defineProps<{
+  wsUrl: string
+  vmType: string
+  vmId: string
+  host: string
+  port: number
+}>()
+
+let rfb: any
+const vmScreen = ref<any>(null)
+const fullScreen = ref<any>(null)
+const { toggle } = useFullscreen(fullScreen)
+
+const connectWS = (): void => {
+  if (props.vmType === 'VNC') {
+    connectVNC()
+  } else if (props.vmType === 'SPICE') {
+    SpiceConsole.init(props.wsUrl)
+  }
+}
+
+const connectVNC = (): void => {
+  rfb = new RFB(vmScreen.value, props.wsUrl, {
+    protocols: {},
+  })
+}
+
+const vmDisconnect = (): void => {
+  if (props.vmType === 'VNC') {
+    if (rfb) {
+      rfb.disconnect()
+    }
+  }
+}
+
+const onSendAltCommand = (): void => {
+  // @ts-ignore
+  window.app.sendCtrlAltDelete()
+}
+
+const onConsoleScroll = (event: any): void => {
+  app.clientGui.setClientOffset(
+    app.clientGui.clientOffsetX,
+    event.target.scrollTop
+  )
+}
+
+const blockCtrlOrCmdCommands = (e): void => {
+  const blockedKeys = [
+    'e',
+    's',
+    'p',
+    'u',
+    'r',
+    'o',
+    'i',
+    'j',
+    'k',
+    'n',
+    't',
+    'w',
+    'h',
+    'd',
+  ]
+
+  const key = e.key
+  const ctrlOrCmd = e.ctrlKey || e.metaKey
+
+  // Block Ctrl+key or Cmd+key
+  if (ctrlOrCmd && blockedKeys.includes(key.toLowerCase())) {
+    e.preventDefault()
+    e.stopPropagation()
+    // console.log(`Blocked key: ${key}`);
+    return false
+  }
+
+  // Optionally block right-click menu key (context menu)
+  // if (e.key === 'ContextMenu') {
+  //   e.preventDefault();
+  //   return false;
+  // }
+
+  // Optional: block F5/Reload with Ctrl+R as fallback
+  // if (key === 'F5' || (ctrlOrCmd && key.toLowerCase() === 'r')) {
+  //   e.preventDefault();
+  //   return false;
+  // }
+}
+onMounted(() => {
+  connectWS()
+  document.addEventListener('keydown', blockCtrlOrCmdCommands)
+})
+
+onBeforeUnmount(() => {
+  vmDisconnect()
+  document.removeEventListener('keydown', blockCtrlOrCmdCommands)
+})
+</script>
+<style scoped lang="scss">
+.spice-console {
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+  position: relative;
+}
+#vmw {
+  overflow-y: auto;
+  overflow-x: auto;
+  position: relative;
+  height: 100vh;
+  background-color: #000;
+}
+</style>

package/components/common/spiceConsole/lib/models/interfaces.ts

@@ -1,5 +1,5 @@
-export interface UI_I_DeviceOption {
-  label: string
-  value: any
-  disabled?: boolean
-}
+export interface UI_I_DeviceOption {
+  label: string
+  value: any
+  disabled?: boolean
+}

package/components/common/vm/actions/add/New.vue

@@ -155,6 +155,7 @@
       <ui-wizard-block v-if="selectedStep.id === dynamicSteps.selectOptions">
         <template #content>
           <common-vm-actions-common-select-options
+            :is-create-template="selectedCreateType === '1'"
             @change="emits('change-select-options', $event)"
           />
         </template>

package/components/common/vm/actions/add/Old.vue

@@ -13,9 +13,9 @@
     >
       <template #modalBody="{ selectedStep }">
         <atoms-loader
-            v-show="props.isLoading"
-            id="loader"
-            test-id="edit-vm-settings-spinner"
+          v-show="props.isLoading"
+          id="loader"
+          test-id="edit-vm-settings-spinner"
         />
         <div class="add-vm-content">
           <common-vm-actions-common-select-create-type
@@ -76,6 +76,7 @@
           />
           <common-vm-actions-common-select-options
             v-show="selectedStep.id === dynamicSteps.selectOptions"
+            :is-create-template="selectedCreateType === '1'"
             @change="emits('change-select-options', $event)"
           />
           <common-vm-actions-common-select-compatibility
@@ -156,7 +157,9 @@
             :cd-dvd-drives="props.vmtSettings.cdDvdDrives || []"
             :hard-disks="props.vmtSettings.hardDisks || []"
             :networks="props.vmtSettings.networks || []"
-            :customize-hardware-submit="props.customizeHardwareForTemplateSubmit"
+            :customize-hardware-submit="
+              props.customizeHardwareForTemplateSubmit
+            "
             :max-cpus="props.maxCpus"
             :max-memory="props.maxMemory"
             :cpu-models="props.cpuModels"

package/components/common/vm/actions/add/folderTreeView/FolderTreeView.vue

@@ -1,72 +1,72 @@
-<template>
-  <common-vm-actions-add-folder-tree-view-new
-    v-if="isNewView"
-    :nodes="nodes"
-    :loading="loading"
-    @show-nodes="showNodes"
-    @select-node="selectNode"
-  />
-  <common-vm-actions-add-folder-tree-view-old
-    v-else
-    :nodes="nodes"
-    :loading="loading"
-    @show-nodes="showNodes"
-    @select-node="selectNode"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  dataCenter: UI_I_TreeNode
-}>()
-const emits = defineEmits<{
-  (event: 'select-node', value: UI_I_TreeNode): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const nodes = computed<UI_I_TreeNode[]>(
-  () => $store.getters['inventory/getFolderTree'] || []
-)
-const loading = ref<boolean>(false)
-const getTree = async (): Promise<void> => {
-  loading.value = true
-  await $store.dispatch('inventory/A_GET_FOLDER_TREE', null)
-  loading.value = false
-}
-getTree().then(() => {
-  selectNode(props.dataCenter)
-})
-
-const showNodes = ({
-  node,
-  cb,
-}: {
-  node: UI_I_TreeNode
-  cb: () => void
-}): void => {
-  const payload: any = { node, treeName: 'folderTree' }
-  $store.dispatch('inventory/A_SHOW_NODE', payload)
-  cb()
-}
-const selectNode = (node: UI_I_TreeNode): void => {
-  const payload: any = {
-    node,
-    treeName: 'folderTree',
-    doSelect: false,
-  }
-  $store.dispatch('inventory/A_SELECT_NODE', payload)
-
-  emits('select-node', node)
-}
-
-onUnmounted(() => {
-  $store.dispatch('inventory/A_CLEAR_FOLDER_TREE', null)
-})
-</script>
-
-<style scoped lang="scss">
-</style>
+<template>
+  <common-vm-actions-add-folder-tree-view-new
+    v-if="isNewView"
+    :nodes="nodes"
+    :loading="loading"
+    @show-nodes="showNodes"
+    @select-node="selectNode"
+  />
+  <common-vm-actions-add-folder-tree-view-old
+    v-else
+    :nodes="nodes"
+    :loading="loading"
+    @show-nodes="showNodes"
+    @select-node="selectNode"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  dataCenter: UI_I_TreeNode
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: UI_I_TreeNode): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const nodes = computed<UI_I_TreeNode[]>(
+  () => $store.getters['inventory/getFolderTree'] || []
+)
+const loading = ref<boolean>(false)
+const getTree = async (): Promise<void> => {
+  loading.value = true
+  await $store.dispatch('inventory/A_GET_FOLDER_TREE', null)
+  loading.value = false
+}
+getTree().then(() => {
+  selectNode(props.dataCenter)
+})
+
+const showNodes = ({
+  node,
+  cb,
+}: {
+  node: UI_I_TreeNode
+  cb: () => void
+}): void => {
+  const payload: any = { node, treeName: 'folderTree' }
+  $store.dispatch('inventory/A_SHOW_NODE', payload)
+  cb()
+}
+const selectNode = (node: UI_I_TreeNode): void => {
+  const payload: any = {
+    node,
+    treeName: 'folderTree',
+    doSelect: false,
+  }
+  $store.dispatch('inventory/A_SELECT_NODE', payload)
+
+  emits('select-node', node)
+}
+
+onUnmounted(() => {
+  $store.dispatch('inventory/A_CLEAR_FOLDER_TREE', null)
+})
+</script>
+
+<style scoped lang="scss">
+</style>

package/components/common/vm/actions/add/folderTreeView/New.vue

@@ -1,40 +1,40 @@
-<template>
-  <div class="tree-view">
-    <ui-tree
-      :nodes="props.nodes"
-      :expand-all="false"
-      :is-loading="props.loading"
-      @toggle-node="onShowNodes"
-      @select-node="emits('select-node', $event)"
-    >
-      <template #content="{ node }">
-        <div class="flex-align-center">
-          <span :class="['node-icon', node.iconClassName]"></span>
-          <span class="node-name">{{ node.name }}</span>
-        </div>
-      </template>
-    </ui-tree>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  loading: boolean
-  nodes: UI_I_TreeNode[]
-}>()
-const emits = defineEmits<{
-  (event: 'select-node', value: UI_I_TreeNode): void
-  (event: 'show-nodes', value: {
-    node: UI_I_TreeNode
-    cb: () => void
-  }): void
-}>()
-
-const onShowNodes = (node: UI_I_TreeNode) => {
-  emits('show-nodes', { node, cb: (): void => {} })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div class="tree-view">
+    <ui-tree
+      :nodes="props.nodes"
+      :expand-all="false"
+      :is-loading="props.loading"
+      @toggle-node="onShowNodes"
+      @select-node="emits('select-node', $event)"
+    >
+      <template #content="{ node }">
+        <div class="flex-align-center">
+          <span :class="['node-icon', node.iconClassName]"></span>
+          <span class="node-name">{{ node.name }}</span>
+        </div>
+      </template>
+    </ui-tree>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  loading: boolean
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (event: 'show-nodes', value: {
+    node: UI_I_TreeNode
+    cb: () => void
+  }): void
+}>()
+
+const onShowNodes = (node: UI_I_TreeNode) => {
+  emits('show-nodes', { node, cb: (): void => {} })
+}
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/add/folderTreeView/Old.vue

@@ -1,50 +1,50 @@
-<template>
-  <div class="tree-view">
-    <atoms-loader-pre-loader
-      v-show="props.loading"
-      id="loader"
-      class="absolute-center tree-view__loading"
-      :show="true"
-    />
-    <common-recursion-tree
-      :nodes="props.nodes"
-      class="recursion-tree"
-      @get-nodes="emits('show-nodes', $event)"
-      @select-node="emits('select-node', $event)"
-      @contextmenu.prevent
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  loading: boolean
-  nodes: UI_I_TreeNode[]
-}>()
-const emits = defineEmits<{
-  (event: 'select-node', value: UI_I_TreeNode): void
-  (
-    event: 'show-nodes',
-    value: {
-      node: UI_I_TreeNode
-      cb: () => void
-    }
-  ): void
-}>()
-</script>
-
-<style scoped lang="scss">
-.tree-view {
-  &__loading {
-    :deep(.spinner.spinner-inverse) {
-      position: static;
-      width: 45px;
-      height: 45px;
-      min-width: 45px;
-      min-height: 45px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="tree-view">
+    <atoms-loader-pre-loader
+      v-show="props.loading"
+      id="loader"
+      class="absolute-center tree-view__loading"
+      :show="true"
+    />
+    <common-recursion-tree
+      :nodes="props.nodes"
+      class="recursion-tree"
+      @get-nodes="emits('show-nodes', $event)"
+      @select-node="emits('select-node', $event)"
+      @contextmenu.prevent
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  loading: boolean
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (
+    event: 'show-nodes',
+    value: {
+      node: UI_I_TreeNode
+      cb: () => void
+    }
+  ): void
+}>()
+</script>
+
+<style scoped lang="scss">
+.tree-view {
+  &__loading {
+    :deep(.spinner.spinner-inverse) {
+      position: static;
+      width: 45px;
+      height: 45px;
+      min-width: 45px;
+      min-height: 45px;
+    }
+  }
+}
+</style>