bfg-common 1.5.486 → 1.5.488

package/components/common/layout/theHeader/feedback/new/New.vue

@@ -7,8 +7,8 @@
       <ui-modal
         :width="!options.isAnnotateImage ? '560px' : '880px'"
         :title="title"
+        :texts="{}"
         test-id="feedback-modal"
-        class="feedback"
         show
         @hide="onHideModal"
       >
@@ -106,7 +106,7 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedTab = ref<UI_T_FeedbackTab>()
+const selectedTab = ref<UI_T_FeedbackTab | null>(null)
 const isValidForm = ref<boolean>(true)
 const options = ref<UI_I_FeedbackCanvasOptions>({
   isAnnotateImage: false,

package/components/common/layout/theHeader/feedback/new/description/Description.vue

@@ -7,9 +7,9 @@
       :disabled="!selectedTab"
       :placeholder="descriptionTextPlaceholder"
       :error="descriptionErrorText"
+      height=""
       test-id="feedback-description"
-    >
-    </ui-textarea>
+    />
   </div>
 </template>
 
@@ -18,7 +18,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_FeedbackTab } from '~/components/common/layout/theHeader/feedback/new/tabs/lib/models/types'
 
 const props = defineProps<{
-  selectedTab: UI_T_FeedbackTab
+  selectedTab: UI_T_FeedbackTab | null
 }>()
 const descriptionModelLocal = defineModel<string>({ required: true })
 const isValidModel = defineModel<boolean>('isValid', { required: true })

package/components/common/layout/theHeader/feedback/new/tabs/Tabs.vue

@@ -21,12 +21,14 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_FeedbackTab } from '~/components/common/layout/theHeader/feedback/new/tabs/lib/models/types'
+import type { UI_I_Tabs } from '~/components/common/layout/theHeader/feedback/new/tabs/lib/models/interfaces'
 import { tabsFunc } from '~/components/common/layout/theHeader/feedback/new/tabs/lib/config/tabs'
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedTab = defineModel<UI_T_FeedbackTab>({ required: true })
-const tabs = computed<any[]>(() =>
+const selectedTab = defineModel<UI_T_FeedbackTab | null>({ required: true })
+
+const tabs = computed<UI_I_Tabs[]>(() =>
   tabsFunc(localization.value, selectedTab.value)
 )
 </script>

package/components/common/layout/theHeader/feedback/new/tabs/lib/config/tabs.ts

@@ -1,10 +1,11 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_FeedbackTab } from '~/components/common/layout/theHeader/feedback/new/tabs/lib/models/types'
+import type { UI_I_Tabs } from '~/components/common/layout/theHeader/feedback/new/tabs/lib/models/interfaces'
 
 export const tabsFunc = (
   localization: UI_I_Localization,
-  selectedTab: UI_T_FeedbackTab
-): any[] => {
+  selectedTab: UI_T_FeedbackTab | null
+): UI_I_Tabs[] => {
   return [
     {
       iconName: 'warning-outline',

package/components/common/layout/theHeader/feedback/new/tabs/lib/models/interfaces.ts

@@ -0,0 +1,5 @@
+export interface UI_I_Tabs {
+  iconName: string
+  label: string
+  isSelected: boolean
+}

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

@@ -1,79 +1,79 @@
-<template>
-  <Teleport to="body">
-    <common-layout-the-header-help-menu-about-new
-      v-if="isNewView"
-      :title="title"
-      :subtitle="subtitle"
-      :about-heading-text="aboutHeadingText"
-      :about-desc-one="aboutDesc1"
-      :about-desc-second="aboutDesc2"
-      :project-name="props.projectName"
-      :url="companyWebSitePath"
-      @hide="emits('hide')"
-    />
-
-    <common-layout-the-header-help-menu-about-old
-      v-else
-      :title="title"
-      :subtitle="subtitle"
-      :about-heading-text="aboutHeadingText"
-      :about-desc-one="aboutDesc1"
-      :about-desc-second="aboutDesc2"
-      :project-name="props.projectName"
-      :url="companyWebSitePath"
-      @hide="emits('hide')"
-    />
-  </Teleport>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  version: string
-  projectName: string
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-const config = useRuntimeConfig()
-
-const companyName = computed<string>(
-  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
-)
-const brandName = computed<string>(
-  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
-)
-
-const companyWebSitePath = ref<string>(config.public.SUPPORT_SITE)
-
-const title = computed<string>(() => `${brandName.value}® ${props.projectName}`)
-const subtitle = computed<string>(() =>
-  localization.value.layout.aboutWebClientVersion
-    .replace('{0}', props.projectName)
-    .replace('{1}', props.version)
-)
-
-const aboutHeadingText = computed<string>(() =>
-  localization.value.layout.aboutHeading.replace(
-    '{companyName}',
-    companyName.value
-  ).replace(
-    '{year}',
-      new Date().getFullYear() + ''
-  )
-)
-
-const aboutDesc = computed<string[]>(() =>
-  localization.value.layout.aboutDesc
-    .replaceAll('{companyName}', companyName.value)
-    .replaceAll('{trademark}', brandName.value).split('{url}')
-)
-const aboutDesc1 = computed<string>(() => aboutDesc.value[0])
-const aboutDesc2 = computed<string>(() => aboutDesc.value[1])
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
+<template>
+  <Teleport to="body">
+    <common-layout-the-header-help-menu-about-new
+      v-if="isNewView"
+      :title="title"
+      :subtitle="subtitle"
+      :about-heading-text="aboutHeadingText"
+      :about-desc-one="aboutDesc1"
+      :about-desc-second="aboutDesc2"
+      :project-name="props.projectName"
+      :url="companyWebSitePath"
+      @hide="emits('hide')"
+    />
+
+    <common-layout-the-header-help-menu-about-old
+      v-else
+      :title="title"
+      :subtitle="subtitle"
+      :about-heading-text="aboutHeadingText"
+      :about-desc-one="aboutDesc1"
+      :about-desc-second="aboutDesc2"
+      :project-name="props.projectName"
+      :url="companyWebSitePath"
+      @hide="emits('hide')"
+    />
+  </Teleport>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  version: string
+  projectName: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+const config = useRuntimeConfig()
+
+const companyName = computed<string>(
+  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
+)
+const brandName = computed<string>(
+  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
+)
+
+const companyWebSitePath = ref<string>(config.public.SUPPORT_SITE)
+
+const title = computed<string>(() => `${brandName.value}® ${props.projectName}`)
+const subtitle = computed<string>(() =>
+  localization.value.layout.aboutWebClientVersion
+    .replace('{0}', props.projectName)
+    .replace('{1}', props.version)
+)
+
+const aboutHeadingText = computed<string>(() =>
+  localization.value.layout.aboutHeading.replace(
+    '{companyName}',
+    companyName.value
+  ).replace(
+    '{year}',
+      new Date().getFullYear() + ''
+  )
+)
+
+const aboutDesc = computed<string[]>(() =>
+  localization.value.layout.aboutDesc
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value).split('{url}')
+)
+const aboutDesc1 = computed<string>(() => aboutDesc.value[0])
+const aboutDesc2 = computed<string>(() => aboutDesc.value[1])
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>

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

@@ -1,95 +1,96 @@
-<template>
-  <ui-modal
-    :title="props.title"
-    :subtitle="props.subtitle"
-    test-id="about-modal"
-    width="720px"
-    class="about-modal"
-    @hide="onHideModal"
-  >
-    <template #content>
-      <ui-modal-block-standard>
-        <div class="about-modal__text">
-          <p>{{ aboutHeadingText }}</p>
-
-          <p>{{ localization.layout.aboutSubtitle }}</p>
-        </div>
-
-        <div class="about-modal__description">
-          {{ props.aboutDescOne }}<a
-            id="about-description-link"
-            :href="url"
-            data-id="about-description-link"
-            target="_blank"
-            class="about-modal__description-link"
-          >
-            {{ props.url }}
-          </a>{{ props.aboutDescSecond }}
-        </div>
-      </ui-modal-block-standard>
-    </template>
-    <template #footer><div class="modal-footer-block"></div></template>
-  </ui-modal>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  title: string
-  subtitle: string
-  aboutHeadingText: string
-  aboutDescOne: string
-  aboutDescSecond: string
-  projectName: string
-  url: string
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const onHideModal = (): void => {
-  emits('hide')
-}
-</script>
-
-<style lang="scss" scoped>
-.modal-container-standard {
-  padding-top: 12px;
-  padding-bottom: 12px;
-
-  .about-modal {
-    &__text {
-      color: var(--about-text-color);
-      font-size: 13px;
-      font-weight: 400;
-      line-height: 15.73px;
-
-      p:last-child {
-        margin: 16px 0;
-      }
-    }
-    &__description {
-      color: var(--about-text-color);
-      font-size: 13px;
-      font-weight: 400;
-      line-height: 15.73px;
-
-      &-link {
-        color: var(--about-text-link-color);
-        &:hover {
-          color: var(--about-text-link-hover-color);
-        }
-      }
-    }
-  }
-}
-.modal-footer-block {
-  height: 32px;
-}
-:deep(.title-wrapper__subtitle) {
-  max-width: 400px;
-}
-</style>
+<template>
+  <ui-modal
+    :title="props.title"
+    :subtitle="props.subtitle"
+    :texts="{}"
+    test-id="about-modal"
+    width="720px"
+    show
+    @hide="onHideModal"
+  >
+    <template #content>
+      <ui-modal-block-standard>
+        <div class="about-modal__text">
+          <p>{{ aboutHeadingText }}</p>
+
+          <p>{{ localization.layout.aboutSubtitle }}</p>
+        </div>
+
+        <div class="about-modal__description">
+          {{ props.aboutDescOne }}<a
+            id="about-description-link"
+            :href="url"
+            data-id="about-description-link"
+            target="_blank"
+            class="about-modal__description-link"
+          >
+            {{ props.url }}
+          </a>{{ props.aboutDescSecond }}
+        </div>
+      </ui-modal-block-standard>
+    </template>
+    <template #footer><div class="modal-footer-block"></div></template>
+  </ui-modal>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  title: string
+  subtitle: string
+  aboutHeadingText: string
+  aboutDescOne: string
+  aboutDescSecond: string
+  projectName: string
+  url: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onHideModal = (): void => {
+  emits('hide')
+}
+</script>
+
+<style lang="scss" scoped>
+.modal-container-standard {
+  padding-top: 12px;
+  padding-bottom: 12px;
+
+  .about-modal {
+    &__text {
+      color: var(--about-text-color);
+      font-size: 13px;
+      font-weight: 400;
+      line-height: 15.73px;
+
+      p:last-child {
+        margin: 16px 0;
+      }
+    }
+    &__description {
+      color: var(--about-text-color);
+      font-size: 13px;
+      font-weight: 400;
+      line-height: 15.73px;
+
+      &-link {
+        color: var(--about-text-link-color);
+        &:hover {
+          color: var(--about-text-link-hover-color);
+        }
+      }
+    }
+  }
+}
+.modal-footer-block {
+  height: 32px;
+}
+:deep(.title-wrapper__subtitle) {
+  max-width: 400px;
+}
+</style>

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

@@ -1,79 +1,79 @@
-<template>
-  <Teleport to="body">
-    <atoms-modal :title="props.title" show width="864px" test-id="about-modal">
-      <template #modalHeader>
-        <div class="flex-align-center">
-          <h3 class="modal-title">{{ brandName }}® {{ props.projectName }}</h3>
-          <span class="separator" />
-          <h4 class="secondary-title">
-            {{ props.subtitle }}
-          </h4>
-        </div>
-        <button id="about-modal-button-close" class="close">
-          <atoms-the-icon
-            data-id="about-modal-button-close-icon"
-            class="close-icon"
-            name="close"
-            @click="() => emits('hide')"
-          />
-        </button>
-      </template>
-
-      <template #modalBody>
-        <div class="about-vsphere-dialog-legal-section">
-          <p>{{ props.aboutHeadingText }}</p>
-          <p>{{ localization.layout.aboutSubtitle }}</p>
-        </div>
-
-        <div class="about-vsphere-dialog-legal-section description">
-          {{ props.aboutDescOne }}<a
-            id="about-description-link"
-            :href="url"
-            data-id="about-description-link"
-            target="_blank"
-            >{{ props.url }}</a
-          >{{ props.aboutDescSecond }}
-        </div>
-      </template>
-
-      <template #modalFooter>
-        <span></span>
-      </template>
-    </atoms-modal>
-  </Teleport>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  title: string
-  subtitle: string
-  aboutHeadingText: string
-  aboutDescOne: string
-  aboutDescSecond: string
-  projectName: string
-  url: string
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const config = useRuntimeConfig()
-
-const brandName = computed<string>(
-  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
-)
-</script>
-
-<style lang="scss" scoped>
-.modal-title {
-  color: var(--main-color-mode);
-}
-.description {
-  padding-top: 10px;
-  font-size: 13px;
-  line-height: 19px;
-}
-</style>
+<template>
+  <Teleport to="body">
+    <atoms-modal :title="props.title" show width="864px" test-id="about-modal">
+      <template #modalHeader>
+        <div class="flex-align-center">
+          <h3 class="modal-title">{{ brandName }}® {{ props.projectName }}</h3>
+          <span class="separator" />
+          <h4 class="secondary-title">
+            {{ props.subtitle }}
+          </h4>
+        </div>
+        <button id="about-modal-button-close" class="close">
+          <atoms-the-icon
+            data-id="about-modal-button-close-icon"
+            class="close-icon"
+            name="close"
+            @click="() => emits('hide')"
+          />
+        </button>
+      </template>
+
+      <template #modalBody>
+        <div class="about-vsphere-dialog-legal-section">
+          <p>{{ props.aboutHeadingText }}</p>
+          <p>{{ localization.layout.aboutSubtitle }}</p>
+        </div>
+
+        <div class="about-vsphere-dialog-legal-section description">
+          {{ props.aboutDescOne }}<a
+            id="about-description-link"
+            :href="url"
+            data-id="about-description-link"
+            target="_blank"
+            >{{ props.url }}</a
+          >{{ props.aboutDescSecond }}
+        </div>
+      </template>
+
+      <template #modalFooter>
+        <span></span>
+      </template>
+    </atoms-modal>
+  </Teleport>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  title: string
+  subtitle: string
+  aboutHeadingText: string
+  aboutDescOne: string
+  aboutDescSecond: string
+  projectName: string
+  url: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const config = useRuntimeConfig()
+
+const brandName = computed<string>(
+  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
+)
+</script>
+
+<style lang="scss" scoped>
+.modal-title {
+  color: var(--main-color-mode);
+}
+.description {
+  padding-top: 10px;
+  font-size: 13px;
+  line-height: 19px;
+}
+</style>

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePasswordNew.vue

@@ -5,7 +5,6 @@
     :subtitle="props.subtitle"
     width="560px"
     test-id="change-password-modal"
-    class="change-password"
     show
     @submit="onSubmit"
     @hide="onHideModal"
@@ -17,8 +16,8 @@
           :messages="[alertErrorText]"
           test-id="change-password-error-alert"
           type="error"
-          hide-close-button
           class="change-password__alert"
+          hide-close-button
         />
 
         <p class="change-password__description">

package/components/common/layout/theHeader/userMenu/modals/preferences/PreferencesNew.vue

@@ -1,8 +1,10 @@
 <template>
   <ui-modal
     :title="localization.common.preferences"
+    :texts="modalTexts"
     test-id="user-preferences-modal"
     width="580px"
+    show
     @reset="emits('reset')"
     @submit="emits('submit')"
     @hide="onHide"
@@ -57,6 +59,7 @@
 
 <script setup lang="ts">
 import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_LangValue, UI_T_Project } from '~/lib/models/types'
 import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
@@ -85,6 +88,12 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const modalTexts = ref<UI_I_ModalTexts>({
+  resetToDefault: localization.value.common.resetToDefault,
+  button1: localization.value.common.cancel,
+  button2: localization.value.common.save,
+})
+
 const isSphere = ref<boolean>(props.project === 'sphere')
 
 const onHide = (): void => {

package/components/common/layout/theHeader/userMenu/modals/preferences/view/ViewNew.vue

@@ -14,7 +14,11 @@
         </div>
 
         <div class="flex-align-center">
-          <ui-switch v-model="newViewLocal" :label="localization.common.newView" />
+          <ui-switch
+            v-model="newViewLocal"
+            :label="localization.common.newView"
+            test-id="view-switch"
+          />
         </div>
       </div>
     </div>
@@ -31,4 +35,4 @@ const props = defineProps<{
 const newViewLocal = defineModel<boolean>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
+</script>