@eturnity/eturnity_reusable_components 8.26.10 → 8.26.11-EPDM-15023.0

package/src/components/barchart/BottomFields.vue

@@ -22,7 +22,7 @@
         <!-- For stacked bar chart -->
         <template v-if="seriesData.length">
           <InputRow
-            v-for="series in seriesData"
+            v-for="(series, seriesIndex) in seriesData"
             :key="series.name"
             :data-series-name="series.name"
           >
@@ -36,8 +36,10 @@
                 :allow-negative="false"
                 :default-number="0"
                 :disabled="isInputsDisabled"
+                :error-message="getInputErrorMessage(series.data, item.label)"
                 input-height="36px"
                 :is-disabled-styled-only="true"
+                :is-error="getIsError(series.data, item.label)"
                 :is-info-border="
                   fieldMode === 'percentage'
                     ? calculatePercentageTotal(item.label) !== 100
@@ -117,8 +119,10 @@
               <InputNumber
                 :allow-negative="false"
                 :disabled="isInputsDisabled"
+                :error-message="item.errorMessage"
                 input-height="36px"
                 :is-disabled-styled-only="true"
+                :is-error="item.isError"
                 :min-decimals="0"
                 :number-precision="0"
                 text-align="center"
@@ -142,6 +146,11 @@
       </InfoCardBody>
     </InfoCard>
   </InfoCardContainer>
+  <InfoCardContainer v-if="hasInputErrors" :y-axis-width="yAxisWidth">
+    <InfoCard align-items="center" type="error_minor">
+      <InfoCardBody> {{ inputErrorMessage }} </InfoCardBody>
+    </InfoCard>
+  </InfoCardContainer>
 </template>
 
 <script setup>
@@ -204,6 +213,10 @@
       type: String,
       default: '',
     },
+    inputErrorMessage: {
+      type: String,
+      default: '',
+    },
   })
 
   const seriesData = ref([])
@@ -229,6 +242,8 @@
         label: d.label,
         value: d.value,
         percentage: d.percentage,
+        isError: d.isError,
+        errorMessage: d.errorMessage,
         originalValue: currentSeriesData.length
           ? currentSeriesData[itemIndex].data[dIndex].originalValue
           : d.value,
@@ -275,7 +290,7 @@
     }
   }
 
-  const getDisplayValue = (data, label, shouldRound = true) => {
+  const getDisplayValue = (data, label) => {
     if (props.fieldMode === 'absolute') {
       return data.find((d) => d.label === label)?.value
     }
@@ -283,6 +298,13 @@
     return data.find((d) => d.label === label)?.percentage
   }
 
+  const getIsError = (data, label) => {
+    return data.find((d) => d.label === label)?.isError
+  }
+  const getInputErrorMessage = (data, label) => {
+    return data.find((d) => d.label === label)?.errorMessage
+  }
+
   const calculatePercentageTotal = (label) => {
     const percentageTotal = seriesData.value.reduce((sum, series) => {
       const percentage =
@@ -336,6 +358,14 @@
       return calculatePercentageTotal(d.label) !== 100
     })
   })
+  const hasInputErrors = computed(() => {
+    if (seriesData.value.length) {
+      return seriesData.value.some((serie) =>
+        serie.data.some((item) => item.isError)
+      )
+    }
+    return props.data.some((item) => item.isError)
+  })
 
   const handleFieldsScroll = (event) => {
     emit('sync-scroll', event.target.scrollLeft)

package/src/components/barchart/index.vue

@@ -166,6 +166,7 @@
       :is-inputs-disabled="isLoading"
       :is-scrollable="isScrollable"
       :percentage-error-message="percentageErrorMessage"
+      :input-error-message="inputErrorMessage"
       :series="series"
       :y-axis-width="yAxisWidth"
       @input-blur="handleInputBlur"
@@ -307,6 +308,10 @@
       type: String,
       default: '',
     },
+    inputErrorMessage: {
+      type: String,
+      default: '',
+    },
   })
 
   const generateChartId = () =>

package/src/components/buttons/mainButton/index.vue

@@ -7,11 +7,13 @@
       :data-id="dataId"
       :data-qa-id="dataQaId"
       :height="height"
+      :is-active="isActive"
       :is-disabled="isDisabled"
       :min-width="minWidth"
       :no-wrap="noWrap"
       :type="type"
       :variant="variant"
+      :width="width"
     >
       <LabelComponent :has-icon="Boolean(icon)">
         <Icon
@@ -50,11 +52,13 @@
     type: String,
     isDisabled: Boolean,
     minWidth: String,
+    width: String,
     noWrap: Boolean,
     height: String,
     variant: String,
     buttonSize: String,
     appTheme: String,
+    isActive: Boolean,
   }
   const ButtonContainer = styled('div', ButtonAttrs)`
     display: flex;
@@ -73,6 +77,9 @@
       props.isDisabled
         ? props.theme.mainButton[props.appTheme][props.type][props.variant]
             .disabled.backgroundColor
+        : props.isActive
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .active.backgroundColor
         : props.theme.mainButton[props.appTheme][props.type][props.variant]
             .default.backgroundColor};
     border: ${(props) => {
@@ -91,7 +98,7 @@
     ${(props) => (props.noWrap ? `white-space: nowrap;` : '')};
     height: ${(props) => props.height};
     line-height: 1;
-
+    width: ${(props) => props.width};
     &:hover {
       background-color: ${(props) =>
         props.isDisabled
@@ -170,6 +177,11 @@
         default: false,
         type: Boolean,
       },
+      isActive: {
+        required: false,
+        default: false,
+        type: Boolean,
+      },
       icon: {
         required: false,
         default: null,
@@ -204,6 +216,11 @@
         default: null,
         type: String,
       },
+      width: {
+        required: false,
+        default: 'auto',
+        type: String,
+      },
       height: {
         required: false,
         default: 'auto',

package/src/components/infoText/index.vue

@@ -49,7 +49,10 @@
         <slot name="trigger"></slot>
       </IconWrapper>
     </div>
-    <Teleport v-if="isVisible && (!!text || $slots.default)" to="body">
+    <Teleport
+      v-if="!hideInfoText && isVisible && (!!text || $slots.default)"
+      to="body"
+    >
       <TextWrapper data-test-id="info_text_wrapper" :style="wrapperStyle">
         <TextOverlay
           ref="infoBox"

package/src/components/inputs/inputNumber/index.vue

@@ -799,6 +799,10 @@
         type: Boolean,
         default: false,
       },
+      hasSpaceBetweenUnit: {
+        type: Boolean,
+        default: true,
+      },
     },
     data() {
       return {
@@ -812,8 +816,12 @@
       displayedPlaceholder() {
         if (this.placeholder) return this.placeholder
         if (this.defaultNumber)
-          return `${this.defaultNumber} ${this.unitName ? this.unitName : ''}`
-        return `${this.minNumber || 0} ${this.unitName ? this.unitName : ''}`
+          return `${this.defaultNumber}${this.hasSpaceBetweenUnit ? ' ' : ''}${
+            this.unitName ? this.unitName : ''
+          }`
+        return `${this.minNumber || 0}${this.hasSpaceBetweenUnit ? ' ' : ''}${
+          this.unitName ? this.unitName : ''
+        }`
       },
       hasSlot() {
         return !!this.$slots.default
@@ -1027,8 +1035,9 @@
           return
         }
         this.textInput = this.formatWithCurrency(this.value)
+        const textInputWithoutUnit = this.formatWithoutUnit(this.value)
         this.enteredValue = stringToNumber({
-          value: this.textInput,
+          value: textInputWithoutUnit,
           numberPrecision: this.numberPrecision,
           minDecimals: this.minDecimals,
         })
@@ -1049,6 +1058,38 @@
           this.$refs.inputField1.$el.blur()
         })
       },
+      formatWithoutUnit(value) {
+        let adjustedMinValue =
+          value || value === 0
+            ? value
+            : this.defaultNumber
+            ? this.defaultNumber
+            : this.minNumber || this.minNumber === 0
+            ? this.minNumber
+            : ''
+        if (adjustedMinValue || adjustedMinValue === 0) {
+          let input = this.numberToStringEnabled
+            ? numberToString({
+                value: adjustedMinValue,
+                numberPrecision: this.numberPrecision,
+                minDecimals: this.minDecimals,
+              })
+            : adjustedMinValue
+          return input
+        } else if (!adjustedMinValue && adjustedMinValue !== 0) {
+          return ''
+        } else if (this.isFocused) {
+          return value
+        } else {
+          return this.numberToStringEnabled
+            ? numberToString({
+                value: adjustedMinValue,
+                numberPrecision: this.numberPrecision,
+                minDecimals: this.minDecimals,
+              })
+            : adjustedMinValue
+        }
+      },
       formatWithCurrency(value) {
         let adjustedMinValue =
           value || value === 0
@@ -1069,7 +1110,7 @@
           let unit = this.showLinearUnitName ? '' : this.unitName
           //return input + ' ' + unit
           if (unit) {
-            return input + ' ' + unit
+            return `${input}${this.hasSpaceBetweenUnit ? ' ' : ''}${unit}`
           }
           return input
         } else if (!adjustedMinValue && adjustedMinValue !== 0) {

package/src/components/progressStep/index.vue

@@ -11,8 +11,8 @@
         >
           <RcIcon
             v-if="stepIndex < currentStepIndex"
-            color="white"
-            hovered-color="white"
+            :color="theme.semanticColors.purple[500]"
+            :hovered-color="theme.semanticColors.purple[500]"
             name="checkmark_thin"
             size="16px"
           />
@@ -44,6 +44,7 @@
   // />
   import styled from 'vue3-styled-components'
   import RcIcon from '../icon'
+  import theme from '@/assets/theme.js'
 
   const StyledComponents = {
     ProgressionStepContainer: styled('div', { numberOfSteps: Number })`
@@ -115,6 +116,11 @@
         required: true,
       },
     },
+    data() {
+      return {
+        theme,
+      }
+    },
     computed: {
       currentStepIndex() {
         return this.progressionSteps.findIndex(