Skip to content

Commit

Permalink
chore: Remove imported mixin base-collection from components events a…
Browse files Browse the repository at this point in the history
…ctivity
  • Loading branch information
fcrovetti committed Dec 17, 2024
1 parent 2806f38 commit 143fc86
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
11 changes: 5 additions & 6 deletions src/components/ArchivedEventsActivity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ const MAX_EVENTS = 5000
export default {
mixins: [
activityMixin,
kdkCoreMixins.baseCollection,
kdkMapMixins.activity,
kdkMapMixins.style,
kdkMapMixins.context,
Expand Down Expand Up @@ -343,7 +342,7 @@ export default {
getEventStyle (event, options) {
if (!this.templates.includes(options.name)) return
const color = kdkCoreUtils.getColorFromPalette(_.get(event, 'icon.color'), 'blue')
return {
return {
color: chroma(color).alpha(0.5).hex(), // Transparency
stroke: {
color
Expand Down Expand Up @@ -546,7 +545,7 @@ export default {
'location.geometry.coordinates[1]': 'latitude',
'location.properties.name': 'address'
},
omit: ['icon', 'participants', 'coordinators', 'hasWorkflow',
omit: ['icon', 'participants', 'coordinators', 'hasWorkflow',
'workflow', '_include', 'location', 'deletedAt' ]
},
geojson: {
Expand All @@ -559,10 +558,10 @@ export default {
'template': 'properties.template',
'createdAt': 'properties.createdAt',
'updatedAt': 'properties.updatedAt',
'expireAt': 'properties.expireAt',
'expireAt': 'properties.expireAt',
},
omit: ['name', 'icon', 'description','participants', 'coordinators', 'template', 'plan',
'hasWorkflow', 'workflow', 'location', '_include',
omit: ['name', 'icon', 'description','participants', 'coordinators', 'template', 'plan',
'hasWorkflow', 'workflow', 'location', '_include',
'createdAt', 'updatedAt', 'expireAt', 'deletedAt']
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/EventActivity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export default {
kMapMixins.map.mapillaryLayers,
kMapMixins.map.gsmapLayers,
activityMixin,
kCoreMixins.baseCollection,
kMapMixins.featureSelection,
kMapMixins.featureService,
kMapMixins.infobox,
Expand Down Expand Up @@ -174,7 +173,7 @@ export default {
},
getParticipantMarker (feature, options) {
if (options.name !== this.$t('EventActivity.PARTICIPANTS_LAYER_NAME')) return
return {
shape: 'circle',
color: kCoreUtils.getColorFromPalette(_.get(feature, 'icon.color'), 'blue'),
Expand Down

0 comments on commit 143fc86

Please sign in to comment.