Fix #943 & #944 (#20)

* gtag hide/show * fix #943 - hide quickfilter title when no filters * fix #944 - desktop layout for mobile
kolzchut · Jan 26, 2025 · fd2b207 · fd2b207
1 parent c40047f
commit fd2b207
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/projects/srm/src/app/analytics.service.ts b/projects/srm/src/app/analytics.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { Card, SearchParams } from './consts';
 import { PlatformService } from './platform.service';
 import { WindowService } from './window.service';
+import { environment } from '../environments/environment';
 
 declare const window: {
   gtag: any
@@ -25,7 +26,8 @@ export class AnalyticsService {
   }
 
   gtag(...args: any[]) {
-    if (this.platform.browser() && window?.gtag) {
+    const isGtag = environment.production || !environment.isHideGtagLog;
+    if (isGtag && this.platform.browser() && window?.gtag) {
       window.gtag(...args);
     }
   }

diff --git a/projects/srm/src/app/page/page.component.html b/projects/srm/src/app/page/page.component.html
@@ -66,21 +66,21 @@
                 </app-results-drawer>                
             </div>
         }
-        @if (layout.desktop() && searchParams) {
-            <app-search-results-page
-                [class.visible]='stage === "search-results"'
-                [searchParams]='searchParams'
-                [serachResultsActive]="stage === 'search-results'"
-                [didYouMean]='didYouMean'
-                [searchState]='searchState'
-                [filtersState]='filtersState'
-                [areaSearchState]='areaSearchState'
-                (zoomout)='zoomOutMap($event)'
-                (visibleCount)='visibleCount = $event'
-                (nationalCount)='nationalCount = $event'
-                (hoverCard)='hoverCard($event)'
-            ></app-search-results-page>
-        }
+        <app-search-results-page
+            *ngIf='layout.desktop() && searchParams'
+            [class.visible]='stage === "search-results"'
+            [searchParams]='searchParams'
+            [serachResultsActive]="stage === 'search-results'"
+            [didYouMean]='didYouMean'
+            [searchState]='searchState'
+            [filtersState]='filtersState'
+            [areaSearchState]='areaSearchState'
+            (zoomout)='zoomOutMap($event)'
+            (visibleCount)='visibleCount = $event'
+            (nationalCount)='nationalCount = $event'
+            (hoverCard)='hoverCard($event)'
+        />
+
         @if (stage === 'point') {
             <app-branch-container
                 [cardId]='card' 

diff --git a/...ects/srm/src/app/search-results-page/srp-static-filters/srp-static-filters.component.html b/...ects/srm/src/app/search-results-page/srp-static-filters/srp-static-filters.component.html
@@ -1,4 +1,4 @@
-<h3>סינון מהיר:</h3>
+<h3 *ngIf='filtersState.staticFilters.length'>סינון מהיר:</h3>
 <div class='items'>
     @for (item of filtersState.staticFilters; track item.key) {
         @if (item.key?.indexOf('human_situation') === 0 && item.key && filtersState.situationsMap[item.key]) {

diff --git a/projects/srm/src/environments/development-env.ts b/projects/srm/src/environments/development-env.ts
@@ -4,6 +4,7 @@
 
 export const devEnv: any = {
   production: false,
+  isHideGtagLog: true,
   cardsURL: 'https://srm-staging-api.whiletrue.industries/api/idx/search/cards',
   // pointsURL: 'https://srm-staging-api.whiletrue.industries/api/idx/search/points',
   // countCategoriesURL: 'https://srm-staging-api.whiletrue.industries/api/idx/search/count',

diff --git a/projects/srm/src/environments/environment.prod.ts b/projects/srm/src/environments/environment.prod.ts
@@ -4,6 +4,7 @@
 
 export const environment = {
   production: true,
+  isHideGtagLog: false,
   cardsURL: 'https://api.kolsherut.org.il/api/idx/search/cards',
   // pointsURL: 'https://api.kolsherut.org.il/api/idx/search/points',
   // countCategoriesURL: 'https://api.kolsherut.org.il/api/idx/search/count',

diff --git a/projects/srm/src/environments/environment.staging.ts b/projects/srm/src/environments/environment.staging.ts
@@ -1,6 +1,7 @@
 import { devEnv } from './development-env';
 
 export const environment = Object.assign({}, devEnv, {
+    isHideGtagLog: false,
     // clusterDataURL: '/clusters.json',
     // taxonomySituationsURL: '/situations.json',
     // taxonomyResponsesURL: '/responses.json'