@eturnity/eturnity_reusable_components 7.12.6-EPDM-7951.3 → 7.12.7-EPDM-10299.0

package/src/components/filter/filterSettings.vue

@@ -3,7 +3,7 @@
     <upper-container v-if="filterViews && filterViews.length">
       <view-container :maxWidth="activeView.length">
         <select-component
-          @click.stop
+          @click.native.stop
           selectWidth="100%"
           selectHeight="36px"
           fontSize="13px"
@@ -19,10 +19,10 @@
             <Option
               v-for="(item, idx) in filterViews"
               :key="idx + '_view'"
-              @click="$emit('on-view-select', item)"
+              @click.native="$emit('on-view-select', item)"
               :value="item.name"
               >{{ item.name }}
-              <delete-icon @click.stop="$emit('on-view-delete', item)"
+              <delete-icon @click.native.stop="$emit('on-view-delete', item)"
             /></Option>
           </template>
         </select-component>
@@ -55,28 +55,28 @@
               ghost-class="ghost"
               :setData="modifyDragItem"
               v-model="item.dataOptions"
-              itemKey="choice"
             >
-              <template #item="{ element: column }">
-                <checkbox-wrapper>
-                  <drag-container class="drag-container">
-                    <icon :name="'duplicate-1'" size="12px" />
-                  </drag-container>
-                  <checkbox
-                    :label="column.text"
-                    :isChecked="column.selected"
-                    @on-event-handler="
-                      onChange({
-                        dataType: item.type,
-                        value: $event,
-                        choice: column.choice
-                      })
-                    "
-                    size="small"
-                    :isDisabled="column.selected && isCheckboxDisabled"
-                  />
-                </checkbox-wrapper>
-              </template>
+              <checkbox-wrapper
+                v-for="(column, index) in item.dataOptions"
+                :key="index + 'dataOption'"
+              >
+                <drag-container class="drag-container">
+                  <icon :name="'duplicate-1'" size="12px" />
+                </drag-container>
+                <checkbox
+                  :label="column.text"
+                  :isChecked="column.selected"
+                  @on-event-handler="
+                    onChange({
+                      dataType: item.type,
+                      value: $event,
+                      choice: column.choice
+                    })
+                  "
+                  size="small"
+                  :isDisabled="column.selected && isCheckboxDisabled"
+                />
+              </checkbox-wrapper>
             </draggable>
           </checkbox-container>
         </row-container>
@@ -169,19 +169,12 @@
             >
               <row-label :data-id="filter.dataId">{{ filter.label }}</row-label>
               <grid-container>
-                <VueDatePicker
+                <date-picker-input
                   :placeholder="$gettext('Date from')"
-                  :locale="getDatePickerLanguage()"
-                  :model-value="filter.range.start"
-                  :enable-time-picker="false"
-                  :clearable="false"
-                  :auto-apply="true"
-                  :disabled-dates="disableFutureDates"
-                  format="yyyy-MM-dd"
-                  model-type="format"
-                  @focus="onDatepickerFocus(filter.range)"
-                  @close="onDatepickerBlur()"
-                  @update:model-value="
+                  :lang="getDatePickerLanguage()"
+                  type="date"
+                  :value="filter.range.start"
+                  @change="
                     onChange({
                       dataType: item.type,
                       value: $event,
@@ -189,20 +182,18 @@
                       field: filter.field
                     })
                   "
-                />
-                <VueDatePicker
-                  :placeholder="$gettext('Date to')"
-                  :locale="getDatePickerLanguage()"
-                  :model-value="filter.range.end"
-                  :enable-time-picker="false"
-                  :clearable="false"
-                  :auto-apply="true"
-                  :disabled-dates="disablePastDates"
-                  format="yyyy-MM-dd"
-                  model-type="format"
                   @focus="onDatepickerFocus(filter.range)"
                   @close="onDatepickerBlur()"
-                  @update:model-value="
+                  format="YYYY-MM-DD"
+                  valueType="format"
+                  :disabled-date="disableFutureDates"
+                />
+                <date-picker-input
+                  :placeholder="$gettext('Date to')"
+                  :lang="getDatePickerLanguage()"
+                  type="date"
+                  :value="filter.range.end"
+                  @change="
                     onChange({
                       dataType: item.type,
                       value: $event,
@@ -210,6 +201,11 @@
                       field: filter.field
                     })
                   "
+                  @focus="onDatepickerFocus(filter.range)"
+                  @close="onDatepickerBlur()"
+                  format="YYYY-MM-DD"
+                  valueType="format"
+                  :disabled-date="disablePastDates"
                 />
               </grid-container>
             </section-container>
@@ -251,26 +247,27 @@
         v-if="buttonText.apply_view"
         type="primary"
         :text="buttonText.apply_view"
-        @click="$emit('on-apply-current-view')"
+        @click.native="$emit('on-apply-current-view')"
       />
       <main-button
         type="secondary"
         v-if="buttonText.save_view"
         :text="buttonText.save_view"
-        @click="$emit('on-save-new-view')"
+        @click.native="$emit('on-save-new-view')"
       />
       <main-button
         type="cancel"
         v-if="buttonText.cancel"
         :text="buttonText.cancel"
-        @click="$emit('on-cancel-view')"
+        @click.native="$emit('on-cancel-view')"
       />
     </button-container>
   </container-wrapper>
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
+import DatePicker from 'vue2-datepicker'
 import SelectComponent from '../inputs/select'
 import Option from '../inputs/select/option'
 import InputNumber from '../inputs/inputNumber'
@@ -281,7 +278,12 @@ import Icon from '../icon'
 import DeleteIcon from '../deleteIcon'
 import { datePickerLang } from '../../helpers/translateLang'
 import theme from '@/assets/theme.js'
-import VueDatePicker from '@vuepic/vue-datepicker'
+import 'vue2-datepicker/index.css'
+import 'vue2-datepicker/locale/de'
+import 'vue2-datepicker/locale/en'
+import 'vue2-datepicker/locale/es'
+import 'vue2-datepicker/locale/fr'
+import 'vue2-datepicker/locale/it'
 
 const ContainerWrapper = styled.div`
   position: absolute;
@@ -380,6 +382,46 @@ const RowWrapper = styled.div`
   margin-bottom: 12px;
 `
 
+const DatePickerInput = styled(DatePicker)`
+  border: 1px solid ${(props) => props.theme.colors.grey4};
+  border-radius: 4px;
+  padding: 7px 12px 7px 7px;
+  width: 100%;
+  position: relative;
+
+  &.mx-datepicker {
+    width: 100% !important;
+    max-width: 100%;
+    height: 36px;
+    align-self: flex-end;
+  }
+
+  .mx-input-wrapper {
+    position: unset;
+
+    input {
+      border: none;
+      height: auto;
+      padding: 0;
+      font-size: 13px;
+      box-shadow: none;
+      color: #393939;
+      vertical-align: bottom;
+    }
+
+    .mx-input-append {
+      top: 1px;
+    }
+  }
+
+  .mx-input-append {
+    left: 0;
+    top: 5px;
+    height: auto;
+    cursor: pointer;
+  }
+`
+
 const LabelAttrs = {
   marginTop: Boolean
 }
@@ -444,14 +486,14 @@ export default {
     Icon,
     DragContainer,
     InputNumber,
+    DatePickerInput,
     RowLabel,
     SectionContainer,
     GridContainer,
     ViewContainer,
     DeleteIcon,
     UpperContainer,
-    ResetButton,
-    VueDatePicker
+    ResetButton
   },
   props: {
     filterData: {

package/src/components/filter/index.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import parentDropdown from './parentDropdown'
 import filterSettings from './filterSettings'
 
@@ -93,9 +93,9 @@ export default {
       }, 100)
     },
     clickOutside(event) {
+      const target = event.target
       if (
-        this.$refs.dropdown &&
-        !this.$refs.dropdown.$el.contains(event.target) &&
+        !this.$refs.dropdown.$el.contains(target) &&
         !this.preventOutsideClick
       ) {
         this.isDropdownOpen = false

package/src/components/filter/parentDropdown.vue

@@ -9,7 +9,7 @@
       </title-text>
       <arrow-wrapper>
         <icon
-          @click.stop="$emit('on-toggle')"
+          @click.native.stop="$emit('on-toggle')"
           :name="isOpen ? 'arrow_up' : 'arrow_down'"
           size="12px"
         />
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import Icon from '../icon'
 
 const PageWrapper = styled.div`

package/src/components/icon/iconCollection.vue

@@ -16,7 +16,7 @@
 
 <script>
 import icon from './index.vue'
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 
 const Wrapper = styled.div`
   display: block;
@@ -36,7 +36,7 @@ const IconWrapper = styled.div`
   margin: 10px;
 `
 export default {
-  name: 'collectionComponent',
+  name: 'collection',
   components: { icon, IconWrapper, Wrapper },
   props: {
     size: { required: false },

package/src/components/icon/index.vue

@@ -1,18 +1,19 @@
 <template>
-  <wrapper :isDisabled="disabled" :size="size" :cursor="cursor">
-    <icon-image :size="size" :color="color" :hoveredColor="hoveredColor">
-      <i v-html="icon.html" />
-    </icon-image>
-    <striked-line
-      v-if="isStriked"
-      :color="color"
+  <Wrapper :isDisabled="disabled" :size="size" :cursor="cursor">
+    <icon-image
       :disabled="disabled"
+      :size="size"
+      :color="color"
       :hoveredColor="hoveredColor"
-    ></striked-line>
-  </wrapper>
+      v-html="
+        require(`!html-loader!./../../assets/svgIcons/${name.toLowerCase()}.svg`)
+      "
+    ></icon-image>
+    <striked-line v-if="isStriked" :color="color" :disabled="disabled" :hoveredColor="hoveredColor"></striked-line>
+  </Wrapper>
 </template>
 
-<script setup>
+<script>
 // import Icon from "@eturnity/eturnity_reusable_components/src/components/icon"
 //  How to use:
 //<icon
@@ -24,8 +25,8 @@
 //   isStriked = "true"
 // />
 
-import { onMounted, reactive, watch } from 'vue'
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
+
 const wrapperAttrs = { isDisabled: Boolean, size: String, cursor: String }
 const Wrapper = styled('div', wrapperAttrs)`
   display: flex;
@@ -39,22 +40,17 @@ const Wrapper = styled('div', wrapperAttrs)`
   cursor: ${(props) => (props.isDisabled ? 'not-allowed' : props.cursor)};
   line-height: 0;
 `
-const strikedAttrs = {
-  isDisabled: Boolean,
-  color: String,
-  hoveredColor: String
-}
-const StrikedLine = styled('div', strikedAttrs)`
+const strikedAttrs = { isDisabled: Boolean, color: String, hoveredColor: String }
+const strikedLine = styled('div', strikedAttrs)`
   display: flex;
   position: absolute;
-  bottom: 0;
-  left: 0;
+  bottom:0;
+  left:0;
   align-content: center;
   justify-content: center;
   width: 143%;
-  height: 8%;
-  background-color: ${(props) =>
-    props.theme.colors[props.color] || props.color};
+  height:8%;
+  background-color: ${(props)=>props.theme.colors[props.color] || props.color};
   min-height: 0;
   line-height: 0;
   transform-origin: 0% 100%;
@@ -75,48 +71,46 @@ const IconImage = styled('div', IconImageProps)`
     ${(props) => props.hoveredColor && `fill: ${props.hoveredColor};`}
   }
   &:hover + div {
-    background-color: ${(props) => props.hoveredColor};
+    background-color: ${(props)=>props.hoveredColor};
   }
 `
 
-const props = defineProps({
-  disabled: {
-    required: false,
-    default: false
-  },
-  name: {
-    required: true
-  },
-  color: {
-    required: false
-  },
-  hoveredColor: {
-    required: false
+export default {
+  name: 'icon',
+  components: {
+    IconImage,
+    Wrapper,
+    strikedLine
   },
-  size: {
-    required: false,
-    default: '30px'
+  props: {
+    disabled: {
+      required: false,
+      default: false
+    },
+    name: {
+      required: true
+    },
+    color: {
+      required: false
+    },
+    hoveredColor: {
+      required: false
+    },
+    size: {
+      required: false,
+      default: '30px'
+    },
+    cursor: {
+      required: false,
+      default: null
+    },
+    isStriked: {
+      required: false,
+      default: false
+    }
   },
-  cursor: {
-    required: false,
-    default: null
-  },
-  isStriked: {
-    required: false,
-    default: false
+  data() {
+    return {}
   }
-})
-
-const icon = reactive({ html: '' })
-
-const handleLoadAsyncIcon = async (iconName = props.name) => {
-  const iconPath = `../../assets/svgIcons/${props.name.toLowerCase()}.svg?raw`
-  const module = await import(/* @vite-ignore */ iconPath)
-
-  icon.html = module.default
 }
-
-onMounted(() => handleLoadAsyncIcon())
-
-watch(() => props.name, handleLoadAsyncIcon)
 </script>

package/src/components/iconWrapper/index.vue

@@ -42,7 +42,7 @@
 //   size="60px" by default, this is 30px
 // />
 
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import icon from '../icon'
 const wrapperAttrs = {
   color: String,
@@ -148,6 +148,9 @@ export default {
       required: false,
       default: false
     }
+  },
+  data() {
+    return {}
   }
 }
 </script>

package/src/components/infoCard/index.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import Icon from '../icon'
 
 const InfoContainer = styled.div`
@@ -24,6 +24,7 @@ const TextContainer = styled.div`
   width: 100%;
 `
 
+
 export default {
   name: 'InfoCard',
   components: {
@@ -32,4 +33,4 @@ export default {
     TextContainer
   }
 }
-</script>
+</script>

package/src/components/infoText/index.vue

@@ -30,7 +30,7 @@
 //     alignArrow="right" // which side the arrow should be on
 // />
 import theme from '../../assets/theme.js'
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import icon from '../icon'
 
 const textAttrs = {

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

@@ -3,7 +3,7 @@
     <container
       :checkColor="checkColor"
       :size="size"
-      :hasLabel="hasLabel"
+      :hasLabel="!!label.length"
       :backgroundColor="backgroundColor"
       :isChecked="isChecked"
       :isDisabled="isDisabled"
@@ -14,10 +14,10 @@
         :data-id="dataId"
         @change="onChangeHandler(!isChecked)"
       />
-      <check-wrapper :hasLabel="hasLabel">
+      <div>
         <span class="checkmark"></span>
-      </check-wrapper>
-      <label-text v-if="hasLabel">{{ label }}</label-text>
+      </div>
+      <label-text v-if="!!label.length">{{ label }}</label-text>
     </container>
   </component-wrapper>
 </template>
@@ -34,21 +34,12 @@
 //     backgroundColor="red"
 //     :isDisabled="true"
 // />
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 
 const ComponentWrapper = styled.div`
   min-height: 18px;
 `
 
-const CheckWrapper = styled('div', { hasLabel: Boolean })`
-  ${(props) =>
-    props.hasLabel &&
-    `
-    display: flex;
-    align-items: center;
-  `}
-`
-
 const containerAttrs = {
   checkColor: String,
   size: String,
@@ -154,8 +145,7 @@ export default {
     ComponentWrapper,
     Container,
     InputCheckbox,
-    LabelText,
-    CheckWrapper
+    LabelText
   },
   props: {
     label: {
@@ -185,11 +175,6 @@ export default {
       default: ''
     }
   },
-  computed: {
-    hasLabel() {
-      return !!this.label.length
-    }
-  },
   methods: {
     onChangeHandler(value) {
       if (this.isDisabled) {

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

@@ -47,6 +47,7 @@
         :fontSize="fontSize"
         :fontColor="fontColor"
         :backgroundColor="backgroundColor"
+        v-on="$listeners"
         :hasSlot="hasSlot"
         :hasLabelSlot="hasLabelSlot"
         :slotSize="slotSize"
@@ -100,7 +101,7 @@
 // >
 //<template name=label><img>....</template>
 //</inputNumber>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import {
   stringToNumber,
   numberToString
@@ -487,10 +488,9 @@ export default {
       // Need to return an integer rather than a string
       this.$emit('input-change', event)
     },
-    onEvaluateCode(event) {
+    onEvaluateCode(val) {
       // function to perform math on the code
       // filter the string in case of any malicious content
-      const val = event.target.value
       let filtered = val.replace('(auto)', '').replace(/[^-()\d/*+.,]/g, '')
       filtered = filtered.split(/([-+*/()])/)
       let formatted = filtered.map((item) => {
@@ -548,19 +548,19 @@ export default {
       }
       return array
     },
-    onInput(event) {
+    onInput(value) {
       if (this.isBlurred) {
         this.isBlurred = false
         return
       }
-      if (event.target.value === '') {
+      if (value === '') {
         this.$emit('on-input', '')
       }
       let evaluatedVal
       try {
-        evaluatedVal = this.onEvaluateCode(event)
+        evaluatedVal = this.onEvaluateCode(value)
       } finally {
-        if (evaluatedVal) {
+        if (evaluatedVal && this.value != evaluatedVal) {
           this.$emit('on-input', evaluatedVal)
         }
       }
@@ -570,7 +570,7 @@ export default {
       // setting isBlurred so we don't trigger onInput as well
       this.isBlurred = true
       let value = e.target.value
-      let evaluatedInput = this.onEvaluateCode(e)
+      let evaluatedInput = this.onEvaluateCode(value)
       this.onChangeHandler(evaluatedInput ? evaluatedInput : value)
       if ((evaluatedInput && value.length) || this.minNumber !== null) {
         this.textInput = numberToString({
@@ -646,10 +646,10 @@ export default {
       }
     },
     initInteraction(e) {
+      this.focusInput()
+      e.preventDefault()
       window.addEventListener('mousemove', this.interact, false)
       window.addEventListener('mouseup', this.stopInteract, false)
-      e.preventDefault()
-      this.focusInput()
     },
     interact(e) {
       e.preventDefault()

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

@@ -44,7 +44,7 @@
 //   number_max_allowed: 10,
 //   unit_short_name: "cm",
 // },
-import styled from "vue3-styled-components"
+import styled from "vue-styled-components"
 import {
   stringToNumber,
   numberToString,

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

@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import InfoText from '../../infoText'
 import Icon from '../../icon'
 import ErrorMessage from '../../errorMessage'
@@ -332,8 +332,8 @@ export default {
       this.$emit('on-enter-click')
       this.$refs.inputElement.$el.blur()
     },
-    onChangeHandler(event) {
-      this.$emit('input-change', event.target.value)
+    onChangeHandler($event) {
+      this.$emit('input-change', $event)
     },
     onInputBlur($event) {
       this.$emit('input-blur', $event.target.value)