@eturnity/eturnity_reusable_components 8.34.0-EPDM-13618.2 → 8.34.0-EPDM-16204.1

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

@@ -15,7 +15,7 @@
       :variant="variant"
       :width="width"
     >
-      <LabelComponent :has-icon="Boolean(icon)" :reverse-direction="iconLast">
+      <LabelComponent :has-icon="Boolean(icon)">
         <Icon
           v-if="icon"
           :color="getIconColor"
@@ -146,13 +146,10 @@
 
   const LabelAttrs = {
     hasIcon: Boolean,
-    reverseDirection: Boolean,
   }
 
   const LabelComponent = styled('span', LabelAttrs)`
     display: flex;
-    flex-direction: ${(props) =>
-      props.reverseDirection ? 'row-reverse' : 'row'};
     align-items: center;
     justify-content: center;
     gap: ${(props) => (props.hasIcon ? '5px' : '0')};
@@ -215,11 +212,6 @@
         default: '',
         type: String,
       },
-      iconLast: {
-        required: false,
-        default: false,
-        type: Boolean,
-      },
       iconAltStyle: {
         required: false,
         default: false,

package/src/components/dropdown/Dropdown.stories.js

@@ -1,125 +1,53 @@
-import defaultDropdownProps from './defaultProps'
 import Dropdown from './index.vue'
-import theme from '@/assets/theme'
 
 export default {
   title: 'Dropdown',
   component: Dropdown,
-  tags: ['autodocs'],
-  argTypes: {
-    width: {
-      description: '',
-    },
-    gap: {
-      description: 'Gap between trigger and dropdown content',
-    },
-    justify: {
-      description:
-        'Rule to allign the dropdown content relatively to the trigger',
-      control: 'select',
-      options: ['right', 'left'],
-    },
-    openingMode: {
-      description:
-        'Way to open the dropdown content: eigther by clicking on trigger or hovering it',
-      control: 'select',
-      options: ['hover', 'click'],
-    },
-    backgroundColor: {
-      description: 'Backbround color of dropdown content',
-      control: {
-        type: 'color',
-        presetColors: [
-          theme.colors.white,
-          theme.colors.grey3,
-          theme.colors.grey4,
-          theme.colors.red,
-        ],
-      },
-    },
-
-    // slots
-    trigger: {
-      description: 'Trigger button slot',
-    },
-    dropdown: {
-      description: 'Dropdown content slot',
-    },
-  },
-}
-
-// To use:
-// import Dropdown from '@eturnity/eturnity_reusable_components/src/components/dropdown'
-// <Dropdown
-//   width="fit-content"
-//   gap="20px"
-//   justify="right"
-//   opening-mode="click"
-//   background-color="red"
-// >
-//   <template #trigger>
-//     TRIGGER BUTTON
-//   </template>
-//   <template #dropdown>
-//     <div>
-//       <div>OPTION 1</div>
-//       <div>OPTION 2</div>
-//     </div>
-//   </template>
-// <Dropdown/>
-
-const Template = (args) => {
-  return {
-    components: { Dropdown },
-    setup() {
-      return { args }
-    },
-    template: `
-      <div style="margin-left: 30px;">
-        <Dropdown v-bind="args">
-          <template #trigger>
-            {{ args.trigger }}
-          </template>
-          <template #dropdown>
-            <div v-html="args.dropdown"></div>
-          </template>
-        </Dropdown>
+  // argTypes: {},
+}
+
+const Template = (args, { argTypes }) => ({
+  // Components used in your story `template` are defined in the `components` object
+  components: { Dropdown },
+  // The story's `args` need to be mapped into the template through the `setup()` method
+  props: Object.keys(argTypes),
+  template: `<Dropdown v-bind="$props">
+  <template #trigger>
+      trigger button
+  </template>
+  <template #dropdown>
+      <div>
+        <h3>fully customizable dropdown</h3>
+        <ul>
+          <li>item</li>
+          <li>item</li>
+          <li>item</li>
+        </ul>
       </div>
-    `,
-  }
-}
+  </template>
+</Dropdown>`,
+  // import Icon from "@eturnity/eturnity_reusable_components/src/components/icon"
+  //  How to use:
+  //<icon
+  //   name="House" //required. a svg file named [name].svg should be present in /assets/svgIcons
+  //   color="red"
+  //   hoveredColor="blue"
+  //   size="60px" by default, this is 30px
+  // />
+})
 
 export const Default = Template.bind({})
 Default.args = {
-  ...defaultDropdownProps,
-}
-
-export const DropdownWidth = Template.bind({})
-DropdownWidth.args = {
-  ...defaultDropdownProps,
-  width: 'max-content',
-}
-
-export const DropdownGap = Template.bind({})
-DropdownGap.args = {
-  ...defaultDropdownProps,
+  openingMode: 'click',
   gap: '0px',
+  justify: 'left',
+  width: '150px',
 }
 
-export const DropdownJustifyRight = Template.bind({})
-DropdownJustifyRight.args = {
-  ...defaultDropdownProps,
+export const withHover = Template.bind({})
+withHover.args = {
+  openingMode: 'hover',
+  gap: '20px',
   justify: 'right',
-}
-
-export const DropdownOpeningModeClick = Template.bind({})
-DropdownOpeningModeClick.args = {
-  ...defaultDropdownProps,
-  openingMode: 'click',
-}
-
-export const DropdownBackgroundColor = Template.bind({})
-DropdownBackgroundColor.args = {
-  ...defaultDropdownProps,
-  backgroundColor: theme.colors.red,
+  width: '250px',
 }

package/src/components/dropdown/index.vue

@@ -1,26 +1,18 @@
 <template>
-  <Wrapper
-    data-test-id="dropdown_wrapper"
-    ref="dropdown"
-    :opening-mode="openingMode"
-  >
-    <WrapperButton
-      data-test-id="dropdown_trigger"
-      @click="toggleIsOpenByClick(!isOpenByClick)"
-    >
+  <Wrapper ref="dropdown" :opening-mode="openingMode">
+    <WrapperButton @click="isOpenByClick = !isOpenByClick">
       <slot name="trigger"></slot>
     </WrapperButton>
     <WrapperDropdown
       :background-color="backgroundColor"
       class="dropdown-content"
-      :class="{ openDropdown: isOpenByClick && openingMode === 'click' }"
-      data-test-id="dropdown_dropdown_wrapper"
+      :class="{ openDropdown: isOpenByClick && openingMode == 'click' }"
       :justify="justify"
+      :position="position"
       :width="width"
     >
       <DropdownWindow
         :background-color="backgroundColor"
-        data-test-id="dropdown_dropdown_content"
         :gap="gap"
         :width="width"
       >
@@ -31,6 +23,14 @@
 </template>
 
 <script>
+  // import Icon from "@eturnity/eturnity_reusable_components/src/components/icon"
+  //  How to use:
+  //<DropdownComponent
+  //    width="300px"
+  //    backgroundColor="red">
+
+  // <DropdownComponent/>
+
   import styled from 'vue3-styled-components'
 
   const wrapperAttrs = {
@@ -45,11 +45,11 @@
     position: relative;
 
     &:hover .dropdown-content {
-      ${(props) => (props.openingMode === 'hover' ? 'display: block;' : '')}
+      ${(props) => (props.openingMode == 'hover' ? 'display:block' : '')}
     }
     & .openDropdown {
       ${(props) =>
-        props.openingMode === 'click' ? 'display: block !important;' : ''}
+        props.openingMode == 'click' ? 'display:block !important' : ''}
     }
   `
   const WrapperDropdown = styled('div', wrapperAttrs)`
@@ -57,7 +57,7 @@
     display: none;
     position: absolute;
     z-index: 1;
-    ${(props) => (props.justify === 'right' ? 'right: 0;' : '')}
+    ${(props) => (props.justify == 'right' ? 'right:0;' : '')}
   `
   const DropdownWindow = styled('div', wrapperAttrs)`
     width: ${(props) => props.width};
@@ -86,27 +86,26 @@
     props: {
       width: {
         required: false,
-        type: String,
         default: '300px',
       },
       gap: {
         required: false,
-        type: String,
         default: '10px',
       },
+      position: {
+        required: false,
+        default: 'bottom',
+      },
       justify: {
         required: false,
-        type: String,
         default: 'left',
       },
       openingMode: {
         required: false,
-        type: String,
         default: 'hover',
       },
       backgroundColor: {
         required: false,
-        type: String,
         default: 'white',
       },
     },
@@ -122,26 +121,18 @@
       document.removeEventListener('click', this.clickOutside)
     },
     methods: {
-      toggleIsOpenByClick(value) {
-        this.isOpenByClick = value
-      },
       clickOutside(event) {
         if (this.openingMode != 'click') return
         if (
           this.$refs.dropdown &&
-          (this.$refs.dropdown.$el === event.target ||
+          (this.$refs.dropdown.$el == event.target ||
             this.$refs.dropdown.$el.contains(event.target))
         ) {
           return
         } else {
-          this.toggleIsOpenByClick(false)
+          this.isOpenByClick = false
         }
       },
     },
-    watch: {
-      isOpenByClick(newVal) {
-        this.$emit('on-dropdown-toggle', newVal)
-      },
-    },
   }
 </script>

package/src/components/progressBar/index.vue

@@ -1,26 +1,36 @@
 <template>
   <Container>
     <ProgressContainer
-      :app-theme="appTheme"
-      data-test-id="progress_bar_container"
+      :background-color="backgroundColor"
+      class="progress-container"
+      :max-width="maxWidth"
+      :min-width="minWidth"
     >
       <ProgressFill
-        :app-theme="appTheme"
-        data-test-id="progress_bar_progress"
+        class="progress-bar"
+        :fill-color="fillColor"
         :fill-progress="fillProgress"
       />
     </ProgressContainer>
-    <LabelText
-      v-if="labelText"
-      :app-theme="appTheme"
-      data-test-id="progress_bar_label"
-    >
-      {{ labelText }}
+    <LabelText v-if="stepNumber || labelText" class="progress-text">
+      {{ labelText ? labelText : '' }}
+      {{ stepNumber ? stepNumber : '' }}
     </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`
@@ -34,34 +44,34 @@
   `
 
   const containerProps = {
-    appTheme: String,
+    backgroundColor: String,
+    maxWidth: String,
+    minWidth: 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.theme.progressBar[props.appTheme].backgroundColor};
+      props.backgroundColor
+        ? props.backgroundColor
+        : props.theme.colors.lightGray};
     @media (max-width: ${(props) => props.theme.screen.mobile}) {
       height: 4px;
     }
   `
 
-  const fillProps = {
-    appTheme: String,
-    fillProgress: String | Number,
-  }
+  const fillProps = { fillColor: String, fillProgress: String | Number }
   const ProgressFill = styled('div', fillProps)`
     height: 100%;
     width: ${(props) => props.fillProgress + '%'};
     background-color: ${(props) =>
-      props.theme.progressBar[props.appTheme].fillColor};
+      props.fillColor ? props.fillColor : props.theme.colors.secondary};
   `
 
-  const labelTextProps = {
-    appTheme: String,
-  }
-  const LabelText = styled('div', labelTextProps)`
-    color: ${(props) => props.theme.progressBar[props.appTheme].labelColor};
+  const LabelText = styled.div`
+    color: ${(props) => props.theme.colors.darkGray};
     font-size: 16px;
 
     @media (max-width: ${(props) => props.theme.screen.tablet}) {
@@ -78,19 +88,37 @@
       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,
-        type: String,
-        default: '',
+        default: null,
       },
-      appTheme: {
-        type: String,
-        default: 'light',
+      stepNumber: {
+        required: false,
+        default: null,
       },
     },
   }

package/src/components/sideMenu/index.vue

@@ -8,6 +8,9 @@
         <ListItem
           v-if="!item.children"
           :key="idx"
+          :data-active="
+            (activeTab === item.key || activeParentTab === item.key).toString()
+          "
           :data-id="`sub_menu_settings_${item.key}`"
           :fill-type="item.icon === 'free_technology' ? 'stroke' : 'fill'"
           :is-active="activeTab === item.key || activeParentTab === item.key"
@@ -30,6 +33,7 @@
         </ListItem>
         <CollapseWrapper v-else :key="idx + item.key">
           <CollapseContainer
+            :data-active="activeParentTab === item.key"
             :data-id="`sub_menu_settings_${item.key}`"
             :is-active="activeParentTab === item.key"
             @click="toggleActiveDropdown(item.key)"
@@ -51,7 +55,11 @@
             }}</ListText>
             <ArrowContainer>
               <Icon
-                :color="theme.semanticColors.grey[800]"
+                :color="
+                  activeParentTab === item.key
+                    ? theme.semanticColors.purple[500]
+                    : theme.semanticColors.teal[800]
+                "
                 :name="
                   activeDropdown === item.key
                     ? 'arrow_up_unfilled'
@@ -65,6 +73,7 @@
             <SubRouter
               v-for="subItem in item.children"
               :key="subItem.key"
+              :data-active="activeTab === subItem.key"
               :data-id="`sub_menu_settings_${subItem.key}`"
               :is-active="activeTab === subItem.key"
               @click="
@@ -81,19 +90,14 @@
       </template>
     </ListContainer>
     <BottomSection v-if="hasLogout">
-      <IconContainer
+      <ButtonIcon
         data-id="button_settings_logout"
-        :is-active="false"
-        :is-button="true"
+        icon-name="logout"
+        text="Logout"
+        type="ghost"
+        variant="tertiary"
         @click="$emit('on-logout')"
-      >
-        <RotateIcon
-          :color="theme.semanticColors.teal[800]"
-          cursor="pointer"
-          name="initial_situation"
-          size="18px"
-        />
-      </IconContainer>
+      />
       <AppVersion>{{ appVersion }}</AppVersion>
     </BottomSection>
   </PageContainer>
@@ -104,6 +108,7 @@
   import Icon from '../icon'
   import Spinner from '../spinner'
   import theme from '@/assets/theme.js'
+  import ButtonIcon from '../buttons/buttonIcon'
 
   const PageAttrs = { isLoading: Boolean }
   const PageContainer = styled('div', PageAttrs)`
@@ -131,13 +136,13 @@
     padding: 4px;
     border-radius: 4px;
     background-color: ${(props) =>
-      props.isActive ? props.theme.semanticColors.purple[50] : ''};
+      props.isActive ? props.theme.semanticColors.purple[100] : ''};
     color: ${(props) =>
       props.isActive
         ? props.theme.semanticColors.purple[500]
         : props.theme.semanticColors.teal[800]};
 
-    :hover {
+    &:hover:not([data-active='true']) {
       background-color: ${(props) => props.theme.semanticColors.purple[100]};
       color: ${(props) => props.theme.semanticColors.purple[500]};
       svg path:not(.fix) {
@@ -166,8 +171,7 @@
       `
         cursor: pointer;
         &:hover {
-          background-color: ${(props) =>
-            props.theme.semanticColors.purple[100]};
+          background-color: ${(props) => props.theme.semanticColors.purple[50]};
         `}
   `
 
@@ -209,10 +213,10 @@
     font-weight: 400;
     font-size: 14px;
     background: ${(props) =>
-      props.isActive ? props.theme.semanticColors.purple[50] : ''};
+      props.isActive ? props.theme.semanticColors.purple[100] : ''};
 
-    &:hover {
-      background: ${(props) => props.theme.semanticColors.purple[100]};
+    &:hover:not([data-active='true']) {
+      background: ${(props) => props.theme.semanticColors.purple[50]};
       color: ${(props) => props.theme.semanticColors.purple[500]} !important;
     }
   `
@@ -228,15 +232,15 @@
     align-items: center;
     cursor: pointer;
     background: ${(props) =>
-      props.isActive ? props.theme.semanticColors.purple[50] : ''};
+      props.isActive ? props.theme.semanticColors.purple[100] : ''};
 
     div {
       color: ${(props) =>
         props.isActive ? props.theme.semanticColors.purple[500] : ''};
     }
 
-    &:hover {
-      background: ${(props) => props.theme.semanticColors.purple[100]};
+    &:hover:not([data-active='true']) {
+      background: ${(props) => props.theme.semanticColors.purple[50]};
       color: ${(props) => props.theme.semanticColors.purple[500]};
       svg path:not(.fix) {
         fill: ${(props) => props.theme.semanticColors.purple[500]};
@@ -268,12 +272,12 @@
       Spinner,
       SpinnerContainer,
       BottomSection,
-      RotateIcon,
       AppVersion,
       CollapseWrapper,
       CollapseContainer,
       SubRouter,
       ArrowContainer,
+      ButtonIcon,
     },
     props: {
       tabsData: {

package/src/components/tables/mainTable/index.vue

@@ -251,8 +251,7 @@
         visibility: hidden;
       }
 
-      &.footer,
-      &.total-row {
+      &.footer {
         td {
           background-color: ${(props) => props.theme.colors.grey5};
         }

package/src/components/dropdown/defaultProps.js

@@ -1,7 +0,0 @@
-const defaultProps = {
-  // info card content slot
-  trigger: 'TRIGGER BUTTON',
-  dropdown: `<div>DROPDOWN OPTION 1</div><div>DROPDOWN OPTION 2</div>`,
-}
-
-export default defaultProps

package/src/components/dropdown/dropdown.spec.js

@@ -1,55 +0,0 @@
-import { mount } from '@vue/test-utils'
-import RCDropdown from '@/components/dropdown'
-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('dropdown/index.vue', () => {
-  it('dropdown is rendered with correct trigger text', async () => {
-    const wrapper = mount(RCDropdown, {
-      props: { ...defaultProps },
-      slots: { ...defaultProps },
-      global: {
-        provide: {
-          theme,
-        },
-      },
-    })
-
-    const dropdownTrigger = wrapper.find('[data-test-id="dropdown_trigger"]')
-
-    expect(dropdownTrigger.exists()).toBe(true)
-    expect(dropdownTrigger.text()).toContain(defaultProps.trigger)
-  })
-
-  it('dropdown opens on click only', async () => {
-    const wrapper = mount(RCDropdown, {
-      props: { ...defaultProps, openingMode: 'click' },
-      slots: { ...defaultProps },
-      global: {
-        provide: {
-          theme,
-        },
-      },
-    })
-
-    const dropdownTrigger = wrapper.find('[data-test-id="dropdown_trigger"]')
-    const dropdownDropdownWrapper = wrapper.find(
-      '[data-test-id="dropdown_dropdown_wrapper"]'
-    )
-
-    expect(dropdownDropdownWrapper.classes('openDropdown')).toBe(false)
-
-    await dropdownTrigger.trigger('hover')
-
-    expect(dropdownDropdownWrapper.classes('openDropdown')).toBe(false)
-
-    await dropdownTrigger.trigger('click')
-
-    expect(dropdownDropdownWrapper.classes('openDropdown')).toBe(true)
-  })
-})