From fa7f6c22680f5f00b89c7ea99032b409a5f8bbd2 Mon Sep 17 00:00:00 2001 From: Vignesh Joglekar Date: Tue, 25 May 2021 14:58:25 -0500 Subject: [PATCH] Makes requested changes, adds different version of filter button --- assets/css/app.css | 4 ++-- assets/js/dashboard/filters.js | 40 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/assets/css/app.css b/assets/css/app.css index 266f29121..0e065ba1f 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -311,10 +311,10 @@ iframe[hidden] { @apply cursor-default bg-gray-100 pointer-events-none; } -.filterListText:hover ~ .filterListEdit { +.filter-list-text:hover ~ .filter-list-edit { display: flex; } -.filterListText:hover ~ .filterListRemove { +.filter-list-text:hover ~ .filter-list-remove { display: none; } diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index 5cb54586e..5679f605a 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -111,53 +111,53 @@ class Filters extends React.Component { if (key === "props") { const [metaKey, metaValue] = Object.entries(value)[0] const eventName = query.filters["goal"] ? query.filters["goal"] : 'event' - return {eventName}.{metaKey}: {metaValue} + return {eventName}.{metaKey} is {metaValue} } if (key === "source") { - return Source: {value} + return Source is {value} } if (key === "utm_medium") { - return UTM medium: {value} + return UTM medium is {value} } if (key === "utm_source") { - return UTM source: {value} + return UTM source is {value} } if (key === "utm_campaign") { - return UTM campaign: {value} + return UTM campaign is {value} } if (key === "referrer") { - return Referrer: {value} + return Referrer is {value} } if (key === "screen") { - return Screen size: {value} + return Screen size is {value} } if (key === "browser") { - return Browser: {value} + return Browser is {value} } if (key === "browser_version") { const browserName = query.filters["browser"] ? query.filters["browser"] : 'Browser' - return {browserName} Version: {value} + return {browserName} Version is {value} } if (key === "os") { - return Operating System: {value} + return Operating System is {value} } if (key === "os_version") { const osName = query.filters["os"] ? query.filters["os"] : 'OS' - return {osName} Version: {value} + return {osName} Version is {value} } if (key === "country") { const allCountries = Datamap.prototype.worldTopo.objects.world.geometries; const selectedCountry = allCountries.find((c) => c.id === value) || { properties: { name: value } }; - return Country: {selectedCountry.properties.name} + return Country is {selectedCountry.properties.name} } if (key === "page") { - return Page{negated ? ' (not)' : ''}: {value} + return Page is{negated ? ' not' : ''} {value} } if (key === "entry_page") { - return Entry Page{negated ? ' (not)' : ''}: {value} + return Entry Page is{negated ? ' not' : ''} {value} } if (key === "exit_page") { - return Exit Page{negated ? ' (not)' : ''}: {value} + return Exit Page is{negated ? ' not' : ''} {value} } } @@ -207,15 +207,15 @@ class Filters extends React.Component { ) : ( <> - + {this.filterText(key, value, query)} - + )} - this.removeFilter(key, history, query)}> + this.removeFilter(key, history, query)}> @@ -284,8 +284,8 @@ class Filters extends React.Component { return (
{(this.appliedFilters.map((filter) => this.renderListFilter(history, filter, query)))} - - + + {viewport <= 768 ? "Filter" : "Add Filter"}