From 5c86540b8ee13d3d9787364b4944ea2f3cc17c55 Mon Sep 17 00:00:00 2001 From: Kristaps Fabians Geikins Date: Thu, 22 Sep 2022 18:24:29 +0300 Subject: [PATCH] fix(frontend): batch commit toolbar doesnt appear in vue prod mode (#1023) --- packages/frontend/src/bootstrapper.ts | 8 +++++--- .../stream/composables/commitMultiActions.ts | 20 +++++++------------ packages/frontend/vue.config.js | 4 +++- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/frontend/src/bootstrapper.ts b/packages/frontend/src/bootstrapper.ts index 260978a84..5621b7388 100644 --- a/packages/frontend/src/bootstrapper.ts +++ b/packages/frontend/src/bootstrapper.ts @@ -13,7 +13,11 @@ import { formatNumber } from '@/plugins/formatNumber' Vue.filter('prettynum', formatNumber) // process.env.NODE_ENV is injected by Webpack -Vue.config.productionTip = process.env.NODE_ENV === 'development' +const enableDevMode = + !!process.env.FORCE_VUE_DEVTOOLS || process.env.NODE_ENV === 'development' + +Vue.config.productionTip = enableDevMode +Vue.config.devtools = enableDevMode Vue.use(VTooltip, { defaultDelay: 300, @@ -21,8 +25,6 @@ Vue.use(VTooltip, { defaultHtml: false }) -// RANDOM CHANGE! (testing out gitguardian) - // In highly restrictive sandboxed environments mixpanel init might fail due to document.cookie access Vue.use(VueMixpanel, { token: 'acd87c5a50b56df91a795e999812a3a4', diff --git a/packages/frontend/src/main/lib/stream/composables/commitMultiActions.ts b/packages/frontend/src/main/lib/stream/composables/commitMultiActions.ts index 41990aeb6..69ef47124 100644 --- a/packages/frontend/src/main/lib/stream/composables/commitMultiActions.ts +++ b/packages/frontend/src/main/lib/stream/composables/commitMultiActions.ts @@ -1,4 +1,3 @@ -import { reduce } from 'lodash' import { ref, computed } from 'vue' export enum BatchActionType { @@ -11,19 +10,14 @@ export enum BatchActionType { */ export function useCommitMultiActions() { const selectedCommitsState = ref({} as Record) - const selectedCommitIds = computed(() => - reduce( - selectedCommitsState.value, - (res, val, key) => { - if (val) { - res.push(key) - } + const selectedCommitIds = computed(() => { + const results: string[] = [] + for (const [key, val] of Object.entries(selectedCommitsState.value)) { + if (val) results.push(key) + } - return res - }, - [] as string[] - ) - ) + return results + }) const clearSelectedCommits = () => { selectedCommitsState.value = {} diff --git a/packages/frontend/vue.config.js b/packages/frontend/vue.config.js index b8d0d837f..85454d97e 100644 --- a/packages/frontend/vue.config.js +++ b/packages/frontend/vue.config.js @@ -24,7 +24,9 @@ const config = { // Add plugin for injecting env vars config .plugin('speckle-env-vars') - .use(webpack.EnvironmentPlugin, [{ SPECKLE_SERVER_VERSION: 'unknown' }]) + .use(webpack.EnvironmentPlugin, [ + { SPECKLE_SERVER_VERSION: 'unknown', FORCE_VUE_DEVTOOLS: false } + ]) // Setting source map according to build env config.devtool(isProdBuild ? false : 'eval-source-map')