@eturnity/eturnity_reusable_components 8.16.9-EPDM-11600.8 → 8.16.9-EPDM-14690.5

package/src/components/barchart/index.vue

@@ -17,8 +17,8 @@
       />
     </ChartControlsWrapper>
     <GraphSection :height="height" :width="width">
-      <YAxis :width="yAxisWidth">
-        <YAxisTitleWrapper v-if="yAxisTitle">
+      <YAxis :height="height" :width="yAxisWidth">
+        <YAxisTitleWrapper v-if="yAxisTitle" :height="yAxisHeight">
           {{ yAxisTitle }}
         </YAxisTitleWrapper>
         <YAxisRow
@@ -30,15 +30,15 @@
             )
           "
         >
-          <YAxisLabel>{{ label }}</YAxisLabel>
+          <YAxisLabel>{{ getYAxisLabel(label) }}</YAxisLabel>
           <YAxisLine :y-axis-width="yAxisWidth" />
         </YAxisRow>
       </YAxis>
 
       <ScrollContainer
         :class="`chart-scroll-container-${chartId}`"
-        :is-scrollable="isScrollable"
         :height="height"
+        :is-scrollable="isScrollable"
         @scroll="handleChartScroll"
       >
         <ChartContent
@@ -64,19 +64,19 @@
           <BarsContainer>
             <BarGroup
               v-for="(item, index) in normalizedData"
+              :key="index"
               :bar-width="barWidth"
               class="bar-group"
               :is-scrollable="isScrollable"
-              :key="index"
             >
               <BarWrapper>
                 <BarSegment
                   v-for="(segment, segIndex) in item.segments"
+                  :key="segIndex"
                   class="bar-segment"
                   :gradient-from="getSegmentGradient(index, segment).from"
                   :gradient-to="getSegmentGradient(index, segment).to"
                   :height="`${segment.percentage}%`"
-                  :key="segIndex"
                   :z-index="item.segments.length - segIndex"
                   @mouseenter="showTooltip(item, $event, series)"
                   @mouseleave="hideTooltip"
@@ -96,7 +96,7 @@
         :left="tooltipStyle.left"
         :top="tooltipStyle.top"
       >
-        <slot :item="tooltipData" name="tooltip" />
+        <slot :item="tooltipData" name="tooltip"></slot>
         <TooltipTextWrapper v-if="!slots.tooltip && tooltipData">
           <template v-if="!series.length">
             <TooltipText font-weight="500">{{ tooltipData.label }}</TooltipText>
@@ -128,7 +128,11 @@
                   :gradient-to="segment.gradientTo"
                 />
                 <TooltipText>
-                  {{ handleValueFormatter(segment.value) }}
+                  {{
+                    fieldMode === 'absolute' && showPercentageOnTooltip
+                      ? `${segment.valuePercentage}%`
+                      : handleValueFormatter(segment.value)
+                  }}
                 </TooltipText>
               </TooltipRow>
             </template>
@@ -159,6 +163,7 @@
       :data="data"
       :field-mode="fieldMode"
       :is-chart-controls-shown-in-bottom="isChartControlsShown('bottom')"
+      :is-inputs-disabled="isLoading"
       :is-scrollable="isScrollable"
       :series="series"
       :y-axis-width="yAxisWidth"
@@ -171,12 +176,13 @@
 </template>
 
 <script setup>
-  import { useSlots, computed } from 'vue'
+  import { useSlots, computed, ref } from 'vue'
 
   import ChartControls from './ChartControls'
   import BottomFields from './BottomFields'
   import SelectionBox from './SelectionBox'
   import Spinner from '../spinner'
+  import { numberToString } from '../../helpers/numberConverter'
 
   import {
     useTooltip,
@@ -246,10 +252,6 @@
       type: String,
       default: '',
     },
-    valueFormatter: {
-      type: Function,
-      default: null,
-    },
     isLegendShown: {
       type: Boolean,
       default: false,
@@ -296,6 +298,10 @@
       type: Boolean,
       default: false,
     },
+    showPercentageOnTooltip: {
+      type: Boolean,
+      default: false,
+    },
   })
 
   const generateChartId = () =>
@@ -378,8 +384,40 @@
   }
 
   const handleValueFormatter = (value) => {
-    return props.valueFormatter
-      ? props.valueFormatter(Math.round(value))
-      : value
+    let formattedValue = value
+    if (value < 1000) {
+      formattedValue = numberToString({
+        value: formattedValue,
+        numberPrecision: 0,
+        minDecimals: 0,
+      })
+    } else if (value < 1000000) {
+      formattedValue = numberToString({
+        value: Number(formattedValue / 1000),
+        numberPrecision: 2,
+        minDecimals: 2,
+      })
+    } else {
+      formattedValue = numberToString({
+        value: Number(formattedValue / 1000000),
+        numberPrecision: 2,
+        minDecimals: 2,
+      })
+    }
+    if (value < 1000) {
+      return `${formattedValue} kWh`
+    } else if (value < 1000000) {
+      return `${formattedValue} MWh`
+    } else {
+      return `${formattedValue} GWh`
+    }
+  }
+
+  const getYAxisLabel = (label) => {
+    return numberToString({
+      value: label,
+      numberPrecision: 0,
+      minDecimals: 0,
+    })
   }
 </script>

package/src/components/barchart/styles/bottomFields.js

@@ -17,18 +17,18 @@ export const LabelsColumn = styled('div', { width: String })`
 
 export const LabelRow = styled.div`
   height: 32px;
+  padding-top: 5px;
   font-size: 12px;
   font-weight: 500;
   color: ${(props) => props.theme.semanticColors.teal[600]};
   display: flex;
-  align-items: flex-start;
+  align-items: center;
 `
 
 export const TotalRow = styled(LabelRow)``
 
 export const FieldsContainer = styled.div`
   flex: 1;
-  overflow-x: auto;
   scrollbar-width: none;
 
   &::-webkit-scrollbar {
@@ -59,8 +59,22 @@ export const InputGroup = styled('div', {
   barWidth: Number,
   isScrollable: Boolean,
 })`
-  ${(props) => (props.isScrollable ? 'min-width' : 'width')}:${(props) =>
-    props.barWidth}px;
+  ${(props) => (props.isScrollable ? 'min-width' : 'width')}: 70px;
   display: flex;
   justify-content: center;
+  position: relative;
+
+  input[readonly] {
+    border: 1px solid ${(props) => props.theme.colors.grey4} !important;
+  }
+`
+
+export const InfoCardContainer = styled('div', { yAxisWidth: String })`
+  margin-left: ${(props) => props.yAxisWidth};
+  padding: 12px;
+  margin-top: 12px;
+`
+
+export const InfoCardBody = styled.div`
+  padding: 8px 0;
 `

package/src/components/barchart/styles/chart.js

@@ -16,9 +16,12 @@ export const GraphSection = styled('div', { width: String, height: String })`
   display: flex;
 `
 
-export const YAxis = styled('div', { width: String })`
+export const YAxis = styled('div', { width: String, height: String })`
   width: ${(props) => props.width};
+  display: flex;
+  flex-direction: column;
   position: relative;
+  height: ${(props) => props.height};
 `
 
 export const YAxisRow = styled('div', { percentage: Number })`
@@ -54,19 +57,18 @@ export const YAxisLine = styled('div', { yAxisWidth: String })`
   transform: translateY(-50%);
 `
 
-export const YAxisTitleWrapper = styled('div')`
+export const YAxisTitleWrapper = styled('div', { height: String })`
+  position: absolute;
+  left: -66px;
+  top: ${(props) => props.height};
+  transform: rotate(-90deg) translateX(50%);
+  transform-origin: right;
   font-size: 12px;
-  font-weight: 500;
-  color: ${(props) => props.theme.semanticColors.grey[700]};
-  white-space: nowrap;
-  height: 0;
-  width: 0;
+  color: ${(props) => props.theme.semanticColors.teal[600]};
   display: flex;
-  align-items: flex-start;
-  justify-content: center;
-  position: absolute;
-  top: 50%;
-  transform: rotate(-90deg);
+  align-items: center;
+  white-space: nowrap;
+  font-family: ${(props) => props.theme.fonts.mainFont};
 `
 
 export const ScrollContainer = styled('div', {
@@ -125,6 +127,7 @@ export const BarWrapper = styled.div`
   height: 100%;
   width: 100%;
   position: relative;
+  overflow: hidden;
 `
 
 export const BarSegment = styled('div', {

package/src/components/errorMessage/index.vue

@@ -19,7 +19,7 @@
     background: ${(props) => props.theme.colors.red};
     padding: 10px;
     width: max-content;
-    max-width: 100%;
+    /* max-width: 100%; */
     min-width: min-content;
     font-size: 11px;
     font-weight: 400;

package/src/components/infoCard/index.vue

@@ -73,7 +73,12 @@
       type: {
         required: false,
         type: String,
-        default: 'info',
+        default: 'info_simple',
+        validator(value) {
+          return ['info_simple', 'warning', 'error_minor', 'info'].includes(
+            value
+          )
+        },
       },
       minWidth: {
         required: false,
@@ -112,8 +117,11 @@
       },
     },
     computed: {
-      isInfo() {
+      isInfoSimple() {
         // this property is used for tests
+        return this.type === 'info_simple'
+      },
+      isInfo() {
         return this.type === 'info'
       },
       isWarning() {
@@ -123,11 +131,7 @@
         return this.type === 'error_minor'
       },
       iconName() {
-        return this.type === 'warning'
-          ? 'warning_triangle'
-          : this.isErrorMinor
-          ? 'erase'
-          : 'info'
+        return this.type === 'warning' ? 'warning_triangle' : 'info'
       },
       presetStyles() {
         // the types that doesn't have explicit border anyway have it transparent
@@ -146,11 +150,15 @@
           stylesCollection.iconColor = theme.semanticColors.teal[800]
         } else if (this.isErrorMinor) {
           stylesCollection.borderStyle = 'dashed'
-          stylesCollection.borderColor = theme.colors.grey4
-          stylesCollection.iconColor = theme.colors.red
-        } else {
+          stylesCollection.borderColor = theme.colors.pureRed
+          stylesCollection.iconColor = theme.colors.pureRed
+        } else if (this.isInfoSimple) {
           stylesCollection.borderStyle = 'dashed'
           stylesCollection.borderColor = theme.colors.grey4
+        } else {
+          stylesCollection.color = theme.semanticColors.teal[800]
+          stylesCollection.backgroundColor = theme.semanticColors.blue[300]
+          stylesCollection.iconColor = theme.semanticColors.teal[800]
         }
 
         return stylesCollection

package/src/components/infoCard/infoCard.spec.js

@@ -45,19 +45,19 @@ describe('RCInfoCard.vue', () => {
         },
       })
 
-      expect(wrapper.vm.isInfo).toBe(true)
+      expect(wrapper.vm.isInfoSimple).toBe(true)
       expect(wrapper.vm.isWarning).toBe(false)
       expect(wrapper.vm.isErrorMinor).toBe(false)
 
       await wrapper.setProps({ type: 'warning' })
 
-      expect(wrapper.vm.isInfo).toBe(false)
+      expect(wrapper.vm.isInfoSimple).toBe(false)
       expect(wrapper.vm.isWarning).toBe(true)
       expect(wrapper.vm.isErrorMinor).toBe(false)
 
       await wrapper.setProps({ type: 'error_minor' })
 
-      expect(wrapper.vm.isInfo).toBe(false)
+      expect(wrapper.vm.isInfoSimple).toBe(false)
       expect(wrapper.vm.isWarning).toBe(false)
       expect(wrapper.vm.isErrorMinor).toBe(true)
     })

package/src/components/infoText/index.vue

@@ -15,37 +15,40 @@
         :is-disabled="isDisabled"
         :padding="padding"
       >
-        <LabelWrapper
-          v-if="labelText && labelAlign === 'left'"
-          :color="iconColor || computedIconColor"
-          :size="labelSize"
-        >
-          {{ labelText }}
-        </LabelWrapper>
-        <Dot
-          v-if="type === 'dot'"
-          :color="dotColor"
-          data-test-id="infoText_dot"
-        />
-        <IconComponent
-          v-else-if="!noIcon"
-          :color="iconColor || computedIconColor"
-          :cursor="isDisabled ? 'not-allowed' : 'pointer'"
-          :disabled="isDisabled"
-          :hovered-color="iconColor || computedIconColor"
-          :name="iconName"
-          :size="size"
-        />
-        <LabelWrapper
-          v-if="labelText && labelAlign === 'right'"
-          :color="iconColor || computedIconColor"
-          :size="labelSize"
-        >
-          {{ labelText }}
-        </LabelWrapper>
+        <template v-if="!$slots.trigger">
+          <LabelWrapper
+            v-if="labelText && labelAlign === 'left'"
+            :color="iconColor || computedIconColor"
+            :size="labelSize"
+          >
+            {{ labelText }}
+          </LabelWrapper>
+          <Dot
+            v-if="type === 'dot'"
+            :color="dotColor"
+            data-test-id="infoText_dot"
+          />
+          <IconComponent
+            v-else-if="!noIcon"
+            :color="iconColor || computedIconColor"
+            :cursor="isDisabled ? 'not-allowed' : 'pointer'"
+            :disabled="isDisabled"
+            :hovered-color="iconColor || computedIconColor"
+            :name="iconName"
+            :size="size"
+          />
+          <LabelWrapper
+            v-if="labelText && labelAlign === 'right'"
+            :color="iconColor || computedIconColor"
+            :size="labelSize"
+          >
+            {{ labelText }}
+          </LabelWrapper>
+        </template>
+        <slot name="trigger"></slot>
       </IconWrapper>
     </div>
-    <Teleport v-if="isVisible" to="body">
+    <Teleport v-if="isVisible && !!text" to="body">
       <TextWrapper data-test-id="info_text_wrapper" :style="wrapperStyle">
         <TextOverlay
           ref="infoBox"
@@ -227,7 +230,7 @@
       },
       infoPosition: {
         required: false,
-        default: 'bottom',
+        default: null,
         type: String,
       },
       maxWidth: {
@@ -363,7 +366,9 @@
           { position: 'left', space: spaceLeft },
         ].sort((a, b) => b.space - a.space)
 
-        const bestPosition = positions[0].position
+        const bestPosition = props.infoPosition
+          ? props.infoPosition
+          : positions[0].position
 
         let top, left, arrowPosition
 

package/src/components/inputs/inputNumber/InputNumber.stories.js

@@ -3,15 +3,15 @@ import InputNumber from './index.vue'
 export default {
   title: 'InputNumber',
   component: InputNumber,
+  // argTypes: {},
 }
 
-const Template = (args) => ({
+const Template = (args, { argTypes }) => ({
   // Components used in your story `template` are defined in the `components` object
   components: { InputNumber },
-  setup() {
-    return { args: args }
-  },
-  template: `<InputNumber v-bind="args" />`,
+  // The story's `args` need to be mapped into the template through the `setup()` method
+  props: Object.keys(argTypes),
+  template: '<input-number v-bind="$props" />',
 
   // import InputNumber from "@eturnity/eturnity_reusable_components/src/components/inputs/inputNumber"
   // How to use:
@@ -73,20 +73,6 @@ Disabled.args = {
   showLinearUnitName: false,
 }
 
-export const DisabledAndPreDefined = Template.bind({})
-DisabledAndPreDefined.args = {
-  placeholder: 'Enter Value',
-  disabled: true,
-  isPreDefined: true,
-  value: '',
-  inputWidth: '200px',
-  isError: false,
-  numberPrecision: 0,
-  noBorder: false,
-  textAlign: 'left',
-  showLinearUnitName: false,
-}
-
 export const LinearUnit = Template.bind({})
 LinearUnit.args = {
   placeholder: 'Enter Value',