@eturnity/eturnity_reusable_components 7.48.1-EPDM-12680.11 → 7.48.1-dev-14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.48.1-EPDM-12680.11",
+  "version": "7.48.1-dev-14.0",
   "files": [
     "dist",
     "src"
@@ -16,7 +16,8 @@
     "build-storybook": "storybook build",
     "prettier": "prettier --write 'src/**/*.{js,vue}'",
     "test": "jest",
-    "test-coverage": "jest --coverage"
+    "test-coverage": "jest --coverage",
+    "prepublishOnly": "npm run test"
   },
   "dependencies": {
     "@originjs/vite-plugin-commonjs": "1.0.3",

package/src/assets/theme.js

@@ -12,6 +12,7 @@ const theme = {
     white: '#ffffff',
     blue: '#48a2d0',
     red: '#ff5656',
+    pureRed: '#ff0000',
     blue1: '#e4efff',
     brightBlue: '#0068DE',
     grey1: '#666',

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

@@ -52,9 +52,7 @@
       props.isDisabled
         ? props.theme.colors.disabled
         : props.customColor
-        ? props.theme.colors[props.customColor]
-          ? props.theme.colors[props.customColor]
-          : props.customColor
+        ? props.customColor
         : props.theme.colors.yellow};
     cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
     user-select: none;

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

@@ -5,7 +5,6 @@
       :custom-color="customColor"
       :data-id="dataId"
       :font-color="fontColor"
-      :height="height"
       :is-disabled="isDisabled"
       :min-width="minWidth"
       :no-wrap="noWrap"
@@ -44,11 +43,8 @@
     customColor: String,
     fontColor: String,
     noWrap: Boolean,
-    height: String,
   }
   const ButtonContainer = styled('div', ButtonAttrs)`
-    display: flex;
-    justify-content: center;
     padding: 7px 15px;
     font-size: 13px;
     color: ${(props) =>
@@ -71,7 +67,6 @@
     user-select: none;
     ${(props) => (props.minWidth ? `min-width: ${props.minWidth};` : '')};
     ${(props) => (props.noWrap ? `white-space: nowrap;` : '')};
-    height: ${(props) => props.height};
 
     &:hover {
       opacity: ${(props) => (props.isDisabled ? '1' : '0.8')};
@@ -141,11 +136,6 @@
         default: null,
         type: String,
       },
-      height: {
-        required: false,
-        default: 'auto',
-        type: String,
-      },
       id: {
         required: false,
         default: null,

package/src/components/icon/index.vue

@@ -35,7 +35,6 @@
     },
     name: {
       required: true,
-      type: String,
     },
     color: {
       required: false,

package/src/components/infoCard/InfoCard.stories.js

@@ -0,0 +1,170 @@
+import defaultInfoCardProps from './defaultProps'
+import InfoCard from './index.vue'
+import theme from '@/assets/theme'
+
+export default {
+  title: 'InfoCard',
+  component: InfoCard,
+  tags: ['autodocs'],
+  argTypes: {
+    type: {
+      description: 'Defines preset styles',
+      control: 'select',
+      options: ['info', 'warning'],
+    },
+    minWidth: {
+      description: '',
+    },
+    color: {
+      description: 'Color of the text (can overwrite preset styles)',
+      control: {
+        type: 'color',
+        presetColors: [
+          theme.colors.grey3,
+          theme.colors.grey4,
+          theme.colors.red,
+        ],
+      },
+    },
+    iconColor: {
+      description: 'Color of the icon (can overwrite preset styles)',
+      control: {
+        type: 'color',
+        presetColors: [
+          theme.colors.grey3,
+          theme.colors.grey4,
+          theme.colors.red,
+        ],
+      },
+    },
+    alignItems: {
+      description: 'Icon and text alignment (can overwrite preset styles)',
+      control: 'select',
+      options: ['flex-start', 'flex-end', 'center'],
+    },
+    padding: {
+      description: 'Info card padding (can overwrite preset styles)',
+    },
+    borderColor: {
+      description: 'Info card border color (can overwrite preset styles)',
+      control: {
+        type: 'color',
+        presetColors: [
+          theme.colors.grey3,
+          theme.colors.grey4,
+          theme.colors.red,
+        ],
+      },
+    },
+    borderStyle: {
+      description: 'Info card border style (can overwrite preset styles)',
+      control: 'select',
+      options: ['dashed', 'dotted', 'inset', 'dashed solid', 'none'],
+    },
+
+    // info card content slot
+    default: {
+      description: 'Info card slot content',
+    },
+  },
+}
+
+// To use:
+// <InfoCard
+//   type="warning"
+//   min-width="auto'
+//   color="red"
+//   align-items="center"
+//   padding="100px"
+//   border-color="red"
+//   border-style="solid"
+// >
+//   Some Text
+// </InfoCard>
+// all props after "min-width" are used to overwrite the preset styles set by "type"
+
+const Template = (args) => {
+  return {
+    components: { InfoCard },
+    setup() {
+      return { args }
+    },
+    template: `
+      <InfoCard v-bind="args">
+        {{ args.default }}
+      </InfoCard>
+    `,
+  }
+}
+
+export const Default = Template.bind({})
+Default.args = {
+  ...defaultInfoCardProps,
+}
+
+export const InfoCardTypeWarning = Template.bind({})
+InfoCardTypeWarning.args = {
+  ...defaultInfoCardProps,
+  type: 'warning',
+}
+
+export const InfoCardTypeErrorMinor = Template.bind({})
+InfoCardTypeErrorMinor.args = {
+  ...defaultInfoCardProps,
+  type: 'error_minor',
+}
+
+export const InfoCardTypeInfoMinWidth = Template.bind({})
+InfoCardTypeInfoMinWidth.args = {
+  ...defaultInfoCardProps,
+
+  minWidth: '250px',
+}
+
+export const InfoCardTypeInfoColorOverwritten = Template.bind({})
+InfoCardTypeInfoColorOverwritten.args = {
+  ...defaultInfoCardProps,
+
+  color: theme.colors.green,
+}
+
+export const InfoCardTypeInfoIconColorOverwritten = Template.bind({})
+InfoCardTypeInfoIconColorOverwritten.args = {
+  ...defaultInfoCardProps,
+
+  iconColor: theme.colors.green,
+}
+
+export const InfoCardTypeWarningAlignItemsOverwritten = Template.bind({})
+InfoCardTypeWarningAlignItemsOverwritten.args = {
+  ...defaultInfoCardProps,
+  type: 'warning',
+  default:
+    'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+
+  alignItems: 'center',
+}
+
+export const InfoCardTypeWarningPaddingOverwritten = Template.bind({})
+InfoCardTypeWarningPaddingOverwritten.args = {
+  ...defaultInfoCardProps,
+  type: 'warning',
+
+  padding: '50px',
+}
+
+export const InfoCardTypeErrorMinorBorderColorOverwritten = Template.bind({})
+InfoCardTypeErrorMinorBorderColorOverwritten.args = {
+  ...defaultInfoCardProps,
+  type: 'error_minor',
+
+  borderColor: theme.colors.green,
+}
+
+export const InfoCardTypeErrorMinorBorderStyleOverwritten = Template.bind({})
+InfoCardTypeErrorMinorBorderStyleOverwritten.args = {
+  ...defaultInfoCardProps,
+  type: 'error_minor',
+
+  borderStyle: 'solid none',
+}

package/src/components/infoCard/defaultProps.js

@@ -0,0 +1,7 @@
+const defaultInfoCardProps = {
+  // info card content slot
+  default:
+    'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.',
+}
+
+export default defaultInfoCardProps

package/src/components/infoCard/index.vue

@@ -1,11 +1,21 @@
 <template>
   <InfoContainer
-    background-color="backgrounColor"
+    :align-items="alignItems"
     :border-color="borderColor"
-    :has-dashed-border="hasDashedBorder"
+    :border-style="borderStyle"
+    :color="color"
+    data-test-id="info_card_wrapper"
+    :min-width="minWidth"
+    :padding="padding"
+    :preset-styles="presetStyles"
   >
-    <RCIcon :color="color" name="info" size="24px" />
-    <TextContainer>
+    <RCIcon
+      :color="iconColor ? iconColor : presetStyles.iconColor"
+      data-test-id="info_card_icon"
+      name="info"
+      size="24px"
+    />
+    <TextContainer data-test-id="info_card_text_container">
       <slot></slot>
     </TextContainer>
   </InfoContainer>
@@ -13,26 +23,37 @@
 
 <script>
   import styled from 'vue3-styled-components'
+  import theme from '../../assets/theme.js'
   import RCIcon from '../icon'
-  const propsContainer = {
-    backgroundColor: String,
-    hasDashedBorder: Boolean,
+
+  const infoContainerAttrs = {
+    minWidth: String,
+    color: String,
+    alignItems: String,
+    padding: String,
     borderColor: String,
+    borderStyle: String,
+    presetStyles: Object,
   }
-  const InfoContainer = styled('div', propsContainer)`
+  const InfoContainer = styled('div', infoContainerAttrs)`
     display: flex;
+    align-items: ${(props) =>
+      props.alignItems ? props.alignItems : props.presetStyles.alignItems};
     gap: 15px;
-    padding: 15px;
-    border: 1px ${(props) => (props.hasDashedBorder ? 'dashed' : 'solid')}
-      ${(props) =>
-        props.theme.colors[props.borderColor]
-          ? props.theme.colors[props.borderColor]
-          : props.borderColor};
-    background-color: ${(props) =>
-      props.theme.colors[props.backgroundColor]
-        ? props.theme.colors[props.backgroundColor]
-        : props.backgroundColor};
+    min-width: ${(props) => props.minWidth};
+    padding: ${(props) =>
+      props.padding ? props.padding : props.presetStyles.padding};
+    color: ${(props) => (props.color ? props.color : props.presetStyles.color)};
     border-radius: 4px;
+    background-color: ${(props) =>
+      props.backgroundColor
+        ? props.backgroundColor
+        : props.presetStyles.backgroundColor};
+    border-width: ${(props) => props.presetStyles.borderWidth};
+    border-style: ${(props) =>
+      props.borderStyle ? props.borderStyle : props.presetStyles.borderStyle};
+    border-color: ${(props) =>
+      props.borderColor ? props.borderColor : props.presetStyles.borderColor};
   `
 
   const TextContainer = styled.div`
@@ -48,19 +69,83 @@
       TextContainer,
     },
     props: {
+      type: {
+        required: false,
+        type: String,
+        default: 'info',
+      },
+      minWidth: {
+        required: false,
+        type: String,
+        default: '',
+      },
+      iconColor: {
+        required: false,
+        type: String,
+        default: '',
+      },
       color: {
         required: false,
+        type: String,
+        default: '',
       },
-      backgrounColor: {
+      alignItems: {
         required: false,
+        type: String,
+        default: '',
       },
-      hasDashedBorder: {
+      padding: {
         required: false,
-        default: true,
+        type: String,
+        default: '',
       },
       borderColor: {
         required: false,
-        default: 'grey4',
+        type: String,
+        default: '',
+      },
+      borderStyle: {
+        required: false,
+        type: String,
+        default: '',
+      },
+    },
+    computed: {
+      isInfo() {
+        // this property is used for tests
+        return this.type === 'info'
+      },
+      isWarning() {
+        return this.type === 'warning'
+      },
+      isErrorMinor() {
+        return this.type === 'error_minor'
+      },
+      presetStyles() {
+        // the types that doesn't have explicit border anyway have it transparent
+        // to avoid flickering in case the same info card would switch the types
+        let stylesCollection = {
+          alignItems: 'flex-start',
+          padding: '20px',
+          borderWidth: '1px',
+          borderStyle: 'solid',
+          borderColor: 'transparent',
+        }
+
+        if (this.isWarning) {
+          stylesCollection.color = theme.colors.white
+          stylesCollection.backgroundColor = theme.colors.yellow
+          stylesCollection.iconColor = theme.colors.white
+        } else if (this.isErrorMinor) {
+          stylesCollection.borderStyle = 'dashed'
+          stylesCollection.borderColor = theme.colors.pureRed
+          stylesCollection.iconColor = theme.colors.pureRed
+        } else {
+          stylesCollection.borderStyle = 'dashed'
+          stylesCollection.borderColor = theme.colors.grey4
+        }
+
+        return stylesCollection
       },
     },
   }

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

@@ -0,0 +1,64 @@
+import { mount } from '@vue/test-utils'
+import RCInfoCard from '@/components/infoCard'
+import RCIcon from '@/components/icon'
+import defaultInfoCardProps 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('RCInfoCard.vue', () => {
+  it('info card is rendered with icon and correct text', async () => {
+    const wrapper = mount(RCInfoCard, {
+      props: { ...defaultInfoCardProps },
+      slots: {
+        default: defaultInfoCardProps.default,
+      },
+      global: {
+        provide: {
+          theme,
+        },
+      },
+    })
+
+    const iconComponent = wrapper.findComponent(RCIcon)
+    const infoCardText = wrapper.find(
+      '[data-test-id="info_card_text_container"]'
+    )
+
+    expect(iconComponent.exists()).toBe(true)
+    expect(infoCardText.exists()).toBe(true)
+    expect(infoCardText.text()).toContain(defaultInfoCardProps.default)
+  }),
+    it('info card rendered with type info have correct computed values', async () => {
+      const wrapper = mount(RCInfoCard, {
+        props: { ...defaultInfoCardProps },
+        slots: {
+          default: defaultInfoCardProps.default,
+        },
+        global: {
+          provide: {
+            theme,
+          },
+        },
+      })
+
+      expect(wrapper.vm.isInfo).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.isWarning).toBe(true)
+      expect(wrapper.vm.isErrorMinor).toBe(false)
+
+      await wrapper.setProps({ type: 'error_minor' })
+
+      expect(wrapper.vm.isInfo).toBe(false)
+      expect(wrapper.vm.isWarning).toBe(false)
+      expect(wrapper.vm.isErrorMinor).toBe(true)
+    })
+})