@eturnity/eturnity_reusable_components 8.22.23-EPDM-15547.5 → 8.22.23-EPDM-13618.2

package/src/components/filterComponent/viewFilter.vue

@@ -24,6 +24,16 @@
                 ref="selectSortDropdown"
                 align-items="vertical"
                 class="sort-dropdown"
+                :data-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'column')
+                    .replace('${index}', index)
+                "
+                :data-qa-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'column')
+                    .replace('${index}', index)
+                "
                 :dropdown-auto-close="false"
                 select-height="40px"
                 @input-change="
@@ -57,6 +67,16 @@
                 ref="selectSortDropdown"
                 align-items="vertical"
                 class="sort-dropdown"
+                :data-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'constraint')
+                    .replace('${index}', index)
+                "
+                :data-qa-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'constraint')
+                    .replace('${index}', index)
+                "
                 :disabled="!item.column"
                 :dropdown-auto-close="false"
                 select-height="40px"
@@ -88,7 +108,18 @@
                 </template>
               </SelectComponent>
               <template v-if="item.column === 'updated'">
-                <DatePickerContainer>
+                <DatePickerContainer
+                  :data-id="
+                    rowDataId.dataId
+                      .replace('${type}', 'selectedDate')
+                      .replace('${index}', index)
+                  "
+                  :data-qa-id="
+                    rowDataId.dataQaId
+                      .replace('${type}', 'selectedDate')
+                      .replace('${index}', index)
+                  "
+                >
                   <VueDatePicker
                     ref="datePicker"
                     :auto-apply="true"
@@ -122,6 +153,16 @@
                 ref="selectSortDropdown"
                 align-items="vertical"
                 class="sort-dropdown"
+                :data-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'selectedOptions')
+                    .replace('${index}', index)
+                "
+                :data-qa-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'selectedOptions')
+                    .replace('${index}', index)
+                "
                 :disabled="!item.column || !item.constraint"
                 :dropdown-auto-close="false"
                 :is-searchable="false"
@@ -182,6 +223,16 @@
                 <RCIcon
                   :color="theme.semanticColors.teal[800]"
                   cursor="pointer"
+                  :data-id="
+                    rowDataId.dataId
+                      .replace('${type}', 'remove')
+                      .replace('${index}', index)
+                  "
+                  :data-qa-id="
+                    rowDataId.dataId
+                      .replace('${type}', 'remove')
+                      .replace('${index}', index)
+                  "
                   name="close"
                   size="14px"
                   @click.stop="removeItem(index)"
@@ -196,6 +247,16 @@
                 ref="selectSortDropdown"
                 align-items="vertical"
                 class="sort-dropdown"
+                :data-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'column')
+                    .replace('${index}', 0)
+                "
+                :data-qa-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'column')
+                    .replace('${index}', 0)
+                "
                 :dropdown-auto-close="false"
                 select-height="40px"
                 @input-change="
@@ -223,6 +284,16 @@
                 ref="selectSortDropdown"
                 align-items="vertical"
                 class="sort-dropdown"
+                :data-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'constraint')
+                    .replace('${index}', 0)
+                "
+                :data-qa-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'constraint')
+                    .replace('${index}', 0)
+                "
                 :disabled="true"
                 :dropdown-auto-close="false"
                 select-height="40px"
@@ -235,6 +306,16 @@
                 ref="selectSortDropdown"
                 align-items="vertical"
                 class="sort-dropdown"
+                :data-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'selectedOptions')
+                    .replace('${index}', 0)
+                "
+                :data-qa-id="
+                  rowDataId.dataId
+                    .replace('${type}', 'selectedOptions')
+                    .replace('${index}', 0)
+                "
                 :disabled="true"
                 :dropdown-auto-close="false"
                 select-height="40px"
@@ -249,6 +330,16 @@
         <BottomContainer>
           <PlaceholderText>{{ $gettext('if') }}</PlaceholderText>
           <ButtonIcon
+            :data-id="
+              rowDataId.dataId
+                .replace('${type}', 'addFilter')
+                .replace('${index}', 0)
+            "
+            :data-qa-id="
+              rowDataId.dataId
+                .replace('${type}', 'addFilter')
+                .replace('${index}', 0)
+            "
             icon-name="plus_button"
             :text="$gettext('add_filter')"
             type="ghost"
@@ -391,6 +482,11 @@
         required: false,
         default: 'en-us',
       },
+      rowDataId: {
+        type: Object,
+        required: false,
+        default: '',
+      },
     },
     data() {
       return {

package/src/components/iconWrapper/index.vue

@@ -1,13 +1,14 @@
 <template>
   <Wrapper
     :background-color="backgroundColor"
+    :border-color="borderColor || iconColor"
     :border-radius="borderRadius"
-    :color="iconColor"
     :data-id="dataId"
     :data-qa-id="dataQaId"
     :disabled="disabled"
     :has-border="hasBorder"
     :hovered-background-color="hoveredBackgroundColor"
+    :hovered-border-color="hoveredBorderColor"
     :is-hovered="isHovered"
     :no-cursor="noCursor"
     :size="size"
@@ -51,22 +52,24 @@
   import styled from 'vue3-styled-components'
   import RCIcon from '../icon'
 
+  const LockContainer = styled.div`
+    position: absolute;
+    bottom: 6px;
+    right: 6px;
+  `
+
   const wrapperAttrs = {
-    color: String,
     isHovered: Boolean,
+    borderColor: String,
     borderRadius: String,
     disabled: Boolean,
     size: String,
     backgroundColor: String,
     hoveredBackgroundColor: String,
+    hoveredBorderColor: String,
     hasBorder: Boolean,
     noCursor: Boolean,
   }
-  const LockContainer = styled.div`
-    position: absolute;
-    bottom: 6px;
-    right: 6px;
-  `
   const Wrapper = styled('div', wrapperAttrs)`
     position: relative;
     display: inline-flex;
@@ -74,7 +77,8 @@
     height: ${(props) => props.size};
     border: ${(props) =>
       props.hasBorder
-        ? 'solid 1px ' + props.theme.colors[props.color] || props.color
+        ? 'solid 1px ' +
+          (props.theme.colors[props.borderColor] || props.borderColor)
         : ''};
     justify-content: center;
     align-items: center;
@@ -85,14 +89,32 @@
     border-radius: ${(props) => props.borderRadius};
     ${(props) =>
       props.isHovered
-        ? 'background-color:' +
-            props.theme.colors[props.hoveredBackgroundColor] ||
-          props.hoveredBackgroundColor
-        : ''};
+        ? `
+          background-color: ${
+            props.theme.colors[props.hoveredBackgroundColor] ??
+            props.hoveredBackgroundColor
+          };
+          ${
+            props.hoveredBorderColor
+              ? `border-color: ${
+                  props.theme.colors[props.hoveredBorderColor] ??
+                  props.hoveredBorderColor
+                };`
+              : ''
+          }
+        `
+        : ''}
     &:hover {
       background-color: ${(props) =>
-        props.theme.colors[props.hoveredBackgroundColor] ||
+        props.theme.colors[props.hoveredBackgroundColor] ??
         props.hoveredBackgroundColor};
+      ${(props) =>
+        props.hoveredBorderColor
+          ? `border-color: ${
+              props.theme.colors[props.hoveredBorderColor] ??
+              props.hoveredBorderColor
+            };`
+          : ''}
     }
   `
   const CaretIcon = styled.div`
@@ -112,45 +134,69 @@
     },
     props: {
       disabled: {
+        type: Boolean,
         required: false,
         default: false,
       },
       name: {
+        type: String,
         required: true,
       },
       iconColor: {
+        type: String,
         required: false,
         default: 'white',
       },
       hoveredIconColor: {
+        type: String,
         required: false,
+        default: null,
       },
       backgroundColor: {
+        type: String,
         required: false,
+        default: 'transparent',
       },
       hasBorder: {
+        type: Boolean,
         required: false,
+        default: false,
       },
       hoveredBackgroundColor: {
+        type: String,
         required: false,
         default: 'transparentWhite2',
       },
       size: {
+        type: String,
         required: false,
         default: '32px',
       },
       iconSize: {
+        type: String,
         required: false,
         default: '18px',
       },
       hasCaret: {
+        type: Boolean,
         required: false,
         default: false,
       },
       borderRadius: {
+        type: String,
         required: false,
         default: '6px',
       },
+      borderColor: {
+        type: String,
+        required: false,
+        default: null,
+      },
+      hoveredBorderColor: {
+        type: String,
+        required: false,
+        default: null,
+      },
       dataId: {
         type: String,
         default: '',
@@ -160,22 +206,27 @@
         default: '',
       },
       isHovered: {
+        type: Boolean,
         required: false,
         default: false,
       },
       isStriked: {
+        type: Boolean,
         required: false,
         default: false,
       },
       isLoading: {
+        type: Boolean,
         required: false,
         default: false,
       },
       noCursor: {
+        type: Boolean,
         required: false,
         default: false,
       },
       hasLock: {
+        type: Boolean,
         required: false,
         default: false,
       },

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

@@ -230,6 +230,7 @@
   //</inputNumber>
   import styled from 'vue3-styled-components'
   import {
+    roundViaInteger,
     stringToNumber,
     numberToString,
   } from '../../../helpers/numberConverter'
@@ -861,7 +862,7 @@
             this.inputValue = this.value
             this.enteredValue =
               typeof this.value === 'number' && !isNaN(this.value)
-                ? Number(this.value.toFixed(this.numberPrecision))
+                ? roundViaInteger(this.value, this.numberPrecision)
                 : this.value
           }
         },
@@ -965,7 +966,7 @@
             minDecimals: this.minDecimals,
           })
         } else if (typeof evaluated === 'number') {
-          evaluated = evaluated.toFixed(this.numberPrecision)
+          evaluated = roundViaInteger(evaluated, this.numberPrecision)
         }
         return evaluated
       },

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

@@ -179,9 +179,7 @@
     position: relative;
     font-size: ${(props) => (props.fontSize ? props.fontSize : '16px')};
     color: ${(props) =>
-      props.isError
-        ? props.theme.colors.grey6
-        : props.isDisabled
+      props.isDisabled
         ? props.theme.colors.grey2
         : props.fontColor
         ? props.fontColor + ' !important'

package/src/components/progressBar/ProgressBar.stories.js

@@ -0,0 +1,62 @@
+import defaultDropdownProps from './defaultProps'
+import ProgressBar from './index.vue'
+import theme from '@/assets/theme'
+
+export default {
+  title: 'ProgressBar',
+  component: ProgressBar,
+  tags: ['autodocs'],
+  argTypes: {
+    fillProgress: {
+      description: 'Precentage of progress bar filled in with color',
+    },
+    labelText: {
+      description: 'Label text above the progress bar',
+    },
+    appTheme: {
+      description: 'App color theme',
+      control: 'select',
+      options: ['light', 'dark'],
+    },
+  },
+}
+
+// To use:
+// import ProgressBar from "@eturnity/eturnity_reusable_components/src/components/progressBar"
+// <ProgressBar
+//   :fill-progress="50"
+//   :label-text="some label text"
+// />
+
+const Template = (args) => {
+  return {
+    components: { ProgressBar },
+    setup() {
+      return { args }
+    },
+    provide: {
+      theme,
+    },
+    template: `
+      <ProgressBar v-bind="args"/>
+    `,
+  }
+}
+
+export const Default = Template.bind({})
+Default.args = {
+  ...defaultDropdownProps,
+}
+
+export const ProgressBarLabelText = Template.bind({})
+ProgressBarLabelText.args = {
+  ...defaultDropdownProps,
+  labelText: 'Progress Bar Label Text',
+}
+
+export const ProgressBarLabelTextAppThemeDark = Template.bind({})
+ProgressBarLabelTextAppThemeDark.args = {
+  ...defaultDropdownProps,
+  labelText: 'Progress Bar Label Text',
+  appTheme: 'dark',
+}

package/src/components/progressBar/defaultProps.js

@@ -0,0 +1,5 @@
+const defaultProps = {
+  fillProgress: '65',
+}
+
+export default defaultProps

package/src/components/progressBar/index.vue

@@ -1,36 +1,26 @@
 <template>
   <Container>
     <ProgressContainer
-      :background-color="backgroundColor"
-      class="progress-container"
-      :max-width="maxWidth"
-      :min-width="minWidth"
+      :app-theme="appTheme"
+      data-test-id="progress_bar_container"
     >
       <ProgressFill
-        class="progress-bar"
-        :fill-color="fillColor"
+        :app-theme="appTheme"
+        data-test-id="progress_bar_progress"
         :fill-progress="fillProgress"
       />
     </ProgressContainer>
-    <LabelText v-if="stepNumber || labelText" class="progress-text">
-      {{ labelText ? labelText : '' }}
-      {{ stepNumber ? stepNumber : '' }}
+    <LabelText
+      v-if="labelText"
+      :app-theme="appTheme"
+      data-test-id="progress_bar_label"
+    >
+      {{ labelText }}
     </LabelText>
   </Container>
 </template>
 
 <script>
-  // import ProgressBar from "@eturnity/eturnity_reusable_components/src/components/progressBar"
-  //To Use:
-  // <progress-bar
-  //   fillColor="#000"
-  //   backgroundColor="#888"
-  //   minWidth="150px"
-  //   maxWidth="100%"
-  //   :fillProgress="50" //should be a number for percent
-  //   stepNumber="4"
-  //   :labelText="translate('step')"
-  // />
   import styled from 'vue3-styled-components'
 
   const Container = styled.div`
@@ -44,34 +34,34 @@
   `
 
   const containerProps = {
-    backgroundColor: String,
-    maxWidth: String,
-    minWidth: String,
+    appTheme: String,
   }
   const ProgressContainer = styled('div', containerProps)`
     width: 100%;
-    min-width: ${(props) => (props.minWidth ? props.minWidth : 'auto')};
-    max-width: ${(props) => (props.maxWidth ? props.maxWidth : 'none')};
     height: 6px;
     background-color: ${(props) =>
-      props.backgroundColor
-        ? props.backgroundColor
-        : props.theme.colors.lightGray};
+      props.theme.progressBar[props.appTheme].backgroundColor};
     @media (max-width: ${(props) => props.theme.screen.mobile}) {
       height: 4px;
     }
   `
 
-  const fillProps = { fillColor: String, fillProgress: String | Number }
+  const fillProps = {
+    appTheme: String,
+    fillProgress: String | Number,
+  }
   const ProgressFill = styled('div', fillProps)`
     height: 100%;
     width: ${(props) => props.fillProgress + '%'};
     background-color: ${(props) =>
-      props.fillColor ? props.fillColor : props.theme.colors.secondary};
+      props.theme.progressBar[props.appTheme].fillColor};
   `
 
-  const LabelText = styled.div`
-    color: ${(props) => props.theme.colors.darkGray};
+  const labelTextProps = {
+    appTheme: String,
+  }
+  const LabelText = styled('div', labelTextProps)`
+    color: ${(props) => props.theme.progressBar[props.appTheme].labelColor};
     font-size: 16px;
 
     @media (max-width: ${(props) => props.theme.screen.tablet}) {
@@ -88,37 +78,19 @@
       LabelText,
     },
     props: {
-      fillColor: {
-        required: false,
-        type: String,
-        default: null,
-      },
-      backgroundColor: {
-        required: false,
-        type: String,
-        default: null,
-      },
-      minWidth: {
-        required: false,
-        type: String,
-        default: null,
-      },
-      maxWidth: {
-        required: false,
-        type: String,
-        default: null,
-      },
       fillProgress: {
         required: false,
+        type: [String, Number],
         default: 0,
       },
       labelText: {
         required: false,
-        default: null,
+        type: String,
+        default: '',
       },
-      stepNumber: {
-        required: false,
-        default: null,
+      appTheme: {
+        type: String,
+        default: 'light',
       },
     },
   }

package/src/components/progressBar/progressBar.spec.js

@@ -0,0 +1,52 @@
+import { mount } from '@vue/test-utils'
+import RCProgressBar from '@/components/progressBar'
+import defaultProps from './defaultProps'
+import theme from '@/assets/theme'
+
+jest.mock('@/components/icon/iconCache.mjs', () => ({
+  // need to mock this due to how jest handles import.meta
+  fetchIcon: jest.fn(() => Promise.resolve('mocked-icon-url.svg')),
+}))
+
+describe('progressBar/index.vue', () => {
+  it('progress bar is rendered with correct props', async () => {
+    const labelText = 'test_label_text'
+
+    const wrapper = mount(RCProgressBar, {
+      props: { ...defaultProps, labelText },
+      global: {
+        provide: {
+          theme,
+        },
+      },
+    })
+
+    const progressBarProgress = wrapper.find(
+      '[data-test-id="progress_bar_progress"]'
+    )
+    const progressBarLabel = wrapper.find('[data-test-id="progress_bar_label"]')
+
+    expect(wrapper.vm.fillProgress).toBe(defaultProps.fillProgress)
+    expect(progressBarProgress.exists()).toBe(true)
+    expect(progressBarLabel.exists()).toBe(true)
+
+    expect(progressBarLabel.text()).toContain(labelText)
+  })
+
+  it('progress bar progress changes', async () => {
+    const wrapper = mount(RCProgressBar, {
+      props: {},
+      global: {
+        provide: {
+          theme,
+        },
+      },
+    })
+
+    expect(wrapper.vm.fillProgress).toBe(0)
+
+    await wrapper.setProps({ fillProgress: defaultProps.fillProgress })
+
+    expect(wrapper.vm.fillProgress).toBe(defaultProps.fillProgress)
+  })
+})