Merge pull request #26 from strongbox/SB-1414

SB-1414 List repositories from all storages in group repository management

Author: steve-todorov

src/app/modules/storage-management/pages/browse-storages/components/list-repositories/list-repositories.component.html

@@ -3,7 +3,7 @@
         <ng-container *ngFor="let column of repositoryColumns;">
             <ng-container [matColumnDef]="column">
                 <th mat-header-cell *matHeaderCellDef>{{ column | titlecase }}</th>
-                <td mat-cell *matCellDef="let repository" (click)="navigateToDirectoryListing(repository)" class="clickable">
+                <td mat-cell *matCellDef="let repository" (click)="navigateToRepositoryUpdate(repository)" class="clickable">
                     {{repository[column]}}
                 </td>
             </ng-container>

src/app/modules/storage-management/pages/manage-repository/manage-repository.component.ts

@@ -23,6 +23,7 @@ import {
 import {ApiResponse, handleFormError} from '../../../core/core.model';
 import {ProxyConfiguration, ProxyConfigurationTypeEnum} from '../../proxyConfiguration.model';
 import {StorageEntity} from '../../storage.model';
+import {FormDataService} from 'src/app/shared/form/services/form-data.service';
 
 @Component({
     selector: 'app-storage-manage',
@@ -48,7 +49,8 @@ export class ManageRepositoryComponent implements OnInit {
                 private route: ActivatedRoute,
                 private router: Router,
                 private store: Store,
-                private service: StorageManagerService) {
+                private service: StorageManagerService,
+                private formDataService: FormDataService) {
     }
 
     generateCommonFormFields(type: RepositoryTypeEnum, repo: Repository) {
@@ -241,19 +243,20 @@ export class ManageRepositoryComponent implements OnInit {
                 this.service
                     .getRepository(storageId, repositoryId)
                     .subscribe((repository: Repository) => {
+                        console.log(repository);
                         this.type$.next(this.getRepositoryEnumType(repository));
                         this.repository$.next(repository);
 
                         if (this.isGroupRepository()) {
                             this.activeGroupRepositories = repository.groupRepositories;
 
-                            this.service
-                                .getStorage(storageId)
-                                .subscribe((storage: StorageEntity) => {
-                                    this.availableGroupRepositories = storage.repositories
-                                        .map(r => r.id)
-                                        .filter((id) => {
-                                            return id !== repository.id && repository.groupRepositories.indexOf(id) === -1;
+                            this.formDataService
+                                .findRepositoryNames(null, null, true)
+                                .subscribe((storages: string[]) => {
+                                    this.availableGroupRepositories = storages
+                                        .filter((srId) => {
+                                            return srId !== repository.getStorageIdAndRepositoryId() &&
+                                                repository.groupRepositories.indexOf(srId) === -1;
                                         })
                                         .sort((a, b) => a.localeCompare(b));
 

src/app/modules/storage-management/repository.model.ts

@@ -66,7 +66,6 @@ export class CustomRepositoryConfiguration {
 }
 
 export class Repository {
-    // this is used only internally to store the "owning" storage id - not actually received from the api.
     public storageId: string = null;
     public id: string = null;
     public basedir: string = null;
@@ -123,4 +122,8 @@ export class Repository {
             this.remoteRepository = new RemoteRepositoryConfiguration();
         }
     }
+
+    public getStorageIdAndRepositoryId() {
+        return this.storageId + ':' + this.id;
+    }
 }

src/app/shared/form/services/form-data.service.ts

@@ -87,7 +87,7 @@ export class FormDataService {
             );
     }
 
-    findRepositoryNames(term = '', storageId = '', withStorageId = false, type = null): Observable<any> {
+    findRepositoryNames(term = '', storageId = '', withStorageId = false, type = null): Observable<string[]> {
         term = this.sanitize(term);
         storageId = this.sanitize(storageId);
         type = this.sanitize(type);