@eturnity/eturnity_reusable_components 7.18.0--EPDM-5518.4 → 7.18.0--EPDM-10564.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.18.0--EPDM-5518.4",
+  "version": "7.18.0--EPDM-10564.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/components/filter/filterSettings.vue

@@ -261,12 +261,6 @@
         :text="buttonText.cancel"
         @click.native="$emit('on-cancel-view')"
       />
-      <reset-container v-if="!filterViews || !filterViews.length">
-        <reset-button @click="$emit('on-reset-filters')">
-          <icon :name="'update'" size="14px" :color="theme.colors.blue" />
-          <div>{{ $gettext('reset_filters') }}</div>
-        </reset-button>
-      </reset-container>
     </button-container>
   </container-wrapper>
 </template>
@@ -334,16 +328,6 @@ const ButtonContainer = styled.div`
   padding: 15px;
 `
 
-const ResetContainer = styled.div`
-  display: grid;
-  align-content: center;
-  margin-left: auto;
-  div {
-    margin-top: 0;
-    align-self: center;
-  }
-`
-
 const ColumnContainer = styled.div``
 
 const DragContainer = styled.div`
@@ -509,8 +493,7 @@ export default {
     ViewContainer,
     DeleteIcon,
     UpperContainer,
-    ResetButton,
-    ResetContainer
+    ResetButton
   },
   props: {
     filterData: {

package/src/components/infoText/index.vue

@@ -26,7 +26,7 @@
 //To use:
 // <info-text
 //     text="Veritatis et quasi architecto beatae vitae"
-//     size="20"
+//     size="20px"
 //     alignArrow="right" // which side the arrow should be on
 // />
 import theme from '../../assets/theme.js'

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

@@ -3,11 +3,10 @@
     <container
       :checkColor="checkColor"
       :size="size"
-      :hasLabel="label && !!label.length"
+      :hasLabel="!!label.length"
       :backgroundColor="backgroundColor"
       :isChecked="isChecked"
       :isDisabled="isDisabled"
-      :cursorType="cursorType"
     >
       <input-checkbox
         type="checkbox"
@@ -18,7 +17,7 @@
       <div>
         <span class="checkmark"></span>
       </div>
-      <label-text v-if="label && !!label.length">{{ label }}</label-text>
+      <label-text v-if="!!label.length">{{ label }}</label-text>
     </container>
   </component-wrapper>
 </template>
@@ -34,7 +33,6 @@
 //     size="small"
 //     backgroundColor="red"
 //     :isDisabled="true"
-//     cursorType="default"
 // />
 import styled from 'vue-styled-components'
 
@@ -48,8 +46,7 @@ const containerAttrs = {
   hasLabel: Boolean,
   backgroundColor: String,
   isChecked: Boolean,
-  isDisabled: Boolean,
-  cursorType: String
+  isDisabled: Boolean
 }
 const Container = styled('label', containerAttrs)`
   display: grid;
@@ -58,7 +55,7 @@ const Container = styled('label', containerAttrs)`
   align-content: center;
   color: ${(props) => props.theme.colors.black};
   position: relative;
-  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : props.cursorType)};
+  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
   font-size: 16px;
   user-select: none;
 
@@ -83,7 +80,7 @@ const Container = styled('label', containerAttrs)`
           : props.theme.colors.green
         : props.isDisabled
         ? props.theme.colors.lightGray
-        : props.theme.colors.white};
+        : '#fff'};
     border-radius: 4px;
     border: 1px solid
       ${(props) =>
@@ -176,10 +173,6 @@ export default {
     dataId: {
       type: String,
       default: ''
-    },
-    cursorType: {
-      type: String,
-      default: 'pointer'
     }
   },
   methods: {

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

@@ -469,7 +469,7 @@ export default {
     }
   },
   methods: {
-    onEnterPress() {
+    onEnterPress(){
       this.$emit('on-enter-click')
       this.$refs.inputField1.$el.blur()
     },

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

@@ -328,7 +328,7 @@ export default {
     }
   },
   methods: {
-    onEnterPress() {
+    onEnterPress(event){
       this.$emit('on-enter-click')
       this.$refs.inputElement.$el.blur()
     },

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

@@ -1,18 +1,16 @@
 <template>
   <Container
     :selectWidth="selectWidth"
+    :noRelative="noRelative"
     @mouseenter="mouseEnterHandler"
     @mouseleave="mouseLeaveHandler"
   >
     <input-wrapper
       :hasLabel="!!label && label.length > 0"
       :alignItems="alignItems"
+      :noRelative="noRelative"
     >
-      <label-wrapper
-        v-if="label"
-        :data-id="labelDataId"
-        :shownDropdown="shownDropdown"
-      >
+      <label-wrapper v-if="label" :data-id="labelDataId">
         <input-label
           :fontColor="
             labelFontColor || colorMode == 'dark' ? 'white' : 'eturnityGrey'
@@ -49,7 +47,9 @@
           :showBorder="showBorder"
           :data-id="dataId"
           :paddingLeft="paddingLeft"
-          :shownDropdown="shownDropdown"
+          :tablePaddingLeft="tablePaddingLeft"
+          :noRelative="noRelative"
+          :showDisabledBackground="showDisabledBackground"
         >
           <draggableInputHandle
             v-if="isDraggable && !isSearchBarVisible"
@@ -73,14 +73,13 @@
           />
           <selector
             v-else
+            :showBorder="showBorder"
             :selectWidth="selectWidth"
             :paddingLeft="paddingLeft"
-            :noMaxWidth="noMaxWidth"
-            :showBorder="showBorder"
           >
             <slot name="selector" :selectedValue="selectedValue"></slot>
           </selector>
-          <Caret @click.stop="toggleCaretDropdown">
+          <Caret @click.stop="toggleCaretDropdown" class="caret_dropdown">
             <icon
               v-if="isDropdownOpen"
               name="arrow_up"
@@ -103,7 +102,7 @@
             />
           </Caret>
         </selectButton>
-        <DropdownWrapper>
+        <DropdownWrapper :noRelative="noRelative">
           <selectDropdown
             ref="dropdown"
             v-show="isDropdownOpen"
@@ -116,7 +115,9 @@
             :fontColor="
               dropdownFontColor || colorMode == 'dark' ? 'white' : 'black'
             "
+            :noRelative="noRelative"
             :selectedValue="selectedValue"
+            :minWidth="minWidth"
             @option-selected="optionSelected"
             @option-hovered="optionHovered"
             @mouseleave="optionLeave"
@@ -175,17 +176,22 @@ const Caret = styled.div`
 const selectorProps = {
   selectWidth: String,
   paddingLeft: String,
-  showBorder: Boolean,
-  noMaxWidth: Boolean
+  showBorder: Boolean
 }
 const Selector = styled('div', selectorProps)`
-  max-width: ${(props) =>
-    props.noMaxWidth
-      ? '100%'
-      : `calc(${props.selectWidth} - (${CARET_WIDTH} + ${props.paddingLeft} + (${BORDER_WIDTH} * 2)))`};
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
+  ${(props) =>
+    props.selectWidth === '100%'
+      ? 'width: 100%;'
+      : `width: calc(${props.selectWidth} -
+      (
+        ${CARET_WIDTH} +
+        ${props.paddingLeft}
+        ${props.showBorder ? `+ (${BORDER_WIDTH} * 2)` : ''}
+      )
+    );
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;`}
 `
 
 const labelAttrs = { fontSize: String, fontColor: String }
@@ -200,18 +206,20 @@ const InputLabel = styled('div', labelAttrs)`
 const optionalLabel = styled.span`
   font-weight: 300;
 `
-const inputProps = { selectWidth: String, optionWidth: String }
+const inputProps = {
+  selectWidth: String,
+  optionWidth: String,
+  noRelative: Boolean
+}
 const Container = styled('div', inputProps)`
   width: ${(props) => props.selectWidth};
-  position: relative;
+  position: ${(props) => (props.noRelative ? 'static' : 'relative')};
   display: inline-block;
 `
-
-const LabelAttrs = { shownDropdown: Boolean }
-const LabelWrapper = styled('div', LabelAttrs)`
+const LabelWrapper = styled.div`
   display: inline-grid;
   grid-template-columns: auto auto;
-  grid-gap: ${(props) => (props.shownDropdown ? '0' : '12px')};
+  grid-gap: 12px;
   align-items: center;
   justify-content: start;
 `
@@ -234,16 +242,20 @@ const selectButtonAttrs = {
   isSearchBarVisible: Boolean,
   showBorder: Boolean,
   paddingLeft: String,
-  shownDropdown: Boolean
+  noRelative: Boolean,
+  tablePaddingLeft: String,
+  showDisabledBackground: Boolean
 }
 const selectButton = styled('div', selectButtonAttrs)`
-  position: relative;
+  position: ${(props) => (props.noRelative ? 'static' : 'relative')};
   box-sizing: border-box;
   border-radius: 4px;
   ${(props) =>
     props.isSearchBarVisible
       ? ''
-      : `padding-left: ${props.shownDropdown ? '0' : props.paddingLeft}`};
+      : `padding-left: ${
+          props.tablePaddingLeft ? props.tablePaddingLeft : props.paddingLeft
+        }`};
   text-align: left;
   min-height: ${(props) =>
     props.selectHeight
@@ -264,7 +276,7 @@ const selectButton = styled('div', selectButtonAttrs)`
     }
   `}
   background-color:${(props) =>
-    props.disabled
+    props.disabled && props.showDisabledBackground
       ? props.theme.colors.grey5
       : props.theme.colors[props.bgColor]
       ? props.theme.colors[props.bgColor]
@@ -288,13 +300,15 @@ const selectDropdownAttrs = {
   optionWidth: String,
   hoveredIndex: Number,
   hoveredValue: Number | String,
-  selectedValue: Number | String
+  selectedValue: Number | String,
+  noRelative: Boolean,
+  minWidth: String
 }
 const selectDropdown = styled('div', selectDropdownAttrs)`
   box-sizing: border-box;
   z-index: ${(props) => (props.isActive ? '2' : '1')};
   position: absolute;
-  top: 5px;
+  top: ${(props) => (props.noRelative ? 'auto' : '5px')};
   border: ${BORDER_WIDTH} solid ${(props) => props.theme.colors.grey4};
   border-radius: 4px;
   display: flex;
@@ -303,6 +317,7 @@ const selectDropdown = styled('div', selectDropdownAttrs)`
   padding: 0px;
   box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
   width: ${(props) => (props.optionWidth ? props.optionWidth : '100%')};
+  min-width: ${(props) => (props.minWidth ? props.minWidth : '100%')};
   background-color: ${(props) =>
     props.theme.colors[props.bgColor]
       ? props.theme.colors[props.bgColor]
@@ -320,12 +335,17 @@ const selectDropdown = styled('div', selectDropdownAttrs)`
         : props.hoveredBgColor};
   }
 `
-const DropdownWrapper = styled('div')`
-  position: relative;
+const DropdownAttrs = { noRelative: Boolean }
+const DropdownWrapper = styled('div', DropdownAttrs)`
+  position: ${(props) => (props.noRelative ? 'static' : 'relative')};
 `
-const inputAttrs = { alignItems: String, hasLabel: Boolean }
+const inputAttrs = {
+  alignItems: String,
+  hasLabel: Boolean,
+  noRelative: Boolean
+}
 const InputWrapper = styled('div', inputAttrs)`
-  position: relative;
+  position: ${(props) => (props.noRelative ? 'static' : 'relative')};
   display: grid;
   align-items: center;
   gap: 8px;
@@ -344,6 +364,10 @@ export default {
       required: false,
       default: '13px'
     },
+    noRelative: {
+      required: false,
+      default: false
+    },
     label: {
       required: false
     },
@@ -376,6 +400,9 @@ export default {
       required: false,
       default: '36px'
     },
+    minWidth: {
+      required: false
+    },
     optionWidth: {
       required: false,
       default: null
@@ -447,13 +474,12 @@ export default {
       type: Boolean,
       default: false
     },
-    noMaxWidth: {
-      type: Boolean,
-      default: false
+    tablePaddingLeft: {
+      required: false
     },
-    shownDropdown: {
-      type: Boolean,
-      default: false
+    showDisabledBackground: {
+      required: false,
+      default: true
     }
   },
 
@@ -543,20 +569,13 @@ export default {
     searchChange(value) {
       this.textSearch = value
       this.$emit('search-change', value)
-      const children =
-        this.$refs.dropdown.$children &&
-        this.$refs.dropdown.$children[0] &&
-        this.$refs.dropdown.$children.length === 1 &&
-        this.$refs.dropdown.$children[0].$children.length
-          ? this.$refs.dropdown.$children[0].$children
-          : this.$refs.dropdown.$children
-      children
+      this.$refs.dropdown.$children
         .map((component) => component.$el)
         .forEach((el) => {
           if (!el.textContent.toLowerCase().includes(value.toLowerCase())) {
             el.style.display = 'none'
           } else {
-            el.style.display = 'grid'
+            el.style.display = 'inherit'
           }
         })
     },

package/src/components/inputs/select/option/index.vue

@@ -14,6 +14,7 @@
     :isDisabled="isDisabled"
     :backgroundColor="colorMode == 'dark' ? '#000000' : backgroundColor"
     :title="hoverText"
+    :minWidth="minWidth"
   >
     <slot></slot>
   </optionContainer>
@@ -27,7 +28,8 @@ const optionProps = {
   isDisabled: Boolean,
   hoveredBgColor: String,
   cursorType: String,
-  backgroundColor: String
+  backgroundColor: String,
+  minWidth: String
 }
 const optionContainer = styled('div', optionProps)`
   display: flex;
@@ -37,7 +39,8 @@ const optionContainer = styled('div', optionProps)`
   align-items: center;
   padding: 12px 10px;
   gap: 14px;
-  width: 100%;
+  width: max-content;
+  min-width: ${(props) => (props.minWidth ? props.minWidth : '100%')};
   background-color: ${(props) =>
     props.theme.colors[props.backgroundColor]
       ? props.theme.colors[props.backgroundColor]
@@ -85,6 +88,9 @@ export default {
     isDisabled: {
       required: false,
       default: false
+    },
+    minWidth: {
+      required: false
     }
   },
 

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

@@ -49,7 +49,7 @@
 //     label="Question 5"
 //     alignItems="horizontal" // horizontal, vertical
 //     :isDisabled="true"
-//     fontSize="13px"
+// .   fontSize="13px"
 // />
 import styled from 'vue-styled-components'
 import InfoText from '../../infoText'

package/src/components/markerItem/index.vue

@@ -29,11 +29,6 @@
 
 import styled from 'vue-styled-components'
 import Icon from '../icon'
-import Modal from '../modals/modal'
-import PageTitle from '../pageTitle'
-import DeleteIcon from '../deleteIcon'
-import PageSubtitle from '../pageSubtitle'
-import MainButton from '../buttons/mainButton'
 
 const PageContainer = styled.div`
   display: flex;
@@ -65,11 +60,6 @@ const MarkerContainer = styled('div', MarkerAttrs)`
   cursor: ${(props) => (props.isEditionAllowed ? 'pointer' : props.cursor)};
 `
 
-// const IconContainer = styled.div`
-//   padding: 8px;
-//   line-height: 0;
-// `
-
 export default {
   name: 'project-marker',
   components: {

package/src/components/pageTitle/index.vue

@@ -3,11 +3,7 @@
     <title-text :color="color" :fontSize="fontSize" :uppercase="uppercase">
       {{ text }}
     </title-text>
-    <info-text
-      v-if="!!infoText"
-      :text="infoText"
-      :alignArrow="infoAlign"
-    />
+    <info-text v-if="!!infoText" :text="infoText" :alignArrow="infoAlign" />
   </title-wrap>
 </template>
 
@@ -18,16 +14,16 @@
 //   text="My Page Title"
 //   color="red"
 // />
-import styled from "vue-styled-components"
-import InfoText from "../infoText"
+import styled from 'vue-styled-components'
+import InfoText from '../infoText'
 
 const wrapAttrs = { hasInfoText: Boolean }
-const TitleWrap = styled("div", wrapAttrs)`
+const TitleWrap = styled('div', wrapAttrs)`
   display: grid;
   align-items: center;
   grid-gap: 12px;
   grid-template-columns: ${(props) =>
-    props.hasInfoText ? "auto auto 1fr" : "1fr"};
+    props.hasInfoText ? 'auto auto 1fr' : '1fr'};
   margin-bottom: 20px;
 `
 
@@ -35,12 +31,12 @@ const titleAttrs = { color: String, fontSize: String, uppercase: Boolean }
 const TitleText = styled('span', titleAttrs)`
   color: ${(props) => (props.color ? props.color : props.theme.colors.black)};
   font-weight: bold;
-  font-size: ${(props) => (props.fontSize ? props.fontSize : '16px')};
+  font-size: ${(props) => (props.fontSize ? props.fontSize : '18px')};
   text-transform: ${(props) => (props.uppercase ? 'uppercase' : 'none')};
 `
 
 export default {
-  name: "page-title",
+  name: 'page-title',
   components: {
     TitleText,
     TitleWrap,
@@ -48,14 +44,13 @@ export default {
   },
   props: {
     text: {
-      required: true,
+      required: true
     },
     color: {
-      required: false,
+      required: false
     },
     fontSize: {
-      required: false,
-      default: '16px'
+      required: false
     },
     uppercase: {
       required: false,
@@ -63,11 +58,11 @@ export default {
     },
     infoText: {
       required: false,
-      default: null,
+      default: null
     },
     infoAlign: {
-      required: false,
+      required: false
     }
-  },
+  }
 }
 </script>

package/src/components/pagination/index.vue

@@ -81,6 +81,8 @@ const paginationWrapper = styled.nav`
   flex-wrap: wrap;
   justify-content: flex-end;
   align-items: center;
+  margin-bottom: 2px;
+  margin-top: 10px;
 `
 const paginationLink = styled.div`
   display: flex;
@@ -90,18 +92,15 @@ const paginationLink = styled.div`
   border-radius: 3px;
   white-space: nowrap;
   cursor: pointer;
-  color: ${(props) => props.theme.colors.brightBlue};
 
   &.active {
-    color: ${(props) => props.theme.colors.white};
-    background-color: ${(props) => props.theme.colors.brightBlue};
+    color: #fff;
+    background-color: ${(props) => props.theme.brightBlue};
     padding: 7px 12px;
     border-radius: 4px;
   }
 `
-const arrowText = styled.div`
-  color: ${(props) => props.theme.colors.brightBlue};
-`
+const arrowText = styled.div``
 const arrowIconContainer = styled.div`
   margin: 0 10px;
   display: flex;

package/src/components/projectMarker/index.vue

@@ -65,7 +65,7 @@
 </template>
 
 <script>
-// import ProjectMarker from "@eturnity/eturnity_reusable_components/src/components/projectMarker"
+// import ThreeDots from "@eturnity/eturnity_reusable_components/src/components/projectMarker"
 // To use:
 // <project-marker
 //   :activeLanguage="'en-us'"

package/src/assets/svgIcons/clock_full.svg

@@ -1,3 +0,0 @@
-<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5 10C7.76142 10 10 7.76142 10 5C10 2.23858 7.76142 0 5 0C2.23858 0 0 2.23858 0 5C0 7.76142 2.23858 10 5 10ZM5.875 5.05243V2.125H4.125V5.92743L6.19061 7.47663L7.24061 6.07663L5.875 5.05243Z" fill="white"/>
-</svg>

package/src/components/selectedOptions/index.vue

@@ -1,145 +0,0 @@
-<template>
-  <page-container>
-    <box-container>
-      <selected-container
-        >{{ numberSelected }} {{ $gettext('selected') }}</selected-container
-      >
-      <list-container v-if="optionsList.length">
-        <list-item
-          v-for="item in optionsList"
-          :key="item.type"
-          :hoverColor="item.hoverColor"
-          @click="$emit('on-' + item.type)"
-        >
-          {{ item.name }}
-        </list-item>
-      </list-container>
-      <empty-text v-if="!optionsList.length">
-        {{ $gettext('no_batch_actions_available') }}
-      </empty-text>
-      <icon-container @click="$emit('on-close')">
-        <icon
-          name="close_for_modals,_tool_tips"
-          color="white"
-          size="14px"
-          cursor="pointer"
-        />
-      </icon-container>
-    </box-container>
-  </page-container>
-</template>
-
-<script>
-// import SelectedOptions from "@eturnity/eturnity_reusable_components/src/components/selectedOptions"
-// optionsList = [
-//   {
-//     type: 'export',
-//     name: 'Export'
-//   },
-//   {
-//     type: 'delete',
-//     name: 'Delete',
-//     hoverColor: 'red' // default is green
-//   }
-// ]
-// @on-${type}="function" should $emit the callback for the 'type' in the optionsList
-// <selected-options
-//   :numberSelected="numberSelected"
-//   :optionsList="optionsList"
-//   @on-close="onCloseFunction()"
-//   @on-export="function()" @on-delete="function()"
-// />
-import styled from 'vue-styled-components'
-import Icon from '../icon'
-
-const PageContainer = styled.div`
-  position: fixed;
-  bottom: 30px;
-  left: 50%;
-  transform: translateX(-50%);
-`
-
-const SelectedContainer = styled.div`
-  display: grid;
-  align-items: center;
-  height: 100%;
-  padding-right: 20px;
-  border-right: 1px solid rgba(255, 255, 255, 0.2);
-`
-
-const BoxContainer = styled.div`
-  display: flex;
-  align-items: center;
-  background-color: ${(props) => props.theme.colors.black};
-  opacity: 90%;
-  color: ${(props) => props.theme.colors.white};
-  border-radius: 4px;
-  padding: 8px 10px 8px 20px;
-  font-size: 14px;
-  height: 40px;
-`
-
-const ListContainer = styled.div`
-  padding: 0 20px;
-  display: flex;
-  gap: 20px;
-  color: ${(props) => props.theme.colors.white};
-`
-
-const ListAttrs = {
-  hoverColor: String
-}
-const ListItem = styled('div', ListAttrs)`
-  cursor: pointer;
-  &:hover {
-    color: ${(props) =>
-      props.hoverColor
-        ? props.theme.colors[props.hoverColor]
-        : props.theme.colors.green};
-  }
-`
-
-const IconContainer = styled.div`
-  display: grid;
-  align-items: center;
-  justify-items: center;
-  height: 30px;
-  width: 30px;
-  cursor: pointer;
-  margin-left: 20px;
-
-  &:hover {
-    background: rgba(255, 255, 255, 0.1);
-    border-radius: 4px;
-  }
-`
-
-const EmptyText = styled.div`
-  color: ${(props) => props.theme.colors.white};
-  font-size: 13px;
-  padding-left: 16px;
-`
-
-export default {
-  name: 'selected-options',
-  components: {
-    PageContainer,
-    BoxContainer,
-    SelectedContainer,
-    ListContainer,
-    ListItem,
-    Icon,
-    IconContainer,
-    EmptyText
-  },
-  props: {
-    optionsList: {
-      required: true
-    },
-    numberSelected: {
-      required: true,
-      default: 0
-    }
-  }
-}
-</script>