Release version changed to 1.2.0 (#48)

* Release verion changed to 1.2.0

* Removed margins for Close button

* Go back on downloaded models page

* Fixed config manager not initialized

Author: lumburovskalina

src/app/base/components/sidebar-pm/sidebar-pm.component.html

@@ -193,7 +193,7 @@
                 </div>
                 <div class="flex-shrink-0 flex py-6 justify-center">
                     <label data-tip="Version overview" for="version-overview" (click)="requestVersionOverview()"
-                      class="z-50 tooltip tooltip-right cursor-pointer select-none text-white flex items-center">v1.1.1
+                      class="z-50 tooltip tooltip-right cursor-pointer select-none text-white flex items-center">v1.2.0
                         <svg  *ngIf="hasUpdates" xmlns="http://www.w3.org/2000/svg"  data-tip="Newer version available"
                                 class="icon icon-tabler icon-tabler-alert-circle inline-block text-yellow-700 tooltip tooltip-right align-top ml-1 mt-px" width="16" height="16" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                                 <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
@@ -297,7 +297,7 @@
             <label (click)="howToUpdate()" *ngIf="!isManaged"
                 class="mr-2 bg-green-100 text-green-700 border border-green-400 text-xs font-semibold px-4 py-2 rounded-md cursor-pointer hover:bg-green-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500">How to update</label>
             <label for="version-overview"
-                class="bg-white text-gray-700 text-xs font-semibold mr-4 px-4 py-2 rounded border border-gray-300 cursor-pointer hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 inline-block">Close</label>
+                class="bg-white text-gray-700 text-xs font-semibold px-4 py-2 rounded border border-gray-300 cursor-pointer hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 inline-block">Close</label>
         </div>
     </div>
 </div>
@@ -399,7 +399,7 @@
             <label (click)="back()"
                 class="bg-white text-gray-700 text-xs font-semibold mr-2 px-4 py-2 rounded border border-gray-300 cursor-pointer hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 inline-block">Go back</label>
             <label for="steps-update"
-                class="bg-white text-gray-700 text-xs font-semibold mr-4 px-4 py-2 rounded border border-gray-300 cursor-pointer hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 inline-block">Close</label>
+                class="bg-white text-gray-700 text-xs font-semibold px-4 py-2 rounded border border-gray-300 cursor-pointer hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 inline-block">Close</label>
         </div>
     </div>
 </div>

src/app/model-download/components/model-download-component/model-download-component.component.html

@@ -1,5 +1,14 @@
 <div *ngIf="project$ | async as project" class="p-4 bg-gray-100 h-full overflow-y-auto flex-1 flex flex-col">
-    <div>
+    <div class="flex flex-row items-center">
+        <div class="mr-3">
+            <button (click)="goBack()" class="text-green-800 text-sm font-medium">
+                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 inline-block" fill="none"
+                    viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M7 16l-4-4m0 0l4-4m-4 4h18" />
+                </svg>
+                <span class="leading-5">Go back</span>
+            </button>
+        </div>
         <div class="text-lg leading-6 text-gray-900 font-medium inline-block">
             Downloaded models
         </div>

src/app/model-download/components/model-download-component/model-download-component.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { combineLatest, Subscription, timer } from 'rxjs';
 import { first } from 'rxjs/operators';
 import { ConfigManager } from 'src/app/base/services/config-service';
@@ -24,29 +24,32 @@ export class ModelDownloadComponentComponent implements OnInit {
   projectId: string;
   form: FormGroup;
   models: any[] = [];
-  isManaged: boolean = false;
+  isManaged: boolean = true;
   currentModelHandle: any;
   downloadedModels: any[];
   subscriptions$: Subscription[] = [];
   currentModel: any;
   indexSeparator: number;
+  lastPage: string;
 
   constructor(
     private activatedRoute: ActivatedRoute,
     private projectApolloService: ProjectApolloService,
     private routeService: RouteService,
     private informationSourceApolloService: WeakSourceApolloService,
-    private formBuilder: FormBuilder
+    private formBuilder: FormBuilder,
+    private router: Router
   ) { }
 
   ngOnInit(): void {
     this.initForm();
     this.routeService.updateActivatedRoute(this.activatedRoute);
     this.projectId = this.activatedRoute.parent.snapshot.paramMap.get('projectId');
+    this.lastPage = this.activatedRoute.snapshot.queryParamMap.get('lastPage');
+
     [this.projectQuery$, this.project$] = this.projectApolloService.getProjectByIdQuery(this.projectId);
     [this.downloadedModelsQuery$, this.downloadedModelsList$] = this.informationSourceApolloService.getModelProviderInfo();
     this.prepareModels();
-    this.isManaged = ConfigManager.getIsManaged();
 
     this.subscriptions$.push(
       this.downloadedModelsList$.subscribe((downloadedModels) => {
@@ -56,6 +59,8 @@ export class ModelDownloadComponentComponent implements OnInit {
           model.parseDate = this.parseUTC(model.date);
         })
       }));
+    
+    this.checkIfManagedVersion();
 
     NotificationService.subscribeToNotification(this, {
       whitelist: ['model_provider_download'],
@@ -165,4 +170,15 @@ export class ModelDownloadComponentComponent implements OnInit {
     return findModel !== undefined ? true : false;
   }
 
+  goBack() {
+    this.router.navigate(["../"+this.lastPage], { relativeTo: this.activatedRoute });
+  }
+
+  checkIfManagedVersion() {
+    if (!ConfigManager.isInit()) {
+      timer(250).subscribe(() => this.checkIfManagedVersion());
+      return;
+    }
+    this.isManaged = ConfigManager.getIsManaged();
+  }
 }

src/app/projects/components/project-settings/project-settings.component.html

@@ -275,7 +275,7 @@
             <div class="text-lg leading-6 text-gray-900 font-medium inline-block w-full">
                 <label>Embeddings</label> 
                     <button class="ml-3 text-green-700 hover:text-green-500 text-base font-medium"
-                        [routerLink]="['../model-download']"
+                        [routerLink]="['../model-download']" [queryParams]="{lastPage: 'settings'}"
                         [disabled]="!isManaged"
                         [ngClass]="!isManaged ? 'tooltip tooltip-right cursor-not-allowed' : 'opacity-100 cursor-pointer'"
                         [attr.data-tip]="!isManaged ? 'Check out our hosted version to use this function' : ''">

src/app/zero-shot-details/component/zero-shot-details.component.html

@@ -103,7 +103,7 @@
                     <div *ngIf="!isModelDownloading" class="font-normal" style="height: 24px;">
                         Model
                         <button class="ml-3 text-green-700 hover:text-green-500 text-sm font-medium cursor-pointer"
-                            [routerLink]="['../../model-download']"
+                            [routerLink]="['../../model-download']" [queryParams]="{lastPage: 'zero-shot/'+informationSource.id}"
                             [disabled]="!isManaged"
                             [ngClass]="!isManaged ? 'tooltip tooltip-right cursor-not-allowed' : 'opacity-100 cursor-pointer'"
                             [attr.data-tip]="!isManaged ? 'Check out our hosted version to use this function' : ''">