@eturnity/eturnity_reusable_components 6.37.0-EPDM-8148.3 → 6.37.0-EPDM-8148.5

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

@@ -1,9 +1,15 @@
 <template>
-  <page-container>
+  <page-container
+    :tableHeight="tableHeight"
+    :shouldSetCustomHeight="doesTableContainDraggables"
+  >
     <table-title v-if="titleText">
       {{ titleText }}
     </table-title>
-    <table-scroll>
+    <table-scroll
+      ref="tableRef"
+      :isPositionAbsolute="doesTableContainDraggables"
+    >
       <table-wrapper :fullWidth="fullWidth">
         <spinner-wrapper v-if="isLoading">
           <spinner />
@@ -26,7 +32,15 @@
 import styled from 'vue-styled-components'
 import Spinner from '../../spinner'
 
-const PageContainer = styled.div``
+const pageContainerProps = {
+  tableHeight: String,
+  shouldSetCustomHeight: Boolean
+}
+const PageContainer = styled('div', pageContainerProps)`
+  position: relative;
+  height: ${(props) =>
+    props.shouldSetCustomHeight ? props.tableHeight : 'auto'};
+`
 
 const TableTitle = styled.div`
   margin-bottom: 16px;
@@ -35,15 +49,27 @@ const TableTitle = styled.div`
   text-transform: uppercase;
 `
 
-const TableScroll = styled.div`
+const tableScrollProps = {
+  isPositionAbsolute: Boolean
+}
+
+const TableScroll = styled('div', tableScrollProps)`
   max-width: 100%;
+  height: auto;
+  ${(props) =>
+    props.isPositionAbsolute &&
+    `
+    position: absolute;
+    left: -20px;
+  `}
 `
 
 const wrapperAttrs = { fullWidth: Boolean }
 const TableWrapper = styled('div', wrapperAttrs)`
   width: ${(props) => (props.fullWidth ? '100%' : 'fit-content')};
   max-width: 100%;
-  overflow: auto;
+  overflow-x: auto;
+  overflow-y: hidden;
 
   ::-webkit-scrollbar {
     height: 5px; //height of the whole scrollbar area
@@ -67,7 +93,11 @@ const SpinnerWrapper = styled.div`
   justify-items: center;
 `
 
-const containerAttrs = { cellPaddings: String, tableCursor: String }
+const containerAttrs = {
+  cellPaddings: String,
+  tableCursor: String
+}
+
 const TableContainer = styled('table', containerAttrs)`
   width: 100%;
   border-collapse: collapse;
@@ -378,6 +408,39 @@ export default {
     tableCursor: {
       required: false
     }
+  },
+  data() {
+    return {
+      tableHeight: 'auto',
+      doesTableContainDraggables: false
+    }
+  },
+  mounted() {
+    this.observeTableHeight()
+  },
+  beforeDestroy() {
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect()
+    }
+  },
+  methods: {
+    observeTableHeight() {
+      if (!this.$refs.tableRef) return
+
+      const tableElement = this.$refs.tableRef.$el
+
+      this.resizeObserver = new ResizeObserver(() => {
+        const newTableHeight = this.titleText
+          ? tableElement.offsetHeight + 33
+          : tableElement.offsetHeight
+        this.tableHeight = `${newTableHeight}px`
+        this.doesTableContainDraggables = Boolean(
+          tableElement.querySelector('.drag-container')
+        )
+      })
+
+      this.resizeObserver.observe(tableElement)
+    }
   }
 }
 </script>

package/src/components/threeDots/index.vue

@@ -8,8 +8,6 @@
     <dropdown-container
       v-if="isOpen"
       @click.stop
-      :top="getItemLocation('top')"
-      :right="getItemLocation('right')"
       :containerWidth="childOpen ? 440 : 240"
       ref="dropdownContainer"
     >
@@ -130,6 +128,7 @@ const PageContainer = styled.div`
   justify-items: center;
   width: 30px;
   height: 30px;
+  position: relative;
 
   &:hover {
     background-color: ${(props) => props.theme.colors.grey5};
@@ -158,12 +157,15 @@ const DotItem = styled.div`
   border-radius: 50%;
 `
 
-const dropdownAttrs = { top: Number, right: Number, containerWidth: Number }
+const dropdownAttrs = {
+  containerWidth: Number
+}
 const DropdownContainer = styled('div', dropdownAttrs)`
   z-index: 99;
   height: 200px;
-  top: ${(props) => props.top + 'px'};
-  left: ${(props) => props.right - props.containerWidth + 'px'};
+  top: 0;
+  right: 27px;
+
   position: absolute;
   display: grid;
   grid-template-columns: auto auto;
@@ -299,14 +301,6 @@ export default {
         document.removeEventListener('click', this.clickOutside)
       }
     },
-    getItemLocation(value) {
-      let ref = this.$refs.dropdownItem
-      let location = ref.$el.getBoundingClientRect()[value]
-      if (value === 'top') {
-        location = location + window.scrollY
-      }
-      return location
-    },
     hasChildren(item) {
       return !!item.children && !!item.children.length
     },

package/src/helpers/numberConverter.js

@@ -1,12 +1,11 @@
+import { langForLocaleString } from './translateLang'
+
 export const stringToNumber = ({
-  value,
+  value = '',
   numberPrecision = false,
-  allowNegative
+  allowNegative = false
 }) => {
   // This is for saving. It converts our input string to a readable number
-  if (value === undefined) {
-    value = ''
-  }
   let newVal = value.toString()
   const selectedLang = localStorage.getItem('lang')
   // The first replace will replace not allowed characters with a blank
@@ -94,16 +93,8 @@ export const stringToNumber = ({
 
 export const numberToString = ({ value, numberPrecision, minDecimals }) => {
   const minimumRounding = minDecimals ? minDecimals : 0
-  let selectedLang = localStorage.getItem('lang')
-    ? localStorage.getItem('lang') === 'fr-lu'
-      ? 'fr-fr'
-      : localStorage.getItem('lang')
-    : 'en-US'
-  if (selectedLang == 'null') {
-    selectedLang = 'en-US'
-  }
   value = parseFloat(value)
-  return value.toLocaleString(selectedLang, {
+  return value.toLocaleString(langForLocaleString(), {
     minimumFractionDigits: minimumRounding, // removing this for now. Why do we need this to be a minimum amount?
     maximumFractionDigits: numberPrecision
   })

package/src/helpers/translateLang.js

@@ -70,12 +70,15 @@ export const datePickerLang = (lang) => {
     return 'fr'
   } else if (lang === 'it-it' || lang === 'it-ch') {
     return 'it'
+  } else if (lang === 'en-us' || lang === 'en-gb') {
+    return 'en'
   } else {
     return lang
   }
 }
 
 export const tinyLanguage = (lang) => {
+  // the function is used to pass correct language to Tiny MCE text editor https://www.tiny.cloud/docs/tinymce/6/ui-localization/#language
   if (
     lang === 'de' ||
     lang === 'de-de' ||
@@ -104,3 +107,14 @@ export const tinyLanguage = (lang) => {
     return langCode
   }
 }
+
+export const langForLocaleString = () => {
+  const selectedLang = localStorage.getItem('lang')
+      ? localStorage.getItem('lang') === 'fr-lu'
+          ? 'fr-fr'
+          : localStorage.getItem('lang') === 'fr-ch'
+              ? 'de-ch'
+              : localStorage.getItem('lang')
+      : 'en-US'
+  return selectedLang !== 'null' ? selectedLang : 'en-US'
+}