Send this up for tests and see what happens (#872)

dockstore · Jan 9, 2020 · a6029e0 · a6029e0
1 parent bb3aa2c
commit a6029e0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "2.3.0",
   "license": "Apache License 2.0",
   "config": {
-    "webservice_version": "1.8.0-alpha.2"
+    "webservice_version": "1.8.0-beta.5"
   },
   "scripts": {
     "ng": "npx ng",

diff --git a/src/app/home-page/widget/entries/entries.component.ts b/src/app/home-page/widget/entries/entries.component.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 import { UserQuery } from 'app/shared/user/user.query';
-import { DefaultService } from 'app/shared/openapi';
 import { EntryUpdateTime } from 'app/shared/openapi/model/entryUpdateTime';
 import { debounceTime, takeUntil } from 'rxjs/operators';
 import { formInputDebounceTime } from 'app/shared/constants';
 import { FilteredList } from '../filtered-list';
+import { EntriesService, UsersService } from '../../../shared/openapi';
 
 @Component({
   selector: 'app-entries',
@@ -13,12 +13,12 @@ import { FilteredList } from '../filtered-list';
 })
 export class EntriesComponent extends FilteredList {
   public entryTypeEnum = EntryUpdateTime.EntryTypeEnum;
-  constructor(userQuery: UserQuery, defaultService: DefaultService) {
-    super(userQuery, defaultService);
+  constructor(userQuery: UserQuery, usersService: UsersService, entriesService: EntriesService) {
+    super(userQuery, entriesService, usersService);
   }
 
   getMyList(): void {
-    this.defaultService
+    this.usersService
       .getUserEntries(10, this.filterText)
       .pipe(
         debounceTime(formInputDebounceTime),

diff --git a/src/app/home-page/widget/filtered-list.ts b/src/app/home-page/widget/filtered-list.ts
@@ -1,8 +1,8 @@
 import { OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { UserQuery } from 'app/shared/user/user.query';
-import { DefaultService } from 'app/shared/openapi';
 import { Base } from 'app/shared/base';
+import { EntriesService, UsersService } from '../../shared/openapi';
 
 /**
  * Base class for logged in homepage widgets that have a filter list
@@ -14,7 +14,7 @@ export abstract class FilteredList extends Base implements OnInit {
   public myItems;
   public filterText;
 
-  constructor(protected userQuery: UserQuery, protected defaultService: DefaultService) {
+  constructor(protected userQuery: UserQuery, protected entriesService: EntriesService, protected usersService: UsersService) {
     super();
   }
 

diff --git a/src/app/home-page/widget/organizations/organizations.component.ts b/src/app/home-page/widget/organizations/organizations.component.ts
@@ -1,23 +1,23 @@
 import { Component } from '@angular/core';
 import { UserQuery } from 'app/shared/user/user.query';
-import { DefaultService } from 'app/shared/openapi';
 import { OrganizationUpdateTime } from 'app/shared/openapi/model/organizationUpdateTime';
 import { debounceTime, takeUntil } from 'rxjs/operators';
 import { formInputDebounceTime } from 'app/shared/constants';
 import { FilteredList } from '../filtered-list';
+import { EntriesService, UsersService } from '../../../shared/openapi';
 
 @Component({
   selector: 'app-organizations',
   templateUrl: './organizations.component.html',
   styleUrls: ['./organizations.component.scss']
 })
 export class OrganizationsComponent extends FilteredList {
-  constructor(userQuery: UserQuery, defaultService: DefaultService) {
-    super(userQuery, defaultService);
+  constructor(userQuery: UserQuery, usersService: UsersService, entriesService: EntriesService) {
+    super(userQuery, entriesService, usersService);
   }
 
   getMyList(): void {
-    this.defaultService
+    this.usersService
       .getUserDockstoreOrganizations(10, this.filterText)
       .pipe(
         debounceTime(formInputDebounceTime),

diff --git a/src/app/shared/state/entry-wizard.service.ts b/src/app/shared/state/entry-wizard.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { EntryWizardStore } from './entry-wizard.store';
-import { DefaultService, BioWorkflow } from '../openapi';
+import { BioWorkflow, WorkflowsService, UsersService } from '../openapi';
 import { AlertService } from '../alert/state/alert.service';
 import { Repository } from '../openapi/model/repository';
 import { HttpErrorResponse } from '@angular/common/http';
@@ -14,16 +14,17 @@ export class EntryWizardService {
   constructor(
     private entryWizardStore: EntryWizardStore,
     private entryWizardQuery: EntryWizardQuery,
-    private defaultService: DefaultService,
-    private alertService: AlertService
+    private usersService: UsersService,
+    private alertService: AlertService,
+    private workflowsService: WorkflowsService
   ) {}
 
   /**
    * Updates the list of git registries
    */
   updateGitRegistryStore() {
     this.entryWizardStore.setLoading(true);
-    this.defaultService
+    this.usersService
       .getUserRegistries()
       .pipe(finalize(() => this.entryWizardStore.setLoading(false)))
       .subscribe(
@@ -44,7 +45,7 @@ export class EntryWizardService {
     this.entryWizardStore.setLoading(true);
     this.entryWizardStore.update({ gitOrganizations: undefined, gitRepositories: undefined });
     const registryEnum = this.convertSourceControlStringToEnum(registry);
-    this.defaultService
+    this.usersService
       .getUserOrganizations(registryEnum)
       .pipe(finalize(() => this.entryWizardStore.setLoading(false)))
       .subscribe(
@@ -66,7 +67,7 @@ export class EntryWizardService {
     this.entryWizardStore.setLoading(true);
     const registryEnum = this.convertSourceControlStringToEnum(registry);
 
-    this.defaultService
+    this.usersService
       .getUserOrganizationRepositories(registryEnum, organization)
       .pipe(finalize(() => this.entryWizardStore.setLoading(false)))
       .subscribe(
@@ -87,7 +88,7 @@ export class EntryWizardService {
     this.updateRepoIsPresent(repository, true, true);
     this.entryWizardStore.setLoading(true);
     const registryEnum = this.convertSourceControlStringToEnum(repository.gitRegistry);
-    this.defaultService
+    this.workflowsService
       .addWorkflow(registryEnum, repository.organization, repository.repositoryName)
       .pipe(finalize(() => this.entryWizardStore.setLoading(false)))
       .subscribe(
@@ -109,7 +110,7 @@ export class EntryWizardService {
     this.updateRepoIsPresent(repository, false, false);
     this.entryWizardStore.setLoading(true);
     const registryEnum = this.convertSourceControlStringToEnum(repository.gitRegistry);
-    this.defaultService
+    this.workflowsService
       .deleteWorkflow(registryEnum, repository.organization, repository.repositoryName)
       .pipe(finalize(() => this.entryWizardStore.setLoading(false)))
       .subscribe(