refactor: update version info handling and clean up community module display

Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>

Author: mjabascal10

frontend/src/app/app-module/shared/components/app-module-card/app-module-card.component.html

@@ -1,8 +1,8 @@
 <div class="module-card card text-center p-2 m-0 d-flex flex-column align-items-center justify-content-between">
   <div class="d-flex flex-column w-100">
-    <div *ngIf="version === versionType.COMMUNITY && ModulesEnterprise.includes(module.moduleName)" class="d-flex justify-content-end">
+    <!--<div *ngIf="version === versionType.COMMUNITY && ModulesEnterprise.includes(module.moduleName)" class="d-flex justify-content-end">
       <span class="badge p-1 border-1 m-1 bg-success-300"> Enterprise </span>
-    </div>
+    </div>-->
     <div class="d-flex justify-content-center">
       <img class="p-3 mb-3 mt-1"
            [alt]="module.prettyName"
@@ -18,16 +18,15 @@ <h6 class="card-title font-weight-semibold">{{module.prettyName}}</h6>
     </p>
   </div>
 
-  <button *ngIf="version === versionType.COMMUNITY && !ModulesEnterprise.includes(module.moduleName)"
-    class="btn utm-button mb-3 " (click)="showIntegration()"
+  <button class="btn utm-button mb-3 " (click)="showIntegration()"
           [ngClass]="module.moduleActive?'utm-button-success':'utm-button-primary'">
     <i class="mr-1 icon-puzzle2"></i>
     {{module.moduleActive ? 'Enabled' : 'View integration'}}
   </button>
 
-  <button *ngIf="version === versionType.COMMUNITY && ModulesEnterprise.includes(module.moduleName)"
+  <!--<button *ngIf="version === versionType.COMMUNITY && ModulesEnterprise.includes(module.moduleName)"
           class="btn utm-button utm-button-primary mb-3" (click)="showMessage()">
     <i class="mr-1 icon-lock2"></i>
     Upgrade to Enterprise
-  </button>
+  </button>-->
 </div>

frontend/src/app/shared/components/layout/header/shared/components/utm-version-info/utm-version-info.component.html

@@ -1,4 +1,4 @@
-<ng-container *ngIf="currentVersion$ | async  as currentVersion">
+<ng-container *ngIf="versionInfo  as currentVersion">
   <span *ngIf="currentVersion.build"
     [ngClass]="'badge-success-800'"
     class="badge badge-pill version-info cursor-pointer text-white">

frontend/src/app/shared/components/layout/header/shared/components/utm-version-info/utm-version-info.component.ts

@@ -12,35 +12,38 @@ import {VersionInfo} from '../../../../../../types/updates/updates.type';
   styleUrls: ['./utm-version-info.component.css']
 })
 export class UtmVersionInfoComponent implements OnInit {
-  currentVersion$: Observable<VersionInfo> = EMPTY;
-  destroy$ = new Subject<void>();
+  versionInfo: VersionInfo;
 
   constructor(private checkForUpdatesService: CheckForUpdatesService,
               private utmToastService: UtmToastService,
               private versionTypeService: VersionTypeService) {
   }
 
   ngOnInit() {
-    this.getVersionInfo();
-  }
-
-  getVersionInfo() {
-    this.currentVersion$ = this.checkForUpdatesService.getVersion()
+    this.checkForUpdatesService.getVersion()
       .pipe(
         map(response => response.body || null),
         tap((versionInfo: VersionInfo) => {
-          console.log('versionInfo', versionInfo);
           const version = versionInfo && versionInfo.build && versionInfo.build.version || '';
-          const versionType = version.includes('community') || version === '' ? VersionType.COMMUNITY : VersionType.ENTERPRISE;
+          const versionType = version.includes('community') || version === ''
+            ? VersionType.COMMUNITY
+            : VersionType.ENTERPRISE;
 
           if (versionType !== this.versionTypeService.versionType()) {
             this.versionTypeService.changeVersionType(versionType);
           }
         }),
         catchError(() => {
-          this.utmToastService.showError('Error fetching version info', 'An error occurred while fetching version info.');
+          this.utmToastService.showError(
+            'Error fetching version info',
+            'An error occurred while fetching version info.'
+          );
           return EMPTY;
         })
-      );
+      )
+      .subscribe(versionInfo => {
+        this.versionInfo = versionInfo;
+      });
   }
+
 }