@eturnity/eturnity_reusable_components 7.18.0-qa-dev03.0 → 7.20.0--EPDM-10564.1

package/src/components/projectMarker/index.vue

@@ -1,7 +1,7 @@
 <template>
   <page-container>
     <marker-container
-      v-if="markerData"
+      v-if="markerData && markerData.translations[activeLanguage]"
       :hasBorderRadius="hasBorderRadius"
       :withDate="!!date"
       :backgroundColor="markerData.color"
@@ -9,7 +9,7 @@
       :isEditionAllowed="editionAllowed"
       :isActive="activated"
       :cursor="cursor"
-      @click.native="editionAllowed ? (activated = !activated) : ''"
+      @click="editionAllowed ? (activated = !activated) : ''"
     >
       <icon
         v-if="!!iconName"
@@ -18,7 +18,11 @@
         size="10px"
         :cursor="cursor"
       />
-      <span>{{ markerData.translations[activeLanguage].name }}</span>
+      <span>{{
+        markerData.translations[activeLanguage]
+          ? markerData.translations[activeLanguage].name
+          : '-'
+      }}</span>
       <dot-wrapper v-if="editionAllowed" class="dotContainer">
         <dot-icon />
         <dot-icon />
@@ -28,11 +32,11 @@
         v-if="activated"
         v-click-outside="clickOutsideActionHandler"
       >
-        <edit-item @click.native="deleteModalOpened = !deleteModalOpened">
+        <edit-item @click="deleteModalOpened = !deleteModalOpened">
           <delete-icon />
           <div>{{ $gettext('Delete') }}</div>
         </edit-item>
-        <edit-item @click.native="onEditClick">
+        <edit-item @click="onEditClick">
           <icon-container>
             <icon name="edit_button" size="14px" />
           </icon-container>
@@ -52,10 +56,10 @@
         <page-title :text="$gettext('delete_confirm_text')" />
         <page-subtitle :text="$gettext('delete_confirm_subtext')" />
         <cta-container>
-          <main-button @click.native="onDelete" :text="$gettext('Delete')" />
+          <main-button @click="onDelete" :text="$gettext('Delete')" />
           <main-button
             type="cancel"
-            @click.native="closeDeleteModal"
+            @click="closeDeleteModal"
             :text="$gettext('Cancel')"
           />
         </cta-container>
@@ -78,7 +82,8 @@
 //   @deleteHandler="onMarkerDelete($event)"
 // />
 
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
+import vClickOutside from 'click-outside-vue3'
 import Icon from '../icon'
 import Modal from '../modals/modal'
 import PageTitle from '../pageTitle'
@@ -129,7 +134,6 @@ const MarkerContainer = styled('div', MarkerAttrs)`
       props.backgroundColor ? props.backgroundColor : props.theme.colors.grey3};
   border-radius: ${(props) =>
     props.hasBorderRadius ? (props.withDate ? '4px 0 0 4px' : '4px') : '0'};
-
   white-space: nowrap;
   cursor: ${(props) => (props.isEditionAllowed ? 'pointer' : props.cursor)};
 
@@ -196,6 +200,9 @@ const Date = styled.div`
 
 export default {
   name: 'project-marker',
+  directives: {
+    clickOutside: vClickOutside.directive
+  },
   components: {
     PageContainer,
     MarkerContainer,

package/src/components/sideMenu/index.vue

@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import Icon from '../icon'
 import Spinner from '../spinner'
 

package/src/components/spinner/index.vue

@@ -1,24 +1,19 @@
 <template>
   <spinner-container v-if="fullWidth">
     <container>
-      <spinner-wrapper
-        :size="size"
-        :src="require('../../assets/icons/black_spinner.svg')"
-      />
+      <spinner-wrapper :size="size" />
     </container>
   </spinner-container>
   <container v-else :limitedToModal="limitedToModal">
-    <spinner-wrapper
-      :size="size"
-      :src="require('../../assets/icons/black_spinner.svg')"
-    />
+    <spinner-wrapper :size="size" />
   </container>
 </template>
 
 <script>
 // import Spinner from "@eturnity/eturnity_reusable_components/src/components/spinner"
 // <spinner size="30px" />
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
+import SpinnerSvg from '../../assets/icons/black_spinner.svg?component'
 
 const SpinnerContainer = styled.div`
   position: fixed;
@@ -43,8 +38,9 @@ const Container = styled('div', containerAttrs)`
 `
 
 const spinnerAttrs = { size: String }
-const SpinnerWrapper = styled('img', spinnerAttrs)`
+const SpinnerWrapper = styled(SpinnerSvg, spinnerAttrs)`
   width: ${(props) => (props.size ? props.size : '60px')};
+  height: auto;
 `
 
 export default {
@@ -69,4 +65,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/tableDropdown/index.vue

@@ -40,12 +40,7 @@
             "
             @click.stop="onSelectedTemplateClick(item.row)"
           >
-            <img
-              :src="require('../../assets/icons/file_icon.png')"
-              alt="icon"
-              width="12"
-              height="16"
-            />
+            <img :src="fileIcon" alt="icon" width="12" height="16" />
             <div>{{ item.value }}</div>
           </template-link>
           <no-template v-if="item.type && item.type === 'no-template'">
@@ -53,7 +48,7 @@
           </no-template>
           <input-container
             v-if="item.type === 'input'"
-            @click.native.stop="onInputClick()"
+            @click.stop="onInputClick()"
           >
             <text-container
               v-if="customInputDisabled"
@@ -93,16 +88,11 @@
             triggerType="hover"
           ></et-popover>
           <arrow-down
-            @click.native.stop="toggleOpen"
+            @click.stop="toggleOpen"
             v-if="!isOpen"
             class="arrow-dropdown"
-            :src="require('../../assets/icons/collapse_arrow_icon.svg')"
-          />
-          <arrow-up
-            @click.native.stop="toggleOpen"
-            v-else
-            :src="require('../../assets/icons/collapse_arrow_icon.svg')"
           />
+          <arrow-up @click.stop="toggleOpen" v-else />
         </arrow-wrapper>
         <options-container v-if="isOpen" ref="optionsContainer">
           <options-wrapper @click.prevent.stop>
@@ -127,20 +117,18 @@
               :key="index"
               @click="onItemClick(item)"
               :tabindex="0"
-              @keyup.enter.native="onItemClick(item)"
+              @keyup.enter="onItemClick(item)"
             >
-              <template v-for="(option, idx) in optionsDisplay">
-                <span v-if="option !== 'template'" :key="idx">
+              <template v-for="(option, idx) in optionsDisplay" :key="idx">
+                <span v-if="option !== 'template'">
                   {{ !!item[option] ? item[option] : '-' }}
                 </span>
                 <template-button
-                  :key="idx"
                   @click.stop="onTemplateClick(item)"
                   v-else-if="option === 'template' && item.has_template"
                   >{{ $gettext('Use template...') }}</template-button
                 >
                 <no-template
-                  :key="idx"
                   v-else-if="option === 'template' && !item.has_template"
                 >
                   {{ $gettext('No main component template') }}
@@ -183,10 +171,13 @@
 //   :optionsDisplay="['display_name', 'company_item_number']" // Array. what should be displayed
 //   :disabled="true"
 // />
-import styled from 'vue-styled-components'
-import Spinner from '@eturnity/eturnity_reusable_components/src/components/spinner'
-import SearchInput from '@eturnity/eturnity_reusable_components/src/components/inputs/searchInput'
-import InputText from '@eturnity/eturnity_reusable_components/src/components/inputs/inputText'
+import styled from 'vue3-styled-components'
+import Spinner from '../spinner'
+import SearchInput from '../inputs/searchInput'
+import InputText from '../inputs/inputText'
+import CollapseArrowIcon from '../../assets/icons/collapse_arrow_icon.svg'
+import SubpositionMarkerIcon from '../../assets/icons/subposition_marker.svg'
+import fileIconPng from '../../assets/icons/file_icon.png'
 
 const rowAttrs = { disabled: Boolean, isOpen: Boolean }
 const DropdownRow = styled('div', rowAttrs)`
@@ -237,9 +228,8 @@ const ComponentContainer = styled('div', containerAttrs)`
   padding: 5px 4px;
 `
 
-const ArrowDown = styled.img`
+const ArrowDown = styled(CollapseArrowIcon)`
   width: 8px;
-  transform: rotate(0deg);
   transition: transform 150ms ease;
 `
 
@@ -403,9 +393,7 @@ const TextContainer = styled.div`
   align-items: center;
 `
 
-const NestedIcon = styled.div`
-  background-image: ${() =>
-    `url(${require('../../assets/icons/subposition_marker.svg')})`};
+const NestedIcon = styled(SubpositionMarkerIcon)`
   height: 10px;
   width: 6px;
 `
@@ -502,7 +490,8 @@ export default {
       inputText: '',
       wasClicked: false, // prevents custom-name from being triggered on the <input-text />
       dynamicWidth: [], // for numbers
-      dynamicGridWidth: [] // for grid values
+      dynamicGridWidth: [], // for grid values
+      fileIcon: fileIconPng
     }
   },
   methods: {
@@ -524,7 +513,7 @@ export default {
         })
         this.$emit('toggle-dropdown-open', { close: false })
         this.$nextTick(() => {
-          this.$refs.searchInput.$el.children[0].children[0].focus()
+          this.$refs.searchInput.$el.children[0].children[1].focus()
         })
       } else {
         document.removeEventListener('click', this.clickOutside)
@@ -583,30 +572,28 @@ export default {
     },
     setDropdownWidth(options) {
       this.dynamicWidth = []
-      options.map((item) => {
-        this.optionsDisplay.map((header, index) => {
+
+      options.forEach((item) => {
+        this.optionsDisplay.forEach((header, index) => {
           let value =
             header === 'template'
               ? this.$gettext('No main component template')
               : item[header]
-
           value = value ? value : ''
 
+          // Update dynamicWidth with the maximum value
           if (
-            this.optionsDisplay.length &&
-            (this.dynamicWidth.length < this.optionsDisplay.length ||
-              value.length > this.dynamicWidth[index])
+            !this.dynamicWidth[index] ||
+            value.length > this.dynamicWidth[index]
           ) {
-            if (Array.isArray(this.dynamicGridWidth)) {
-              this.dynamicGridWidth[index] = value.length + 'ch'
-            }
             this.dynamicWidth[index] = value.length
           }
         })
       })
-      if (this.dynamicGridWidth.length === this.optionsDisplay.length) {
-        this.dynamicGridWidth = this.dynamicGridWidth.join(' ')
-      }
+
+      this.dynamicGridWidth = this.dynamicWidth
+        .map((width) => width + 'ch')
+        .join(' ')
     }
   },
   computed: {
@@ -627,9 +614,12 @@ export default {
         })
       }
     },
-    optionItems(val) {
-      if (val && val.length) {
-        this.setDropdownWidth(val)
+    optionItems: {
+      immediate: true,
+      handler(val) {
+        if (val && val.length) {
+          this.setDropdownWidth(val)
+        }
       }
     }
   }

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

@@ -161,7 +161,7 @@
 
 <script>
 import draggable from "vuedraggable"
-import styled from "vue-styled-components"
+import styled from "vue3-styled-components"
 import MainTable from "@/components/reusable-components/tables/MainTable"
 import InputText from "@eturnity/eturnity_reusable_components/src/components/inputs/inputText"
 import DeleteIcon from "@/components/reusable-components/DeleteIcon"

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

@@ -29,8 +29,12 @@
 <script>
 // ToDo: add this to storybook
 // import MainTable from "@eturnity/eturnity_reusable_components/src/components/tables/mainTable"
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import Spinner from '../../spinner'
+import dragIconSvg from '../../../assets/icons/drag_icon.svg?url'
+import subpositionIconSvg from '../../../assets/icons/subposition_icon.svg?url'
+import arrowDownSvg from '../../../assets/icons/arrow_down.svg?url'
+import arrowUpRedSvg from '../../../assets/icons/arrow_up_red.svg?url'
 
 const pageContainerProps = {
   tableHeight: String,
@@ -122,6 +126,7 @@ const TableContainer = styled('table', containerAttrs)`
         background-color: ${(props) => props.theme.colors.white};
         cursor: ${(props) => (props.tableCursor ? props.tableCursor : 'auto')};
 
+        .select-button,
         .arrow-container,
         .input-placeholder,
         .table-dropdown-item {
@@ -322,8 +327,7 @@ const TableContainer = styled('table', containerAttrs)`
       height: 16px;
       cursor: grab;
       background-position: center;
-      background-image: ${() =>
-        `url(${require('../../../assets/icons/drag_icon.svg')})`};
+      background-image: ${() => `url(${dragIconSvg})`};
 
       &:active {
         cursor: grabbing;
@@ -335,8 +339,7 @@ const TableContainer = styled('table', containerAttrs)`
       height: 11px;
       background: no-repeat;
       margin-left: 10px;
-      background-image: ${() =>
-        `url(${require('../../../assets/icons/subposition_icon.svg')})`};
+      background-image: ${() => `url(${subpositionIconSvg})`};
     }
 
     .arrow-down {
@@ -344,8 +347,7 @@ const TableContainer = styled('table', containerAttrs)`
       height: 11px;
       background: no-repeat;
       background-position: center;
-      background-image: ${() =>
-        `url(${require('../../../assets/icons/arrow_down.svg')})`};
+      background-image: ${() => `url(${arrowDownSvg})`};
     }
 
     .arrow-up {
@@ -353,8 +355,7 @@ const TableContainer = styled('table', containerAttrs)`
       height: 11px;
       background: no-repeat;
       background-position: center;
-      background-image: ${() =>
-        `url(${require('../../../assets/icons/arrow_up_red.svg')})`};
+      background-image: ${() => `url(${arrowUpRedSvg})`};
     }
   }
 

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

@@ -29,7 +29,7 @@
               </table-item>
               <icons-container v-if="showIconsContainer">
                 <delete-icon
-                  @click.native="$emit('on-click-delete', index)"
+                  @click="$emit('on-click-delete', index)"
                   color="gray"
                 />
               </icons-container>
@@ -45,7 +45,7 @@
 // This is a read only table. Pass it data, and it displays it
 // ToDo: add this to storybook
 // import ViewTable from "@eturnity/eturnity_reusable_components/src/components/tables/viewTable"
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import DeleteIcon from '../../deleteIcon'
 import Spinner from '../../spinner'
 

package/src/components/threeDots/index.vue

@@ -123,7 +123,7 @@
 //         },
 //       ],
 
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import Spinner from '../spinner'
 
 const PageContainerAttrs = {

package/src/components/videoThumbnail/index.vue

@@ -1,108 +1,103 @@
 <template>
-    <wrapper :width="width" :height="height" :fit="fit">
-      <img :src="src">
-      <iconWrapper>
-        <icon
-            name="play"
-            :size="playIconSize"
-            :color="playIconColor"
-            />
-        </iconWrapper>
-    </wrapper>
-  </template>
-  
-  <script>
-    // import VideoThumbnail from "@eturnity/eturnity_reusable_components/src/components/videoThumbnail"
-    //  How to use:
-    //<videoThumbnail src="https://musicart.xboxlive.com/6/cfaf1e9d-0000-0000-0000-000000000009/504/image.jpg?w=1920&h=1080" 
-    //   playIconColor="red"
-    //   playIconSize="20px"
-    //   width="400px"
-    //   height="600px"
-    //   />
-  
-  import styled from 'vue-styled-components'
-  import Icon from '../icon'
-  
-  const wrapperAttrs = { width: String, height:String,fit:String }
-  const Wrapper = styled('div', wrapperAttrs)`
-    display: inline-block;
-    position: relative;
-    width:${props=>props.width};
-    height:${props=>props.height};
-    & img{
-        object-fit:${props=>props.fit};
-        width:${props=>props.width};
-        height:${props=>props.height};
-    }
-  `  
-  const iconWrapper = styled('div')`
-    position: absolute;
-    top:0;
-    bottom:0;
-    left:0;
-    right:0;
-    display:flex;
-    justify-content:center;
-    align-items: center;
-  `  
+  <wrapper :width="width" :height="height" :fit="fit">
+    <img :src="src" />
+    <iconWrapper>
+      <icon name="play" :size="playIconSize" :color="playIconColor" />
+    </iconWrapper>
+  </wrapper>
+</template>
+
+<script>
+// import VideoThumbnail from "@eturnity/eturnity_reusable_components/src/components/videoThumbnail"
+//  How to use:
+//<videoThumbnail src="https://musicart.xboxlive.com/6/cfaf1e9d-0000-0000-0000-000000000009/504/image.jpg?w=1920&h=1080"
+//   playIconColor="red"
+//   playIconSize="20px"
+//   width="400px"
+//   height="600px"
+//   />
+
+import styled from 'vue3-styled-components'
+import Icon from '../icon'
 
-  export default {
-    name: 'VideoThumbnail',
-    components: {
-        Wrapper,
-        Icon,
-        iconWrapper
+const wrapperAttrs = { width: String, height: String, fit: String }
+const Wrapper = styled('div', wrapperAttrs)`
+  display: inline-block;
+  position: relative;
+  width: ${(props) => props.width};
+  height: ${(props) => props.height};
+  & img {
+    object-fit: ${(props) => props.fit};
+    width: ${(props) => props.width};
+    height: ${(props) => props.height};
+  }
+`
+const iconWrapper = styled('div')`
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`
+
+export default {
+  name: 'VideoThumbnail',
+  components: {
+    Wrapper,
+    Icon,
+    iconWrapper
+  },
+  props: {
+    src: {
+      required: true
     },
-    props: {
-        src:{
-            required: true,
-        },
-        fit:{
-            required: false,
-            default: 'cover'
-        },
-        width: {
-            required: false,
-            default: '300px'
-        },
-        height: {
-            required: false,
-            default: '200px'
-        },
-        playIconSize:{
-            required: false,
-            default: '50px'
-        },
-        playIconColor:{
-            required: false,
-            default: 'blue'
-        }
+    fit: {
+      required: false,
+      default: 'cover'
     },
-    data() {
-      return {
-        isOpenByClick:false
-      }
+    width: {
+      required: false,
+      default: '300px'
     },
-    methods:{
-        clickOutside(event) {
-            if (this.openingMode!="click") return
-            if (
-                this.$refs.dropdown.$el == event.target ||
-                this.$refs.dropdown.$el.contains(event.target)
-            ) {
-                return
-            } else {
-                this.isOpenByClick=false
-            }
-        },
+    height: {
+      required: false,
+      default: '200px'
     },
-    mounted() {
-        document.addEventListener('click', this.clickOutside)
-    },
-    beforeDestroy() {
-        document.removeEventListener('click', this.clickOutside)
+    playIconSize: {
+      required: false,
+      default: '50px'
     },
+    playIconColor: {
+      required: false,
+      default: 'blue'
+    }
+  },
+  data() {
+    return {
+      isOpenByClick: false
+    }
+  },
+  methods: {
+    clickOutside(event) {
+      if (this.openingMode != 'click') return
+      if (
+        this.$refs.dropdown.$el == event.target ||
+        this.$refs.dropdown.$el.contains(event.target)
+      ) {
+        return
+      } else {
+        this.isOpenByClick = false
+      }
+    }
+  },
+  mounted() {
+    document.addEventListener('click', this.clickOutside)
+  },
+  beforeDestroy() {
+    document.removeEventListener('click', this.clickOutside)
   }
-  </script>
-  
+}
+</script>

package/src/main.js

@@ -1,13 +1,6 @@
-import Vue from "vue"
-import App from "./App.vue"
-import VueCompositionAPI from "@vue/composition-api"
-import vClickOutside from 'v-click-outside'
+import App from './App.vue'
+import { createApp } from 'vue'
 
-Vue.config.productionTip = false
+const app = createApp(App)
 
-Vue.use(VueCompositionAPI)
-Vue.use(vClickOutside)
-
-new Vue({
-  render: (h) => h(App),
-}).$mount("#app")
+app.mount('#app')

package/src/assets/svgIcons/anchor.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg height="800px" width="800px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 viewBox="0 0 204.851 204.851" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path fill="white" d="M139.518,128.595l16.834,16.336c0,0-20.644,29.877-42.725,30.473
-				c0.479,0,0.117-84.092,0.039-104.472c14.694-4.797,25.402-18.182,25.402-34.117c0-20.009-16.697-36.218-37.273-36.218
-				c-20.615,0-37.312,16.209-37.312,36.208c0,15.671,10.376,28.929,24.748,33.961l0.098,104.277
-				c-26.643-1.837-42.061-27.474-42.061-27.474l17.997-17.41L0,120.505l9.887,63.301l17.362-16.795
-				c15.036,12.105,32.017,37.244,72.876,37.244c51.332-1.309,63.184-28.939,76.344-39.804l18.993,18.514l9.389-63.907
-				L139.518,128.595z M82.558,36.208c0-10.298,8.608-18.661,19.218-18.661s19.257,8.363,19.257,18.661
-				c0,10.327-8.647,18.681-19.257,18.681S82.558,46.535,82.558,36.208z"/>
-		</g>
-	</g>
-</g>
-</svg>