@eturnity/eturnity_reusable_components 6.37.0-EPDM-8148.7 → 6.37.0-EPDM-2198.1

package/src/components/modals/modal/index.vue

@@ -3,10 +3,9 @@
     :position="position"
     :isOpen="isOpen"
     :class="{ visible: isOpen, hidden: !isOpen }"
-    @click.native="onOutsideClose()"
     :backdrop="backdrop"
   >
-    <modal-container @click.stop>
+    <modal-container @click="onClickModalContainer">
       <spinner v-if="isLoading" size="50px" :limitedToModal="true" />
       <content-container :visible="!isLoading">
         <slot />
@@ -21,10 +20,13 @@
 </template>
 
 <script>
+// Rules: (as defined in https://e-turnity.atlassian.net/browse/EPDM-9694)
+// 1. On clicking the “escape” key, close the modal onCloseModal()
+// 2. Always prevent outside close
 // import Modal from "@eturnity/eturnity_reusable_components/src/components/modals/modal"
 // This is a more flexible modal box, where the parent can decide how the body of the modal looks
 // To use:
-// <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :preventOutsideClose="true" :isLoading="true" :hideClose="true">
+// <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :isLoading="true" :hideClose="true" :stopPropagation="false">
 //   <div>Data....</div>
 // </modal>
 
@@ -83,6 +85,22 @@ const ModalContainer = styled.div`
   min-width: 100px;
   min-height: 100px;
 
+  ::-webkit-scrollbar {
+    width: 0.3em;
+    height: 100%;
+    background-color: ${(props) => props.theme.colors.grey5};
+  }
+
+  /* Make scrollbar visible when needed */
+  ::-webkit-scrollbar-thumb {
+    background-color: ${(props) => props.theme.colors.grey3};
+  }
+
+  /* Make scrollbar track visible when needed */
+  ::-webkit-scrollbar-track {
+    background-color: ${(props) => props.theme.colors.grey5};
+  }
+
   .close {
     position: absolute;
     right: 20px;
@@ -118,10 +136,6 @@ export default {
       required: true,
       default: false
     },
-    preventOutsideClose: {
-      required: false,
-      default: false
-    },
     isLoading: {
       required: false,
       default: false
@@ -137,22 +151,41 @@ export default {
     position: {
       required: false,
       default: 'fixed'
+    },
+    stopPropagation: {
+      type: Boolean,
+      default: true
     }
   },
+  beforeDestroy() {
+    window.removeEventListener('keydown', this.handleKeyDown)
+  },
   methods: {
     onCloseModal() {
       this.$emit('on-close')
     },
-    onOutsideClose() {
-      // If true, then only allow closing to come from clicking the X or wherever the onCloseModal is called
-      if (!this.preventOutsideClose) {
-        this.$emit('on-close')
+    handleKeyDown({ key }) {
+      if (key === 'Escape') {
+        this.onCloseModal()
+      }
+    },
+    onClickModalContainer(event) {
+      if (this.stopPropagation) {
+        event.stopPropagation()
       }
     }
   },
   watch: {
-    isOpen: function (newVal) {
-      document.body.style.overflow = newVal ? 'hidden' : ''
+    isOpen: {
+      immediate: true,
+      handler(isOpen) {
+        document.body.style.overflow = isOpen ? 'hidden' : ''
+        if (isOpen) {
+          window.addEventListener('keydown', this.handleKeyDown)
+        } else {
+          window.removeEventListener('keydown', this.handleKeyDown)
+        }
+      }
     }
   }
 }

package/src/components/navigationTabs/index.vue

@@ -0,0 +1,105 @@
+<template>
+  <roofTabWrap>
+    <tab
+      v-for="(tab, index) in tabsData"
+      :key="tab.id"
+      :isDisabled="!!tab['isDisabled']"
+      :textColor="tab['textColor']"
+      :active="isIndexKey ? index === activeTab : tab[tabKey] === activeTab"
+      @click="$emit('tab-click', isIndexKey ? index : tab[tabKey])"
+    >
+        <Option :isDisabled="!!tab['isDisabled']" :textColor="tab['textColor']">
+            <Uppercase>{{ tab[tabLabel] }}</Uppercase>
+            <info-text
+                v-if="tab['labelInfoText']"
+                :text="tab['labelInfoText']"
+                :alignArrow="tab['labelInfoAlign']"
+            />
+        </Option>
+    </tab>
+    <bottomLine />
+  </roofTabWrap>
+</template>
+
+<script>
+import styled from 'vue-styled-components'
+import InfoText from '../infoText'
+const TabAttr = {
+  active: Boolean,
+  isDisabled: Boolean,
+  textColor: String
+}
+
+const bottomLine = styled('div')`
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 1px;
+    width: 100%;
+    background-color: #b2b9c5;
+`
+const roofTabWrap = styled('div')`
+  display: flex;
+  align-items: center;
+  position: relative;
+  font-size: 13px;
+  font-weight: 700;
+`
+const Uppercase = styled('span')`
+  text-transform: uppercase;
+`
+const Option = styled('div',TabAttr)`
+    font-size: 13px;
+    font-weight: 700;
+    display:flex;
+    justify-content: center;
+    flex-direction: row;
+    gap: 10px;
+    color: ${props=>props.textColor ?
+        props.theme.colors[props.textColor] ? props.theme.colors[props.textColor] : props.textColor :
+        props.isDisabled ? props.theme.colors.grey2 : props.theme.colors.black};
+  `
+const Tab = styled('div', TabAttr)`
+  padding: 16px 10px;
+  margin-right: 5px;
+  position: relative;
+  top: ${(props) => (props.isDisabled ? '-1px' : '0')};
+  z-index: 10;
+  border-bottom: 2px solid
+    ${(props) => (props.active ? props.theme.colors.primary : 'transparent')};
+  background-color: ${(props) => (props.isDisabled ? props.theme.colors.grey5 : 'transparent')};
+  transition: 0.2s ease;
+  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
+  min-width: 140px;
+  display: flex !important;
+  align-items: center;
+  justify-content: space-between;
+  min-height: 55px;
+  &:hover {
+    border-color: ${(props) => props.isDisabled ? props.theme.colors.grey2 : props.theme.colors.primary};
+  }
+`
+
+export default {
+  name: 'Tabs',
+
+  components: {
+    Tab,
+    bottomLine,
+    roofTabWrap,
+    Option,
+    InfoText,
+    Uppercase
+  },
+
+  props: {
+    tabsData: { required: true },
+    activeTab: { required: true },
+    isIndexKey: { type: Boolean, default: false },
+    tabKey: { type: String, default: '' },
+    tabLabel: { type: String, default: '' }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

package/src/components/pageSubtitle/index.vue

@@ -4,11 +4,8 @@
       {{ text }}
     </span>
     <info-text
-      :text="infoText"
       v-if="!!infoText"
-      size="14px"
-      borderColor="#ccc"
-      :alignText="alignInfoText"
+      :text="infoText"
     />
   </subtitle-text>
 </template>
@@ -55,10 +52,6 @@ export default {
       required: false,
       default: null,
     },
-    alignInfoText: {
-      required: false,
-      default: "left",
-    },
     marginBottom: {
       required: false,
       default: "30px",

package/src/components/pageTitle/index.vue

@@ -1,5 +1,14 @@
 <template>
-  <title-text :color="color" :fontSize="fontSize" :uppercase="uppercase">{{ text }}</title-text>
+  <title-wrap :hasInfoText="!!infoText">
+    <title-text :color="color" :fontSize="fontSize" :uppercase="uppercase">
+      {{ text }}
+    </title-text>
+    <info-text
+      v-if="!!infoText"
+      :text="infoText"
+      :alignArrow="infoAlign"
+    />
+  </title-wrap>
 </template>
 
 <script>
@@ -10,20 +19,32 @@
 //   color="red"
 // />
 import styled from "vue-styled-components"
+import InfoText from "../infoText"
 
-const textAttrs = { color: String, fontSize: String, uppercase: Boolean }
-const TitleText = styled("div", textAttrs)`
+const wrapAttrs = { hasInfoText: Boolean }
+const TitleWrap = styled("div", wrapAttrs)`
+  display: grid;
+  align-items: center;
+  grid-gap: 12px;
+  grid-template-columns: ${(props) =>
+    props.hasInfoText ? "auto auto 1fr" : "1fr"};
+  margin-bottom: 20px;
+`
+
+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')};
   text-transform: ${(props) => (props.uppercase ? 'uppercase' : 'none')};
-  margin-bottom: 20px;
 `
 
 export default {
   name: "page-title",
   components: {
     TitleText,
+    TitleWrap,
+    InfoText
   },
   props: {
     text: {
@@ -39,6 +60,13 @@ export default {
     uppercase: {
       required: false,
       default: true
+    },
+    infoText: {
+      required: false,
+      default: null,
+    },
+    infoAlign: {
+      required: false,
     }
   },
 }

package/src/components/pagination/index.vue

@@ -1,137 +1,144 @@
 <template>
-    <!-- Check, if pages more than 1 -->
-    <paginationWrapper v-if="paginationParams.pages > 1">
-        <!-- Back button -->
-        <paginationLink
-          v-if="paginationParams.previous"
-          @click="fetchPage(paginationParams.previous)"
-        >
-        <arrowIconContainer>
-            <icon name="arrow_left" color="#1a237e" size="12px"/>
-        </arrowIconContainer>
-          <arrowText>{{ $gettext('back') }}</arrowText>
-        </paginationLink>
-  
-        <!-- First page -->
-        <paginationLink
-          v-if="currentPage > 2 && paginationParams.pages > 3"
-          @click="fetchPage(1)"
-          >1</paginationLink
-        >
-  
-        <!-- Back tree dots -->
-        <span v-if="currentPage > 3 && paginationParams.pages > 4">...</span>
-  
-        <!-- Current block -->
-        <paginationLink
-          v-for="number in paginationNumbers()"
-          :key="number"
-          :class="[currentPage === number ? 'active' : '']"
-          @click="fetchPage(number)"
-          >{{ number }}</paginationLink
-        >
-  
-        <!-- Forward tree dots -->
-        <span
-          v-if="
-            paginationParams.pages - currentPage > 2 && paginationParams.pages > 4
-          "
-          >...</span
-        >
-  
-        <!-- End page -->
-        <paginationLink
-          v-if="
-            paginationParams.pages - currentPage > 1 && paginationParams.pages > 3
-          "
-          @click="fetchPage(paginationParams.pages)"
-          >{{ paginationParams.pages }}</paginationLink
-        >
-  
-        <!-- Forward button -->
-        <paginationLink
-          v-if="paginationParams.next"
-          @click="fetchPage(paginationParams.next)"
-        >
-          <arrowText>{{ $gettext('forward') }}</arrowText>
-          <arrowIconContainer>
-            <icon name="arrow_right" color="#1a237e" size="12px" />
-        </arrowIconContainer>
-        </paginationLink>
-    </paginationWrapper>
-  </template>
-  
-  <script>
-import styled from "vue-styled-components"
-  import icon from "../icon"
-  const paginationWrapper=styled.nav`
-    color: #1a237e;
-    font-size: 13px;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    -webkit-box-pack: end;
-    -ms-flex-pack: end;
-    justify-content: flex-end;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    margin-bottom: 2px;
-    margin-top: 10px;
+  <!-- Check, if pages more than 1 -->
+  <paginationWrapper v-if="paginationParams.pages > 1">
+    <!-- Back button -->
+    <paginationLink
+      v-if="paginationParams.previous"
+      @click="fetchPage(paginationParams.previous)"
+    >
+      <arrowIconContainer>
+        <icon
+          name="arrow_left"
+          :color="getTheme.colors.brightBlue"
+          size="12px"
+        />
+      </arrowIconContainer>
+      <arrowText>{{ $gettext('back') }}</arrowText>
+    </paginationLink>
+
+    <!-- First page -->
+    <paginationLink
+      v-if="currentPage > 2 && paginationParams.pages > 3"
+      @click="fetchPage(1)"
+      >1</paginationLink
+    >
+
+    <!-- Back tree dots -->
+    <span v-if="currentPage > 3 && paginationParams.pages > 4">...</span>
+
+    <!-- Current block -->
+    <paginationLink
+      v-for="number in paginationNumbers()"
+      :key="number"
+      :class="[currentPage === number ? 'active' : '']"
+      @click="fetchPage(number)"
+      >{{ number }}</paginationLink
+    >
+
+    <!-- Forward tree dots -->
+    <span
+      v-if="
+        paginationParams.pages - currentPage > 2 && paginationParams.pages > 4
+      "
+      >...</span
+    >
+
+    <!-- End page -->
+    <paginationLink
+      v-if="
+        paginationParams.pages - currentPage > 1 && paginationParams.pages > 3
+      "
+      @click="fetchPage(paginationParams.pages)"
+      >{{ paginationParams.pages }}</paginationLink
+    >
+
+    <!-- Forward button -->
+    <paginationLink
+      v-if="paginationParams.next"
+      @click="fetchPage(paginationParams.next)"
+    >
+      <arrowText>{{ $gettext('forward') }}</arrowText>
+      <arrowIconContainer>
+        <icon
+          name="arrow_right"
+          :color="getTheme.colors.brightBlue"
+          size="12px"
+        />
+      </arrowIconContainer>
+    </paginationLink>
+  </paginationWrapper>
+</template>
+
+<script>
+import styled from 'vue-styled-components'
+import icon from '../icon'
+import theme from '@/assets/theme.js'
+
+const paginationWrapper = styled.nav`
+  color: ${(props) => props.theme.brightBlue};
+  font-size: 13px;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  align-items: center;
+  margin-bottom: 2px;
+  margin-top: 10px;
 `
- const paginationLink=styled.div`
-    display: flex;
-    padding: 0px 5px;
-    margin: 0 2px;
-    text-align: center;
-    border-radius: 3px;
-    white-space: nowrap;
-    cursor: pointer;
+const paginationLink = styled.div`
+  display: flex;
+  padding: 0px 5px;
+  margin: 0 2px;
+  text-align: center;
+  border-radius: 3px;
+  white-space: nowrap;
+  cursor: pointer;
 
-    &.active{
-        color: #fff;
-        background-color: #5c67ac;
-        padding: 7px 12px;
-        border-radius: 4px;
+  &.active {
+    color: #fff;
+    background-color: ${(props) => props.theme.brightBlue};
+    padding: 7px 12px;
+    border-radius: 4px;
+  }
+`
+const arrowText = styled.div``
+const arrowIconContainer = styled.div`
+  margin: 0 10px;
+  display: flex;
+  align-items: center;
+`
+export default {
+  name: 'pagination-component',
+  components: {
+    paginationWrapper,
+    paginationLink,
+    icon,
+    arrowText,
+    arrowIconContainer
+  },
+  props: ['fetchPage', 'currentPage', 'paginationParams'],
+  computed: {
+    getTheme() {
+      return theme
     }
-    `
-    const arrowText=styled.div``
-    const arrowIconContainer=styled.div`
-    margin:0 10px;
-    display:flex;
-    align-items: center;
-    `
-  export default {
-    name: 'pagination-component',
-    components:{
-        paginationWrapper,
-        paginationLink,
-        icon,
-        arrowText,
-        arrowIconContainer
+  },
+  methods: {
+    getNewProjects(num) {
+      this.$emit('on-pagination-change', num)
     },
-    props: ["fetchPage","currentPage","paginationParams"],
-    methods: {
-      getNewProjects(num) {
-        this.$emit('on-pagination-change', num)
-      },
-      paginationNumbers() {
-        const prev = this.paginationParams.previous
-        const next = this.paginationParams.next
-        const n = prev + 1 || next - 1
-        if (this.paginationParams.pages === 2) {
-          return prev ? [n - 1, n] : [n, n + 1]
-        } else {
-          return prev
-            ? next
-              ? [n - 1, n, n + 1]
-              : [n - 2, n - 1, n]
-            : [n, n + 1, n + 2]
-        }
+    paginationNumbers() {
+      const prev = this.paginationParams.previous
+      const next = this.paginationParams.next
+      const n = prev + 1 || next - 1
+      if (this.paginationParams.pages === 2) {
+        return prev ? [n - 1, n] : [n, n + 1]
+      } else {
+        return prev
+          ? next
+            ? [n - 1, n, n + 1]
+            : [n - 2, n - 1, n]
+          : [n, n + 1, n + 2]
       }
     }
   }
-  </script>
-  
+}
+</script>