bfg-common 1.4.691 → 1.4.693

package/components/common/layout/theHeader/TheHeader.vue

@@ -3,8 +3,6 @@
     v-if="props.newView"
     :is-show-main-menu="props.isShowMainMenu"
     :company-name="props.companyName"
-    :is-beta="props.isBeta"
-    :is-dev="props.isDev"
     :beta-text="props.betaText"
     :global-refresh-loading="props.globalRefreshLoading"
     :hostname="props.hostname"
@@ -36,8 +34,6 @@
   <common-layout-the-header-old
     v-else
     :company-name="props.companyName"
-    :is-beta="props.isBeta"
-    :is-dev="props.isDev"
     :beta-text="props.betaText"
     :global-refresh-loading="props.globalRefreshLoading"
     :hostname="props.hostname"
@@ -78,8 +74,6 @@ import { checkIsTokenExpired } from '~/lib/utils/token'
 const props = defineProps<{
   isShowMainMenu: boolean
   companyName: string
-  isBeta: boolean
-  isDev: boolean
   betaText: string
   globalRefreshLoading: boolean
   project: UI_T_Project

package/components/common/layout/theHeader/TheHeaderNew.vue

@@ -47,10 +47,6 @@
           <span class="title pointer"
             >{{ props.companyName }}® {{ props.projectName }}</span
           >
-          <span v-if="props.isBeta" class="badge-info">{{
-            props.betaText
-          }}</span>
-          <span v-else-if="props.isDev" class="badge-info">Dev</span>
         </nuxt-link>
       </div>
       <div class="right-content">
@@ -142,8 +138,6 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 const props = defineProps<{
   isShowMainMenu: boolean
   companyName: string
-  isBeta: boolean
-  isDev: boolean
   betaText: string
   globalRefreshLoading: boolean
   project: UI_T_Project

package/components/common/layout/theHeader/TheHeaderOld.vue

@@ -27,12 +27,6 @@
             >{{ props.companyName }}<sup><b>®</b></sup>
             {{ props.projectName }}</span
           >
-          <span v-if="props.isBeta" class="beta-version badge badge-info">{{
-            props.betaText
-          }}</span>
-          <span v-else-if="props.isDev" class="beta-version badge badge-info"
-            >Dev</span
-          >
         </nuxt-link>
       </div>
       <form>
@@ -112,8 +106,6 @@ import { findInLocals } from '~/components/common/selectLanguage/lib/utils/utils
 
 const props = defineProps<{
   companyName: string
-  isBeta: boolean
-  isDev: boolean
   betaText: string
   globalRefreshLoading: boolean
   project: UI_T_Project

package/components/common/layout/theHeader/helpMenu/About.vue

@@ -7,8 +7,6 @@
       :about-heading-text="aboutHeadingText"
       :about-desc-one="aboutDesc1"
       :about-desc-second="aboutDesc2"
-      :is-beta-version="props.isBeta"
-      :is-dev="props.isDev"
       :project-name="props.projectName"
       :url="companyWebSitePath"
       @hide="emits('hide')"
@@ -21,8 +19,6 @@
       :about-heading-text="aboutHeadingText"
       :about-desc-one="aboutDesc1"
       :about-desc-second="aboutDesc2"
-      :is-beta-version="props.isBeta"
-      :is-dev="props.isDev"
       :project-name="props.projectName"
       :url="companyWebSitePath"
       @hide="emits('hide')"
@@ -35,8 +31,6 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const props = defineProps<{
   version: string
-  isBeta: boolean
-  isDev: boolean
   projectName: string
 }>()
 const emits = defineEmits<{

package/components/common/layout/theHeader/helpMenu/HelpMenu.vue

@@ -11,8 +11,6 @@
   <common-layout-the-header-help-menu-about
     v-if="isShowAbout"
     :version="version"
-    :is-beta="isBeta"
-    :is-dev="isDev"
     :project-name="props.projectName"
     @hide="isShowAbout = false"
   />
@@ -24,7 +22,7 @@ const props = defineProps<{
 }>()
 
 const { $store }: any = useNuxtApp()
-const { version, isBeta, isDev } = useAppVersion()
+const { version } = useAppVersion()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 

package/components/common/layout/theHeader/helpMenu/aboutNew/AboutNew.vue

@@ -46,8 +46,6 @@ const props = defineProps<{
   aboutHeadingText: string
   aboutDescOne: string
   aboutDescSecond: string
-  isBetaVersion: boolean
-  isDev: boolean
   projectName: string
   url: string
 }>()

package/components/common/layout/theHeader/helpMenu/aboutOld/AboutOld.vue

@@ -13,14 +13,6 @@
           <h4 class="secondary-title">
             {{ props.subtitle }}
           </h4>
-          <span
-            v-if="props.isBetaVersion"
-            class="beta-version badge badge-info"
-            >{{ localization.common.beta }}</span
-          >
-          <span v-else-if="isDev" class="beta-version badge badge-info"
-            >Dev</span
-          >
         </div>
         <button id="about-modal-button-close" class="close">
           <atoms-the-icon
@@ -66,8 +58,6 @@ const props = defineProps<{
   aboutHeadingText: string
   aboutDescOne: string
   aboutDescSecond: string
-  isBetaVersion: boolean
-  isDev: boolean
   projectName: string
   url: string
 }>()

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

@@ -564,8 +564,6 @@ const onFinish = (): void => {
 
 const selectedNavItem = ref<UI_T_SelectedNavItem>(0)
 
-const { isDev } = useAppVersion()
-
 const nameFormSubmit = ref<null | Function>(null)
 const computeResourceSubmit = ref<null | Function>(null)
 const storageSubmit = ref<null | Function>(null)
@@ -573,7 +571,8 @@ const customizeHardwareSubmit = ref<null | Function>(null)
 const compatibility = ref<UI_I_OptionItem[]>(
   capabilities.compatibility.filter((camp) => {
     let result = true
-    if (isDev && camp.value === 'pvm-2') result = false
+    // if (isDev && camp.value === 'pvm-2') result = false
+    if (camp.value === 'pvm-2') result = false
     return result
   })
 )

package/composables/useAppVersion.ts

@@ -1,22 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION
-
-  const regexHasDot = /\./
-  // const regexHasDotAndB = /\..*b/
-  const regexHasDotAndB = /\.\d*b$/
-  const regexHasDotAndD = /\..*d/
-
-  const isBeta = regexHasDotAndB.test(version)
-  const isDev =
-    regexHasDotAndD.test(version) ||
-    (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    isBeta,
-    isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION as string
+
+  // const regexHasDot = /\./
+  // const regexHasDotAndB = /\.\d*b$/
+  // const regexHasDotAndD = /\..*d/
+
+  // const isBeta = regexHasDotAndB.test(version)
+  // const isDev =
+  //   regexHasDotAndD.test(version) ||
+  //   (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    // isBeta,
+    // isDev,
+  }
+}

package/lib/models/composables/useAppVersion/interfaces.ts

@@ -1,5 +1,5 @@
 export interface UI_I_UseAppVersionReturnType {
   version: string
-  isBeta: boolean
-  isDev: boolean
+  // isBeta: boolean
+  // isDev: boolean
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.691",
+  "version": "1.4.693",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",