@eturnity/eturnity_reusable_components 7.4.4-EPDM-7260.28 → 7.4.4-EPDM-7260.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.4.4-EPDM-7260.28",
+  "version": "7.4.4-EPDM-7260.29",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/components/rangeSlider/Slider.vue

@@ -58,7 +58,7 @@ let eventsFor = events.mouse
 
 export default {
   replace: true,
-  name: 'slider',
+  name: 'SliderComponent',
   props: {
     dataId: {
       type: String,

package/src/components/rangeSlider/index.vue

@@ -36,29 +36,19 @@
                 :stepCount="stepCount"
                 :subStepCount="subStepCount"
                 @dragStop="
-                  onChange(
-                    'drag',
-                    {
-                      itemId: bar.id,
-                      parentId: bar.parentId,
-                      entityId: label.id,
-                      ...$event
-                    },
-                    label.id,
-                    label.selectedTariffs
-                  )
+                  onChange('drag', {
+                    itemId: bar.id,
+                    parentId: bar.parentId,
+                    entityId: label.id,
+                    ...$event
+                  })
                 "
                 @resizeStop="
-                  onChange(
-                    'resize',
-                    {
-                      itemId: bar.id,
-                      entityId: label.id,
-                      ...$event
-                    },
-                    label.id,
-                    label.selectedTariffs
-                  )
+                  onChange('resize', {
+                    itemId: bar.id,
+                    entityId: label.id,
+                    ...$event
+                  })
                 "
                 @click.native.stop="
                   onBarTariffClick({ item: bar, type: 'delete', label })
@@ -372,21 +362,8 @@ export default {
     }
   },
   methods: {
-    onChange(type, value, entityId, tariffs) {
+    onChange(type, value) {
       this.$emit(type, value)
-
-      this.hasOverlap = this.checkOverlap(value, tariffs)
-
-      if (this.hasOverlap) {
-        const existing = this.OverlapId.find((id) => id === entityId)
-
-        if (!existing) this.OverlapId.push(entityId)
-      } else
-        this.OverlapId = this.OverlapId
-          ? this.OverlapId.filter((id) => id !== entityId)
-          : []
-
-      this.$emit('has-overlap', this.hasOverlap)
     },
     checkOverlap(value, tariffs) {
       // Check if the tariffs overlap
@@ -446,10 +423,6 @@ export default {
 
       this.activeLabel = label
       this.barOptionsType = type
-      this.hasOverlap = this.checkOverlap(
-        item,
-        this.activeLabel.selectedTariffs
-      )
       this.showBarOptions = false
     },
     setBarOptions(bar) {
@@ -522,23 +495,21 @@ export default {
                 label.selectedTariffs
               )
 
-              overlapContainer.push(hasOverlap)
-
-              if (hasOverlap) {
-                const existing = this.OverlapId.find((id) => id === label.id)
-
-                if (!existing) this.OverlapId.push(label.id)
-              }
+              if (hasOverlap) overlapContainer.push(label.id)
             })
           })
         }
 
-        if (!overlapContainer.includes(true)) {
+        const hasOverlap = overlapContainer.length > 0
+
+        if (!hasOverlap) {
           this.OverlapId = []
+        } else {
+          this.OverlapId = [...new Set(overlapContainer)]
         }
 
-        this.hasOverlap = overlapContainer.includes(true)
-        this.$emit('has-overlap', overlapContainer.includes(true))
+        this.hasOverlap = hasOverlap
+        this.$emit('has-overlap', hasOverlap)
       }
     }
   }