bfg-common 1.2.61 → 1.2.63

package/components/common/feedback/Feedback.vue

@@ -31,7 +31,7 @@
             v-show="type !== 2"
             v-model:description="description"
             v-model:email="email"
-            :selected-tab="type"
+            :type="type"
             @screen-shot="onScreenShot"
           />
           <common-feedback-visit-portal v-show="type === 2" />
@@ -115,11 +115,12 @@ const hide = (): void => {
 const submit = (): void => {
   if (type.value !== 0 && type.value !== 1) return
 
-  const canvas = document.getElementById('feedbackImg') as HTMLCanvasElement
+  const canvasData = (document.getElementById('feedbackImg') as HTMLCanvasElement).toDataURL()
+  const canvasBlankData = (document.getElementById('feedbackImgBlank') as HTMLCanvasElement).toDataURL()
 
-  const image = canvas?.toDataURL().match(/base64,(.+)/)?.[1] || ''
+  const image = canvasData.match(/base64,(.+)/)?.[1] || ''
   emits('submit', {
-    image,
+    image: canvasData === canvasBlankData ? '' : image,
     type: type.value,
     description: description.value,
     email: email.value,

package/components/common/feedback/Message.vue

@@ -12,13 +12,29 @@
     </div>
     <div class="main-block">
       <span class="text">{{ localization.emailAddress }} </span>
-      <input
-        id="feedback-email-input"
-        v-model="emailLocal"
-        type="email"
-        class="email"
-        :placeholder="localization.optionalInCaseWeNeed"
-      />
+      <!--      <input-->
+      <!--        id="feedback-email-input"-->
+      <!--        v-model="emailLocal"-->
+      <!--        type="email"-->
+      <!--        class="email"-->
+      <!--        :placeholder="localization.optionalInCaseWeNeed"-->
+      <!--      />-->
+
+      <atoms-tooltip-error
+        :has-error="isInvalidEmail"
+        selector="#vm-wizard-vcpus-field input"
+      >
+        <template #elem>
+          <input
+            id="feedback-email-input"
+            v-model="emailLocal"
+            type="email"
+            :class="['email', {'has-error': isInvalidEmail}]"
+            :placeholder="localization.optionalInCaseWeNeed"
+          />
+        </template>
+        <template #content>{{ localization.emailErrorText }}</template>
+      </atoms-tooltip-error>
     </div>
     <div class="main-block">
       <span class="text">{{ localization.additionalDetails }} </span>
@@ -126,6 +142,7 @@
         ref="feedbackImg"
         :class="{ feedbackImg: !hasTakeScreenshot }"
       ></canvas>
+      <canvas id="feedbackImgBlank" style="display: none"></canvas>
     </div>
   </div>
 </template>
@@ -163,6 +180,9 @@ const emailLocal = computed<string>({
     emits('update:email', value)
   },
 })
+const isInvalidEmail = computed<boolean>(
+  () => !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(emailLocal.value)
+)
 const localization = computed<UI_I_Localization>(() => useLocal())
 // const drawingPanel = computed(() => drawingPanelFunc(localization.value))
 
@@ -440,6 +460,10 @@ onBeforeUnmount(() => {
     :deep(.alert.alert-info) {
       width: 100%;
     }
+
+    .has-error {
+      border: 1px solid #db2100;
+    }
   }
 }
 .loadFile {

package/package.json

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