From fe53dd47476f5952a0a0cf736997b02e68cd920b Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Fri, 10 Aug 2018 03:43:09 -0400 Subject: [PATCH] Revert "Make documentation link more visible. (#1030)" This reverts commit 690d7bca7f0309c14c270537400862f9f08383b6. --- .travis.yml | 5 - AUTHORS | 2 - CONTRIBUTING.rst | 20 -- Makefile | 18 -- galaxy/importer/loaders/apb.py | 34 +- galaxy/importer/tests/test_apb_loader.py | 10 - galaxyui/.prettierrc.yaml | 3 - galaxyui/package.json | 3 +- galaxyui/src/app/app-routing.module.ts | 79 +---- galaxyui/src/app/app.component.html | 25 +- galaxyui/src/app/app.component.spec.ts | 46 +-- galaxyui/src/app/app.component.ts | 143 +++++---- galaxyui/src/app/app.module.ts | 102 +++--- galaxyui/src/app/auth/auth.service.ts | 78 +++-- .../src/app/authors/authors.component.spec.ts | 31 +- galaxyui/src/app/authors/authors.component.ts | 116 ++++--- galaxyui/src/app/authors/authors.module.ts | 41 +-- .../app/authors/authors.resolver.service.ts | 45 ++- .../src/app/authors/authors.routing.module.ts | 54 +++- .../detail/author-detail.component.spec.ts | 31 +- .../authors/detail/author-detail.component.ts | 131 ++++---- .../detail-actions.component.ts | 65 ++-- .../cloud-platforms.component.ts | 19 +- .../dependencies/dependencies.component.ts | 18 +- .../cards/info/card-info.component.ts | 30 +- .../cards/platforms/platforms.component.ts | 20 +- .../cards/versions/versions.component.ts | 21 +- .../content-detail.component.spec.ts | 31 +- .../content-detail.component.ts | 118 +++---- .../content-detail/content-detail.module.ts | 53 ++-- .../content-detail.resolver.service.ts | 51 ++- .../content-detail.routing.module.ts | 48 ++- .../module-utils/module-utils.component.ts | 113 ++++--- .../content/modules/modules.component.ts | 114 ++++--- .../content/plugins/plugins.component.ts | 131 ++++---- .../content/roles/roles.component.ts | 114 ++++--- .../repository/repository.component.ts | 42 ++- galaxyui/src/app/enums/content-types.enum.ts | 11 +- .../src/app/enums/contributor-types.enum.ts | 4 +- galaxyui/src/app/enums/import-state.enum.ts | 2 +- galaxyui/src/app/enums/repo-types.enum.ts | 4 +- galaxyui/src/app/enums/view-types.enum.ts | 8 +- .../access-denied/access-denied.component.ts | 51 +-- .../exception-pages/exception-pages.module.ts | 23 +- .../exception-pages.routing.module.ts | 21 +- .../not-found/not-found.component.ts | 51 +-- .../app/home/carousel/carousel.component.ts | 24 +- galaxyui/src/app/home/home.component.spec.ts | 31 +- galaxyui/src/app/home/home.component.ts | 38 ++- galaxyui/src/app/home/home.module.ts | 42 ++- .../src/app/home/home.resolver.service.ts | 35 +- galaxyui/src/app/home/home.routing.module.ts | 39 ++- .../src/app/home/popular/popular.component.ts | 50 +-- .../src/app/login/login.component.spec.ts | 31 +- galaxyui/src/app/login/login.component.ts | 46 ++- galaxyui/src/app/login/login.module.ts | 29 +- .../src/app/login/login.routing.module.ts | 31 +- .../add-repository-modal.component.spec.ts | 31 +- .../add-repository-modal.component.ts | 94 +++--- .../src/app/my-content/my-content.module.ts | 65 ++-- .../my-content/my-content.routing.module.ts | 59 ++-- .../namespace-detail.component.spec.ts | 31 +- .../namespace-detail.component.ts | 163 +++++----- .../namespace-detail.resolver.service.spec.ts | 16 +- .../namespace-detail.resolver.service.ts | 52 +-- .../namespace-list/action/action.component.ts | 108 ++++--- .../owners-content.component.spec.ts | 31 +- .../owners-content.component.ts | 16 +- ...vider-namespaces-content.component.spec.ts | 31 +- .../provider-namespaces-content.component.ts | 16 +- .../action/action.component.ts | 71 +++-- .../alternate-name-modal.component.spec.ts | 33 +- .../alternate-name-modal.component.ts | 57 ++-- .../repositories-content.component.spec.ts | 31 +- .../repositories-content.component.ts | 127 ++++---- .../namespace-list-resolver.service.spec.ts | 16 +- .../namespace-list-resolver.service.ts | 26 +- .../namespace-list.component.spec.ts | 31 +- .../namespace-list.component.ts | 119 +++---- .../import-detail.component.spec.ts | 31 +- .../import-detail/import-detail.component.ts | 85 +++-- .../import-list/import-list.component.spec.ts | 31 +- .../import-list/import-list.component.ts | 251 ++++++++------- .../import-list.resolver.service.ts | 31 +- .../src/app/my-imports/my-imports.module.ts | 39 ++- .../my-imports/my-imports.routing.module.ts | 33 +- .../page-header/page-header.component.spec.ts | 31 +- .../app/page-header/page-header.component.ts | 15 +- .../src/app/page-header/page-header.module.ts | 19 +- .../page-loading.component.spec.ts | 31 +- .../page-loading/page-loading.component.ts | 13 +- .../app/page-loading/page-loading.module.ts | 16 +- .../api-root/api-root.service.spec.ts | 16 +- .../resources/api-root/api-root.service.ts | 31 +- .../src/app/resources/api-root/api-root.ts | 2 +- .../cloud-platform.service.spec.ts | 16 +- .../cloud-platforms/cloud-platform.service.ts | 53 ++-- .../content-blocks.service.spec.ts | 16 +- .../content-blocks/content-blocks.service.ts | 42 +-- .../content-search.service.spec.ts | 16 +- .../content-search/content-search.service.ts | 51 ++- .../content-type.service.spec.ts | 16 +- .../content-types/content-type.service.ts | 42 ++- .../resources/content/content.service.spec.ts | 16 +- .../app/resources/content/content.service.ts | 72 +++-- .../resources/imports/imports.service.spec.ts | 16 +- .../app/resources/imports/imports.service.ts | 61 ++-- .../namespaces/namespace.service.spec.ts | 16 +- .../resources/namespaces/namespace.service.ts | 57 ++-- .../src/app/resources/namespaces/namespace.ts | 4 +- .../app/resources/pf-body/pf-body.service.ts | 36 ++- .../platforms/platform.service.spec.ts | 16 +- .../resources/platforms/platform.service.ts | 52 +-- .../provider-source.service.spec.ts | 16 +- .../provider-source.service.ts | 41 ++- .../repositories/repository.service.spec.ts | 16 +- .../repositories/repository.service.ts | 66 ++-- .../repository-import.service.spec.ts | 16 +- .../repository-import.service.ts | 46 +-- .../app/resources/tags/tags.service.spec.ts | 16 +- .../src/app/resources/tags/tags.service.ts | 52 +-- .../app/resources/users/user.service.spec.ts | 16 +- .../src/app/resources/users/user.service.ts | 33 +- .../search/popular/popular.component.spec.ts | 31 +- .../app/search/popular/popular.component.ts | 44 ++- .../src/app/search/search-routing.module.ts | 37 ++- .../src/app/search/search.component.spec.ts | 31 +- galaxyui/src/app/search/search.component.ts | 299 ++++++++++-------- galaxyui/src/app/search/search.module.ts | 39 +-- .../src/app/search/search.resolver.service.ts | 89 ++++-- .../user-notifications.component.spec.ts | 31 +- .../user-notifications.component.ts | 18 +- .../clipboard/clipboard.component.ts | 16 +- .../src/app/utilities/utilities.module.ts | 24 +- .../app/vendors/card/vendor-card.component.ts | 26 +- galaxyui/src/app/vendors/vendors.component.ts | 110 ++++--- galaxyui/src/app/vendors/vendors.module.ts | 38 ++- .../app/vendors/vendors.resolver.service.ts | 25 +- .../src/app/vendors/vendors.routing.module.ts | 47 ++- galaxyui/src/environments/environment.prod.ts | 2 +- galaxyui/src/environments/environment.ts | 2 +- galaxyui/src/main.ts | 7 +- galaxyui/src/polyfills.ts | 8 +- galaxyui/src/test.ts | 12 +- galaxyui/src/typings.d.ts | 2 +- galaxyui/tslint.json | 37 ++- galaxyui/yarn.lock | 4 - scripts/docker/dev/start-develop.sh | 1 + 148 files changed, 3661 insertions(+), 2710 deletions(-) delete mode 100644 galaxyui/.prettierrc.yaml diff --git a/.travis.yml b/.travis.yml index 77abe8970..af8238c8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ script: - make dev/waitenv - make dev/test - # check images running - docker ps -a - docker images @@ -39,10 +38,6 @@ script: - ansible-playbook -i inventory test.yml - popd -# Run JavaScript test -- make dev/jslint -- make test/prettier - # Check the logs - docker ps -a - make dev/log diff --git a/AUTHORS b/AUTHORS index 164621e86..b1ad4ba9c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,8 +8,6 @@ Chris Church Chris Houseknecht Christopher Chase David Newswanger -David Zager -Ivan Remizov James Cammarata Jiri Tyr Joe Fiorini diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index f01a54973..7034b8734 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -430,26 +430,6 @@ To run lint checks against JavaScript/TypeScript sources, execute: $ make dev/jslint -Formatting your code -^^^^^^^^^^^^^^^^^^^^ - -We use prettier to enforce code formatting for all of our TypeScript and less files. -To automatically format your Angular code run: - -.. code-block:: console - - $ make dev/prettier - -Unformatted code will cause the travis build to fail when you push your changes to -GitHub. - -It's recommended that you set up prettier on your editor if you're making lots of -changes to anything in ``galaxyui/``. Prettier is supported by most major editors -and you can find more `information about that here `_. - -Our prettier configuration can be found at ``galaxyui/.prettierrc.yaml``. Please -use it when setting up your editor. - Testing your code ^^^^^^^^^^^^^^^^^ diff --git a/Makefile b/Makefile index 9520134e0..f6f21c6f5 100644 --- a/Makefile +++ b/Makefile @@ -98,13 +98,6 @@ test/flake8: test/jslint: cd galaxyui; ng lint -# for some reason yarn won't add prettier to /usr/local/bin -.PHONY: test/prettier -test/prettier: - @echo "Checking formatting..." - @echo "If this fails, run make dev/prettier locally to format your code" - cd galaxyui; ./node_modules/.bin/prettier -l "{src/**/*.ts, src/**/*.less}" - # --------------------------------------------------------- # Docker targets # --------------------------------------------------------- @@ -151,17 +144,6 @@ dev/jslint: @echo "Linting Javascript..." @$(DOCKER_COMPOSE) exec galaxy bash -c 'cd galaxyui; ng lint' -# for some reason yarn won't add prettier to /usr/local/bin -.PHONY: dev/prettier -dev/prettier: - @echo "Running prettier..." - @$(DOCKER_COMPOSE) exec galaxy bash -c 'cd galaxyui; ./node_modules/.bin/prettier --write "{src/**/*.ts, src/**/*.less}"' - -.PHONY: dev/shellcheck -dev/shellcheck: - @$(DOCKER_COMPOSE) exec galaxy bash -c '\ - find ./scripts -name *.sh | xargs shellcheck' - .PHONY: dev/test dev/test: @echo "Running tests" diff --git a/galaxy/importer/loaders/apb.py b/galaxy/importer/loaders/apb.py index d7cf8246b..fd1f86aef 100644 --- a/galaxy/importer/loaders/apb.py +++ b/galaxy/importer/loaders/apb.py @@ -33,18 +33,6 @@ class APBMetaParser(object): # Tags should contain lowercase letters and digits only TAG_REGEXP = re.compile('^[a-z0-9]+$') - # APB parameters should be in json-schema form - PARAM_KEY_MAP = { - 'maxlength': 'maxLength', - 'max_length': 'maxLength', - 'min_length': 'minLength', - 'multiple_of': 'multipleOf', - 'exclusive_maximum': 'exclusiveMaximum', - 'exclusive_minimum': 'exclusiveMinimum', - 'display_type': 'displayType', - 'display_group': 'displayGroup' - } - def __init__(self, metadata, logger=None): self.metadata = metadata self.log = logger or base.default_logger @@ -112,13 +100,9 @@ def _check_plans(self): raise exc.APBContentLoadError( 'Expecting "plans" in metadata to be a list') - expected_plan_keys = ('description', - 'free', - 'metadata', - 'bindable', - 'parameters') + expected_plan_keys = ('description', 'free', 'metadata', 'parameters') expected_plan_meta_keys = ('displayName', 'longDescription', 'cost') - expected_parameter_keys = ('name', 'title', 'type', 'required') + expected_parameter_keys = ('name', 'title', 'type') idx = 0 for plan in plans: if not isinstance(plan, dict): @@ -153,13 +137,6 @@ def _check_plans(self): expected_parameter_keys, 'plans[{0}].parameters[{1}]'.format(idx, pidx), params) - for param_key in params.keys(): - if param_key in self.PARAM_KEY_MAP: - new_key = self.PARAM_KEY_MAP[param_key] - self.metadata[fieldname][idx]['parameters'][pidx][ - new_key] = self.metadata[fieldname][idx][ - 'parameters'][pidx].pop(param_key) - pidx += 1 idx += 1 @@ -190,9 +167,6 @@ def _validate_tag(self, tag): return False return True - def parse_metadata(self): - return self.metadata - def parse_tags(self): tags = [] apb_tags = self.metadata.get('tags', []) @@ -214,11 +188,11 @@ def __init__(self, content_type, path, root, metadata_path, logger=None): def load(self): self.log.info('Loading metadata file: {0}'.format(self.metadata_file)) - meta_parser = APBMetaParser(self._load_metadata(), logger=self.log) + metadata = self._load_metadata() + meta_parser = APBMetaParser(metadata, logger=self.log) name = meta_parser.parse_name() description = meta_parser.parse_description() meta_parser.check_data() - metadata = meta_parser.parse_metadata() data = {'tags': meta_parser.parse_tags()} readme = self._get_readme() diff --git a/galaxy/importer/tests/test_apb_loader.py b/galaxy/importer/tests/test_apb_loader.py index 40b4f3731..5ac4df832 100644 --- a/galaxy/importer/tests/test_apb_loader.py +++ b/galaxy/importer/tests/test_apb_loader.py @@ -327,16 +327,6 @@ def test_missing_version(self): msg = 'Missing "version" field in metadata.' assert msg in excinfo.value.message - def test_param_keys(self): - parser = apb_loader.APBMetaParser(self.data, self.log) - parser.check_data() - metadata = parser.parse_metadata() - assert 'displayGroup' in metadata['plans'][0]['parameters'][0] - assert 'displayType' in metadata['plans'][0]['parameters'][1] - assert 'displayGroup' in metadata['plans'][0]['parameters'][1] - assert 'minLength' in metadata['plans'][0]['parameters'][1] - assert 'maxLength' in metadata['plans'][0]['parameters'][1] - def test_version_format(self): self.data['version'] = 'foo' parser = apb_loader.APBMetaParser(self.data, self.log) diff --git a/galaxyui/.prettierrc.yaml b/galaxyui/.prettierrc.yaml deleted file mode 100644 index 582a04ef4..000000000 --- a/galaxyui/.prettierrc.yaml +++ /dev/null @@ -1,3 +0,0 @@ -printWidth: 140 -singleQuote: true -trailingComma: "all" diff --git a/galaxyui/package.json b/galaxyui/package.json index bd9d5dd3f..6da606699 100644 --- a/galaxyui/package.json +++ b/galaxyui/package.json @@ -1,7 +1,7 @@ { "name": "galaxyui", "version": "0.0.0", - "license": "Apache-2.0", + "license": "MIT", "scripts": { "ng": "ng", "start": "ng serve", @@ -43,7 +43,6 @@ "karma-coverage-istanbul-reporter": "^1.2.1", "karma-jasmine": "~1.1.0", "karma-jasmine-html-reporter": "^0.2.2", - "prettier": "1.14.0", "protractor": "~5.1.2", "ts-node": "~4.1.0", "tslint": "~5.9.1", diff --git a/galaxyui/src/app/app-routing.module.ts b/galaxyui/src/app/app-routing.module.ts index 36e9679cc..171c255bb 100644 --- a/galaxyui/src/app/app-routing.module.ts +++ b/galaxyui/src/app/app-routing.module.ts @@ -1,82 +1,25 @@ -import { NgModule } from '@angular/core'; -import { AuthorDetailComponent } from './authors/detail/author-detail.component'; -import { ContentDetailComponent } from './content-detail/content-detail.component'; -import { NotFoundComponent } from './exception-pages/not-found/not-found.component'; - -import { - ContentResolver, - NamespaceResolver, - RepositoryResolver as ContentRepositoryResolver, -} from './content-detail/content-detail.resolver.service'; - -import { NamespaceDetailResolver, RepositoryResolver as AuthorRepositoryResolver } from './authors/authors.resolver.service'; - -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { NotFoundComponent } from './exception-pages/not-found/not-found.component'; const appRoutes: Routes = [ { path: '', redirectTo: '/home', - pathMatch: 'full', - }, - - // Lazily loaded modules - { - path: 'search', - loadChildren: './search/search.module#SearchModule', - }, - { - path: 'my-content', - loadChildren: './my-content/my-content.module#MyContentModule', - }, - { - path: 'my-imports', - loadChildren: './my-imports/my-imports.module#MyImportsModule', - }, - - // Routes that resolve variables have to go in app-routing.module to ensure - // that they are resolved between the static routes ('/search', '/my-content' etc) - // and the wildcard ('**') - { - path: ':namespace/:repository/:content_name', - component: ContentDetailComponent, - resolve: { - content: ContentResolver, - repository: ContentRepositoryResolver, - namespace: NamespaceResolver, - }, - }, - { - path: ':namespace/:repository', - component: ContentDetailComponent, - resolve: { - content: ContentResolver, - repository: ContentRepositoryResolver, - namespace: NamespaceResolver, - }, - }, - { - path: ':namespace', - component: AuthorDetailComponent, - resolve: { - namespace: NamespaceDetailResolver, - repositories: AuthorRepositoryResolver, - }, - }, - { + pathMatch: 'full' + }, { path: '**', - component: NotFoundComponent, - }, + component: NotFoundComponent + } ]; @NgModule({ imports: [ RouterModule.forRoot(appRoutes, { enableTracing: false, - onSameUrlNavigation: 'reload', - preloadingStrategy: PreloadAllModules, - }), + onSameUrlNavigation: 'reload' + }) ], - exports: [RouterModule], + exports: [ RouterModule ] }) -export class AppRoutingModule {} +export class AppRoutingModule { } diff --git a/galaxyui/src/app/app.component.html b/galaxyui/src/app/app.component.html index 1eb04eedc..2355877cb 100644 --- a/galaxyui/src/app/app.component.html +++ b/galaxyui/src/app/app.component.html @@ -11,27 +11,32 @@ [updateActiveItemsOnClick]="false">
    -
  • - - About - -
    • -
  • - - Documentation +
  • + + + +
  •  Login
  • - - {{ username }} + {{ username }}
    • Preferences
      • diff --git a/galaxyui/src/app/app.component.spec.ts b/galaxyui/src/app/app.component.spec.ts index a1ea86572..bcbdf36b3 100644 --- a/galaxyui/src/app/app.component.spec.ts +++ b/galaxyui/src/app/app.component.spec.ts @@ -1,25 +1,27 @@ -import { async, TestBed } from '@angular/core/testing'; +import { TestBed, async } from '@angular/core/testing'; import { AppComponent } from './app.component'; describe('AppComponent', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [AppComponent], - }).compileComponents(); - })); - it('should create the app', async(() => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.debugElement.componentInstance; - expect(app).toBeTruthy(); - })); - it(`should have as title 'app'`, async(() => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.debugElement.componentInstance; - expect(app.title).toEqual('app'); - })); - it('should render title in a h1 tag', async(() => { - const fixture = TestBed.createComponent(AppComponent); - fixture.detectChanges(); - const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!'); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + AppComponent + ], + }).compileComponents(); + })); + it('should create the app', async(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app).toBeTruthy(); + })); + it(`should have as title 'app'`, async(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app.title).toEqual('app'); + })); + it('should render title in a h1 tag', async(() => { + const fixture = TestBed.createComponent(AppComponent); + fixture.detectChanges(); + const compiled = fixture.debugElement.nativeElement; + expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!'); + })); }); diff --git a/galaxyui/src/app/app.component.ts b/galaxyui/src/app/app.component.ts index 19beb7553..03cc92a9e 100644 --- a/galaxyui/src/app/app.component.ts +++ b/galaxyui/src/app/app.component.ts @@ -16,33 +16,49 @@ * along with Galaxy. If not, see . */ -import { Component, OnInit, TemplateRef } from '@angular/core'; +import { + Component, + OnInit, + TemplateRef +} from '@angular/core'; -import { NavigationEnd, NavigationStart, Router } from '@angular/router'; +import { + Router, + NavigationStart, + NavigationEnd +} from '@angular/router'; -import { BsModalService } from 'ngx-bootstrap/modal'; -import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; +import { DOCUMENT } from '@angular/common'; + +import { BsModalService } from 'ngx-bootstrap/modal'; +import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; -import { AboutModalConfig } from 'patternfly-ng/modal/about-modal-config'; -import { AboutModalEvent } from 'patternfly-ng/modal/about-modal-event'; import { NavigationItemConfig } from 'patternfly-ng/navigation/navigation-item-config'; -import { Notification } from 'patternfly-ng/notification'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { AboutModalConfig } from 'patternfly-ng/modal/about-modal-config'; +import { AboutModalEvent } from 'patternfly-ng/modal/about-modal-event'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { Notification } from 'patternfly-ng/notification'; + +import { AuthService } from './auth/auth.service'; +import { ApiRootService } from './resources/api-root/api-root.service'; +import { ApiRoot } from './resources/api-root/api-root'; -import { AuthService } from './auth/auth.service'; -import { ApiRootService } from './resources/api-root/api-root.service'; -import { BodyCommand, PFBodyService } from './resources/pf-body/pf-body.service'; +import { + BodyCommand, + PFBodyService +} from './resources/pf-body/pf-body.service'; @Component({ selector: 'galaxy-nav', - styleUrls: ['./app.component.less'], - templateUrl: './app.component.html', + styleUrls: ['./app.component.less'], + templateUrl: './app.component.html' }) export class AppComponent implements OnInit { + constructor( - private router: Router, - private authService: AuthService, + private router: Router, + private authService: AuthService, private apiRootService: ApiRootService, private modalService: BsModalService, private notificationService: NotificationService, @@ -51,22 +67,22 @@ export class AppComponent implements OnInit { this.router.events.subscribe(event => { if (event instanceof NavigationEnd || event instanceof NavigationStart) { // When user navigates away from a page, remove any lingering notifications - const notices: Notification[] = this.notificationService.getNotifications(); + const notices: Notification[] = notificationService.getNotifications(); notices.forEach((notice: Notification) => { - this.notificationService.remove(notice); + notificationService.remove(notice); }); } }); } - navItems: NavigationItemConfig[] = []; - modalRef: BsModalRef; + navItems: NavigationItemConfig[] = []; + modalRef: BsModalRef; authenticated = false; - username: string = null; + username: string = null; showAbout = false; - aboutConfig: AboutModalConfig; - redirectUrl: string = null; - teamMembers: string[]; + aboutConfig: AboutModalConfig; + redirectUrl: string = null; + teamMembers: string[]; pfBody: any; ngOnInit(): void { @@ -81,9 +97,11 @@ export class AppComponent implements OnInit { this.pfBody = document.getElementById('pfContentBody'); - this.pfBodyService.currentMessage.subscribe((message: BodyCommand) => { - this.pfBody[message.propertyName] = message.propertyValue; - }); + this.pfBodyService.currentMessage.subscribe( + (message: BodyCommand) => { + this.pfBody[message.propertyName] = message.propertyValue; + } + ); // TODO add unsecured API endpoint for retrieving Galaxy version this.aboutConfig = { @@ -92,18 +110,20 @@ export class AppComponent implements OnInit { logoImageAlt: 'Ansible Galaxy', logoImageSrc: '/assets/galaxy-logo-03.svg', title: 'Galaxy', - productInfo: [{ name: 'Server', value: window.location.host }], + productInfo: [ + { name: 'Server', value: window.location.host } + ] } as AboutModalConfig; this.navItems = [ { title: 'Home', iconStyleClass: 'fa fa-home', - url: '/home', + url: '/home' }, { title: 'Search', iconStyleClass: 'fa fa-search', - url: '/search', + url: '/search' }, /*{ title: 'Partners', @@ -113,36 +133,41 @@ export class AppComponent implements OnInit { { title: 'Community', iconStyleClass: 'fa fa-users', - url: '/community', + url: '/community' }, ] as NavigationItemConfig[]; - this.apiRootService.get().subscribe(apiInfo => { - this.aboutConfig.productInfo.push({ name: 'Server Version', value: apiInfo.server_version }); - this.aboutConfig.productInfo.push({ name: 'Version Name', value: apiInfo.version_name }); - this.aboutConfig.productInfo.push({ name: 'Api Version', value: apiInfo.current_version }); - - this.teamMembers = apiInfo.team_members; - }); + this.apiRootService.get().subscribe( + (apiInfo) => { + this.aboutConfig.productInfo.push({name: 'Server Version', value: apiInfo.server_version }); + this.aboutConfig.productInfo.push({name: 'Version Name', value: apiInfo.version_name}); + this.aboutConfig.productInfo.push({name: 'Api Version', value: apiInfo.current_version }); - this.authService.me().subscribe(me => { - this.authenticated = me.authenticated; - this.username = me.username; - if (this.authenticated) { - this.aboutConfig.productInfo.push({ - name: 'User Name', - value: me.username, - }); - this.aboutConfig.productInfo.push({ - name: 'User Role', - value: me.staff ? 'Staff' : 'User', - }); + this.teamMembers = apiInfo.team_members; + } + ); - this.addNavButtons(); - } else { - this.removeNavButtons(); + this.authService.me().subscribe( + (me) => { + this.authenticated = me.authenticated; + this.username = me.username; + if (this.authenticated) { + + this.aboutConfig.productInfo.push({ + name: 'User Name', + value: me.username + }); + this.aboutConfig.productInfo.push({ + name: 'User Role', + value: (me.staff) ? 'Staff' : 'User' + }); + + this.addNavButtons(); + } else { + this.removeNavButtons(); + } } - }); + ); this.redirectUrl = this.authService.redirectUrl; } @@ -169,25 +194,25 @@ export class AppComponent implements OnInit { { title: 'My Content', iconStyleClass: 'fa fa-list', - url: '/my-content', + url: '/my-content' }, { title: 'My Imports', iconStyleClass: 'fa fa-upload', - url: '/my-imports', - }, + url: '/my-imports' + } ); } logout(): void { this.authenticated = false; this.authService.logout().subscribe( - response => { + (response) => { this.router.navigate(['/home']); }, - error => { + (error) => { console.log(error); - }, + } ); this.removeNavButtons(); } diff --git a/galaxyui/src/app/app.module.ts b/galaxyui/src/app/app.module.ts index 0fded68e4..2e3a9e49e 100644 --- a/galaxyui/src/app/app.module.ts +++ b/galaxyui/src/app/app.module.ts @@ -1,47 +1,65 @@ -import { BrowserModule } from '@angular/platform-browser'; +import { + BrowserModule +} from '@angular/platform-browser'; -import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { + NgModule, + CUSTOM_ELEMENTS_SCHEMA +} from '@angular/core'; -import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'; +import { + HttpClientModule, + HttpClientXsrfModule +} from '@angular/common/http'; -import { ModalModule, NavigationModule } from 'patternfly-ng'; +import { + NavigationModule, + ModalModule +} from 'patternfly-ng'; -import { BsDropdownModule, ModalModule as BsModalModule, TooltipModule } from 'ngx-bootstrap'; +import { + BsDropdownModule, + ModalModule as BsModalModule, + TooltipModule +} from 'ngx-bootstrap'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { NotificationModule } from 'patternfly-ng/notification/notification.module'; +import { NotificationModule } from 'patternfly-ng/notification/notification.module'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { AppRoutingModule } from './app-routing.module'; -import { AppComponent } from './app.component'; -import { AuthService } from './auth/auth.service'; -import { AuthorsModule } from './authors/authors.module'; -import { ContentDetailModule } from './content-detail/content-detail.module'; -import { ExceptionPagesModule } from './exception-pages/exception-pages.module'; -import { HomeModule } from './home/home.module'; -import { LoginModule } from './login/login.module'; -import { MyContentModule } from './my-content/my-content.module'; -import { ApiRootService } from './resources/api-root/api-root.service'; -import { CloudPlatformService } from './resources/cloud-platforms/cloud-platform.service'; -import { ContentBlocksService } from './resources/content-blocks/content-blocks.service'; -import { ContentSearchService } from './resources/content-search/content-search.service'; -import { ContentTypeService } from './resources/content-types/content-type.service'; -import { ContentService } from './resources/content/content.service'; -import { ImportsService } from './resources/imports/imports.service'; -import { NamespaceService } from './resources/namespaces/namespace.service'; -import { PFBodyService } from './resources/pf-body/pf-body.service'; -import { PlatformService } from './resources/platforms/platform.service'; -import { ProviderSourceService } from './resources/provider-namespaces/provider-source.service'; -import { RepositoryService } from './resources/repositories/repository.service'; -import { RepositoryImportService } from './resources/repository-imports/repository-import.service'; -import { TagsService } from './resources/tags/tags.service'; -import { UserService } from './resources/users/user.service'; -// import { MyImportsModule } from './my-imports/my-imports.module'; -// import { SearchModule } from './search/search.module'; +import { HomeModule } from './home/home.module'; +import { LoginModule } from './login/login.module'; +import { MyContentModule } from './my-content/my-content.module'; +import { MyImportsModule } from './my-imports/my-imports.module'; +import { SearchModule } from './search/search.module'; import { UserNotificationsComponent } from './user-notifications/user-notifications.component'; -import { VendorsModule } from './vendors/vendors.module'; +import { AuthorsModule } from './authors/authors.module'; +import { VendorsModule } from './vendors/vendors.module'; +import { ContentDetailModule } from './content-detail/content-detail.module'; +import { AuthService } from './auth/auth.service'; +import { NamespaceService } from './resources/namespaces/namespace.service'; +import { PFBodyService } from './resources/pf-body/pf-body.service'; +import { PlatformService } from './resources/platforms/platform.service'; +import { ProviderSourceService } from './resources/provider-namespaces/provider-source.service'; +import { RepositoryService } from './resources/repositories/repository.service'; +import { RepositoryImportService } from './resources/repository-imports/repository-import.service'; +import { ImportsService } from './resources/imports/imports.service'; +import { ContentBlocksService } from './resources/content-blocks/content-blocks.service'; +import { ContentSearchService } from './resources/content-search/content-search.service'; +import { ContentTypeService } from './resources/content-types/content-type.service'; +import { CloudPlatformService } from './resources/cloud-platforms/cloud-platform.service'; +import { TagsService } from './resources/tags/tags.service'; +import { ContentService } from './resources/content/content.service'; +import { AppRoutingModule } from './app-routing.module'; +import { AppComponent } from './app.component'; +import { ApiRootService } from './resources/api-root/api-root.service'; +import { ExceptionPagesModule } from './exception-pages/exception-pages.module'; +import { UserService } from './resources/users/user.service'; @NgModule({ - declarations: [AppComponent, UserNotificationsComponent], + declarations: [ + AppComponent, + UserNotificationsComponent + ], imports: [ HttpClientModule, HttpClientXsrfModule.withOptions({ @@ -57,14 +75,14 @@ import { VendorsModule } from './vendors/vendors.module'; HomeModule, LoginModule, MyContentModule, - // MyImportsModule, - // SearchModule, + MyImportsModule, + SearchModule, ModalModule, ContentDetailModule, ExceptionPagesModule, VendorsModule, AuthorsModule, - AppRoutingModule, + AppRoutingModule ], providers: [ AuthService, @@ -83,9 +101,11 @@ import { VendorsModule } from './vendors/vendors.module'; UserService, ContentService, ApiRootService, - PFBodyService, + PFBodyService + ], + schemas: [ + CUSTOM_ELEMENTS_SCHEMA ], - schemas: [CUSTOM_ELEMENTS_SCHEMA], - bootstrap: [AppComponent], + bootstrap: [AppComponent] }) export class AppModule {} diff --git a/galaxyui/src/app/auth/auth.service.ts b/galaxyui/src/app/auth/auth.service.ts index f59939396..04e75104a 100644 --- a/galaxyui/src/app/auth/auth.service.ts +++ b/galaxyui/src/app/auth/auth.service.ts @@ -1,64 +1,77 @@ -import { Injectable } from '@angular/core'; +import { + Injectable +} from '@angular/core'; -import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { + HttpClient, + HttpHeaders +} from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { of } from 'rxjs/observable/of'; -import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; +import { + CanActivate, + Router, + RouterStateSnapshot, + ActivatedRouteSnapshot +} from '@angular/router'; -export interface IMe { - url: string; - related: object; + +export interface Me { + url: string; + related: object; summary_fields: object; - id: number; - authenticated: boolean; - staff: boolean; - username: string; - created: string; - modified: string; - active: boolean; + id: number; + authenticated: boolean; + staff: boolean; + username: string; + created: string; + modified: string; + active: boolean; } @Injectable() export class AuthService implements CanActivate { - constructor(private http: HttpClient, private router: Router) {} + constructor( + private http: HttpClient, + private router: Router + ) {} headers: HttpHeaders = new HttpHeaders().set('Content-Type', 'application/json'); - meCache: IMe = null; + meCache: Me = null; meUrl = '/api/v1/me/'; redirectUrl = '/home'; - me(): Observable { + me(): Observable { if (this.meCache) { return of(this.meCache); } - return this.http.get(this.meUrl, { headers: this.headers }).map(result => { - this.meCache = result; - return result; - }); + return this.http.get(this.meUrl, {headers: this.headers}) + .map((result) => { this.meCache = result; return result; }); } logout(): Observable { this.meCache = null; - return this.http.post('/api/v1/account/logout', {}, { headers: this.headers }).map(result => { - this.meCache = null; - this.redirectUrl = '/home'; - return result; - }); + return this.http.post('/api/v1/account/logout', {}, {headers: this.headers}) + .map((result) => { + this.meCache = null; + this.redirectUrl = '/home'; + return result; + }); } checkPermissions(route: ActivatedRouteSnapshot): boolean { let result = true; if (!this.meCache.authenticated) { // User is not authenticated - this.router.navigate(['/login', { error: true }]); + this.router.navigate(['/login', {error: true}]); result = false; } if (route['data'] && route['data']['expectedRole']) { if (route['data']['expectedRole'] === 'isStaff' && !this.meCache.staff) { // User does not have is_staff=True - this.router.navigate(['/access-denied', { error: true }]); + this.router.navigate(['/access-denied', {error: true}]); result = false; } } @@ -73,9 +86,10 @@ export class AuthService implements CanActivate { observer.complete(); }); } - return this.http.get(this.meUrl, { headers: this.headers }).map(result => { - this.meCache = result; - return this.checkPermissions(route); - }); + return this.http.get(this.meUrl, {headers: this.headers}) + .map((result) => { + this.meCache = result; + return this.checkPermissions(route); + }); } } diff --git a/galaxyui/src/app/authors/authors.component.spec.ts b/galaxyui/src/app/authors/authors.component.spec.ts index b8684ece0..9fd41215c 100644 --- a/galaxyui/src/app/authors/authors.component.spec.ts +++ b/galaxyui/src/app/authors/authors.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AuthorsComponent } from './authors.component'; describe('AuthorsComponent', () => { - let component: AuthorsComponent; - let fixture: ComponentFixture; + let component: AuthorsComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [AuthorsComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AuthorsComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(AuthorsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AuthorsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/authors/authors.component.ts b/galaxyui/src/app/authors/authors.component.ts index e6d8e9c72..9730f097b 100644 --- a/galaxyui/src/app/authors/authors.component.ts +++ b/galaxyui/src/app/authors/authors.component.ts @@ -1,38 +1,53 @@ -import { Component, OnInit } from '@angular/core'; - -import { ActivatedRoute, Router } from '@angular/router'; - -import { ActionConfig } from 'patternfly-ng/action/action-config'; -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { ListEvent } from 'patternfly-ng/list/list-event'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; -import { SortConfig } from 'patternfly-ng/sort/sort-config'; -import { SortEvent } from 'patternfly-ng/sort/sort-event'; -import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; - -import { Namespace } from '../resources/namespaces/namespace'; -import { NamespaceService } from '../resources/namespaces/namespace.service'; -import { PFBodyService } from '../resources/pf-body/pf-body.service'; - -import { ContentTypes, ContentTypesIconClasses, ContentTypesPluralChoices } from '../enums/content-types.enum'; +import { + Component, + OnInit +} from '@angular/core'; + +import { + ActivatedRoute, + Router +} from '@angular/router'; + +import { Action } from 'patternfly-ng/action/action'; +import { ActionConfig } from 'patternfly-ng/action/action-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { SortConfig } from 'patternfly-ng/sort/sort-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { SortField } from 'patternfly-ng/sort/sort-field'; +import { ToolbarView } from 'patternfly-ng/toolbar/toolbar-view'; +import { SortEvent } from 'patternfly-ng/sort/sort-event'; +import { Filter } from 'patternfly-ng/filter/filter'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; + +import { Namespace } from '../resources/namespaces/namespace'; +import { NamespaceService } from '../resources/namespaces/namespace.service'; +import { PFBodyService } from '../resources/pf-body/pf-body.service'; + +import { + ContentTypes, + ContentTypesPluralChoices, + ContentTypesIconClasses +} from '../enums/content-types.enum'; @Component({ selector: 'app-authors', templateUrl: './authors.component.html', - styleUrls: ['./authors.component.less'], + styleUrls: ['./authors.component.less'] }) export class AuthorsComponent implements OnInit { + constructor( private router: Router, - private route: ActivatedRoute, - private namespaceService: NamespaceService, - private pfBody: PFBodyService, + private route: ActivatedRoute, + private namespaceService: NamespaceService, + private pfBody: PFBodyService, ) {} pageTitle = 'Community Authors'; @@ -49,7 +64,7 @@ export class AuthorsComponent implements OnInit { paginationConfig: PaginationConfig; sortBy = 'name'; filterBy: any = { - is_vendor: false, + 'is_vendor': false }; pageNumber = 1; pageSize = 10; @@ -59,7 +74,7 @@ export class AuthorsComponent implements OnInit { this.emptyStateConfig = { info: '', title: 'No contributors match your search', - iconStyleClass: 'pficon pficon-filter', + iconStyleClass: 'pficon pficon-filter' } as EmptyStateConfig; this.filterConfig = { @@ -68,17 +83,17 @@ export class AuthorsComponent implements OnInit { id: 'name', title: 'Name', placeholder: 'Filter by Name...', - type: FilterType.TEXT, + type: FilterType.TEXT }, { id: 'description', title: 'Description', placeholder: 'Filter by Description...', - type: FilterType.TEXT, - }, + type: FilterType.TEXT + } ] as FilterField[], resultsCount: 0, - appliedFilters: [] as Filter[], + appliedFilters: [] as Filter[] } as FilterConfig; this.sortConfig = { @@ -86,27 +101,27 @@ export class AuthorsComponent implements OnInit { { id: 'name', title: 'Name', - sortType: 'alpha', + sortType: 'alpha' }, { id: 'description', title: 'Description', - sortType: 'alpha', - }, + sortType: 'alpha' + } ], - isAscending: true, + isAscending: true } as SortConfig; this.toolbarActionConfig = { primaryActions: [], - moreActions: [], + moreActions: [] } as ActionConfig; this.toolbarConfig = { actionConfig: this.toolbarActionConfig, filterConfig: this.filterConfig, sortConfig: this.sortConfig, - views: [], + views: [] } as ToolbarConfig; this.listConfig = { @@ -116,16 +131,16 @@ export class AuthorsComponent implements OnInit { selectionMatchProp: 'name', showCheckbox: false, useExpandItems: false, - emptyStateConfig: this.emptyStateConfig, + emptyStateConfig: this.emptyStateConfig } as ListConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; - this.route.data.subscribe(data => { + this.route.data.subscribe((data) => { this.items = data['namespaces']['results']; this.paginationConfig.totalItems = data['namespaces']['count']; this.prepareNamespaces(); @@ -147,7 +162,7 @@ export class AuthorsComponent implements OnInit { }); } else { this.filterBy = { - is_vendor: false, + 'is_vendor': false }; } this.pageNumber = 1; @@ -232,12 +247,13 @@ export class AuthorsComponent implements OnInit { this.filterBy['page_size'] = this.pageSize; this.filterBy['page'] = this.pageNumber; this.filterBy['order'] = this.sortBy; - this.namespaceService.pagedQuery(this.filterBy).subscribe(result => { - this.items = result.results as Namespace[]; - this.prepareNamespaces(); - this.filterConfig.resultsCount = result.count; - this.paginationConfig.totalItems = result.count; - this.pageLoading = false; - }); + this.namespaceService.pagedQuery(this.filterBy) + .subscribe(result => { + this.items = result.results as Namespace[]; + this.prepareNamespaces(); + this.filterConfig.resultsCount = result.count; + this.paginationConfig.totalItems = result.count; + this.pageLoading = false; + }); } } diff --git a/galaxyui/src/app/authors/authors.module.ts b/galaxyui/src/app/authors/authors.module.ts index bd673e8ce..c16d4f3dc 100644 --- a/galaxyui/src/app/authors/authors.module.ts +++ b/galaxyui/src/app/authors/authors.module.ts @@ -1,20 +1,21 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; -import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { ActionModule } from 'patternfly-ng/action/action.module'; -import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; -import { FilterModule } from 'patternfly-ng/filter/filter.module'; -import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; -import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; -import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { ActionModule } from 'patternfly-ng/action/action.module'; +import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; +import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; +import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; +import { FilterModule } from 'patternfly-ng/filter/filter.module'; +import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; + +import { AuthorsRoutingModule } from './authors.routing.module'; +import { AuthorsComponent } from './authors.component'; +import { AuthorDetailComponent } from './detail/author-detail.component'; +import { DetailActionsComponent } from './detail/detail-actions/detail-actions.component'; +import { PageHeaderModule } from '../page-header/page-header.module'; +import { PageLoadingModule } from '../page-loading/page-loading.module'; -import { PageHeaderModule } from '../page-header/page-header.module'; -import { PageLoadingModule } from '../page-loading/page-loading.module'; -import { AuthorsComponent } from './authors.component'; -import { AuthorsRoutingModule } from './authors.routing.module'; -import { AuthorDetailComponent } from './detail/author-detail.component'; -import { DetailActionsComponent } from './detail/detail-actions/detail-actions.component'; @NgModule({ imports: [ @@ -28,8 +29,12 @@ import { DetailActionsComponent } from './detail/detail-actions/detail-actions.c AuthorsRoutingModule, PageHeaderModule, PageLoadingModule, - ActionModule, + ActionModule ], - declarations: [DetailActionsComponent, AuthorsComponent, AuthorDetailComponent], + declarations: [ + DetailActionsComponent, + AuthorsComponent, + AuthorDetailComponent + ] }) -export class AuthorsModule {} +export class AuthorsModule { } diff --git a/galaxyui/src/app/authors/authors.resolver.service.ts b/galaxyui/src/app/authors/authors.resolver.service.ts index 8e3dfb211..e9f42bf2e 100644 --- a/galaxyui/src/app/authors/authors.resolver.service.ts +++ b/galaxyui/src/app/authors/authors.resolver.service.ts @@ -1,29 +1,45 @@ -import { Injectable } from '@angular/core'; +import { + Injectable +} from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot +} from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs/Observable'; +import { forkJoin } from 'rxjs/observable/forkJoin'; -import { Namespace } from '../resources/namespaces/namespace'; -import { NamespaceService } from '../resources/namespaces/namespace.service'; -import { PagedResponse } from '../resources/paged-response'; -import { RepositoryService } from '../resources/repositories/repository.service'; +import { ContentService } from '../resources/content/content.service'; +import { Content } from '../resources/content/content'; +import { NamespaceService } from '../resources/namespaces/namespace.service'; +import { Namespace } from '../resources/namespaces/namespace'; +import { RepositoryService } from '../resources/repositories/repository.service'; +import { PagedResponse } from '../resources/paged-response'; @Injectable() export class NamespaceListResolver implements Resolve { - constructor(private namespaceService: NamespaceService) {} + constructor( + private namespaceService: NamespaceService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.namespaceService.pagedQuery({ is_vendor: false }); + return this.namespaceService.pagedQuery({'is_vendor': false}); } } @Injectable() export class NamespaceDetailResolver implements Resolve { - constructor(private namespaceService: NamespaceService) {} + constructor( + private namespaceService: NamespaceService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { const namespace = route.params['namespace'].toLowerCase(); const params = { - name__iexact: namespace, + name__iexact: namespace }; return this.namespaceService.query(params).map(results => { if (results && results.length) { @@ -37,11 +53,14 @@ export class NamespaceDetailResolver implements Resolve { @Injectable() export class RepositoryResolver implements Resolve { - constructor(private repositoryService: RepositoryService) {} + constructor( + private repositoryService: RepositoryService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { const namespace = route.params['namespace'].toLowerCase(); const params = { - provider_namespace__namespace__name__iexact: namespace, + 'provider_namespace__namespace__name__iexact': namespace, }; return this.repositoryService.pagedQuery(params); } diff --git a/galaxyui/src/app/authors/authors.routing.module.ts b/galaxyui/src/app/authors/authors.routing.module.ts index 823435a11..9b95133ef 100644 --- a/galaxyui/src/app/authors/authors.routing.module.ts +++ b/galaxyui/src/app/authors/authors.routing.module.ts @@ -1,25 +1,49 @@ -import { NgModule } from '@angular/core'; +import { + NgModule -import { RouterModule, Routes } from '@angular/router'; +} from '@angular/core'; -import { NamespaceDetailResolver, NamespaceListResolver, RepositoryResolver } from './authors.resolver.service'; +import { + Routes, + RouterModule +} from '@angular/router'; -import { AuthorsComponent } from './authors.component'; +import { + NamespaceDetailResolver, + NamespaceListResolver, + RepositoryResolver +} from './authors.resolver.service'; -const routes: Routes = [ - { +import { AuthorsComponent } from './authors.component'; +import { AuthorDetailComponent } from './detail/author-detail.component'; + + +const routes: Routes = [{ path: 'community', component: AuthorsComponent, resolve: { - namespaces: NamespaceListResolver, - }, - }, - // ':namespace/ moved to app-routing.module -]; + namespaces: NamespaceListResolver + } + }, { + path: ':namespace', + component: AuthorDetailComponent, + resolve: { + namespace: NamespaceDetailResolver, + repositories: RepositoryResolver + } + }]; @NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], - providers: [NamespaceDetailResolver, NamespaceListResolver, RepositoryResolver], + imports: [ + RouterModule.forChild(routes) + ], + exports: [ + RouterModule + ], + providers: [ + NamespaceDetailResolver, + NamespaceListResolver, + RepositoryResolver + ] }) -export class AuthorsRoutingModule {} +export class AuthorsRoutingModule { } diff --git a/galaxyui/src/app/authors/detail/author-detail.component.spec.ts b/galaxyui/src/app/authors/detail/author-detail.component.spec.ts index 7b9d128e7..a21029e46 100644 --- a/galaxyui/src/app/authors/detail/author-detail.component.spec.ts +++ b/galaxyui/src/app/authors/detail/author-detail.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AuthorDetailComponent } from './author-detail.component'; describe('AuthorsComponent', () => { - let component: AuthorDetailComponent; - let fixture: ComponentFixture; + let component: AuthorDetailComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [AuthorDetailComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AuthorDetailComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(AuthorDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AuthorDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/authors/detail/author-detail.component.ts b/galaxyui/src/app/authors/detail/author-detail.component.ts index e8d5e1667..c0e94374b 100644 --- a/galaxyui/src/app/authors/detail/author-detail.component.ts +++ b/galaxyui/src/app/authors/detail/author-detail.component.ts @@ -1,40 +1,59 @@ -import { Component, OnInit } from '@angular/core'; +import { + Component, + OnInit +} from '@angular/core'; + +import { + ActivatedRoute, + Router +} from '@angular/router'; + +import * as moment from 'moment'; + +import { Action } from 'patternfly-ng/action/action'; +import { ActionConfig } from 'patternfly-ng/action/action-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { SortConfig } from 'patternfly-ng/sort/sort-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { SortField } from 'patternfly-ng/sort/sort-field'; +import { ToolbarView } from 'patternfly-ng/toolbar/toolbar-view'; +import { SortEvent } from 'patternfly-ng/sort/sort-event'; +import { Filter } from 'patternfly-ng/filter/filter'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; + +import { Namespace } from '../../resources/namespaces/namespace'; +import { PFBodyService } from '../../resources/pf-body/pf-body.service'; + +import { RepositoryService } from '../../resources/repositories/repository.service'; +import { Repository } from '../../resources/repositories/repository'; + +import { + ContentTypes, + ContentTypesPluralChoices, + ContentTypesIconClasses +} from '../../enums/content-types.enum'; + +import { + RepoFormats, + RepoFormatsTooltips, + RepoFormatsIconClasses +} from '../../enums/repo-types.enum'; -import { ActivatedRoute, Router } from '@angular/router'; - -import * as moment from 'moment'; - -import { ActionConfig } from 'patternfly-ng/action/action-config'; -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterEvent } from 'patternfly-ng/filter/filter-event'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { ListEvent } from 'patternfly-ng/list/list-event'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; -import { SortConfig } from 'patternfly-ng/sort/sort-config'; -import { SortEvent } from 'patternfly-ng/sort/sort-event'; -import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; - -import { Namespace } from '../../resources/namespaces/namespace'; -import { PFBodyService } from '../../resources/pf-body/pf-body.service'; - -import { Repository } from '../../resources/repositories/repository'; -import { RepositoryService } from '../../resources/repositories/repository.service'; - -import { ContentTypes, ContentTypesIconClasses, ContentTypesPluralChoices } from '../../enums/content-types.enum'; - -import { RepoFormats, RepoFormatsIconClasses, RepoFormatsTooltips } from '../../enums/repo-types.enum'; @Component({ selector: 'app-author-detail', templateUrl: './author-detail.component.html', - styleUrls: ['./author-detail.component.less'], + styleUrls: ['./author-detail.component.less'] }) export class AuthorDetailComponent implements OnInit { + constructor( private router: Router, private route: ActivatedRoute, @@ -72,7 +91,7 @@ export class AuthorDetailComponent implements OnInit { this.emptyStateConfig = { info: '', title: 'No repositories match your search', - iconStyleClass: 'pficon pficon-filter', + iconStyleClass: 'pficon pficon-filter' } as EmptyStateConfig; this.filterConfig = { @@ -81,17 +100,17 @@ export class AuthorDetailComponent implements OnInit { id: 'name', title: 'Name', placeholder: 'Filter by Name...', - type: FilterType.TEXT, + type: FilterType.TEXT }, { id: 'description', title: 'Description', placeholder: 'Filter by Description...', - type: FilterType.TEXT, - }, + type: FilterType.TEXT + } ] as FilterField[], resultsCount: 0, - appliedFilters: [] as Filter[], + appliedFilters: [] as Filter[] } as FilterConfig; this.sortConfig = { @@ -99,42 +118,42 @@ export class AuthorDetailComponent implements OnInit { { id: 'name', title: 'Name', - sortType: 'alpha', + sortType: 'alpha' }, { id: 'download_count', title: 'Downloads', - sortType: 'numeric', + sortType: 'numeric' }, { id: 'stargazers_count', title: 'Stars', - sortType: 'numeric', + sortType: 'numeric' }, { id: 'watchers_count', title: 'Watchers', - sortType: 'numeric', + sortType: 'numeric' }, { id: 'forks_count', title: 'Forks', - sortType: 'numeric', + sortType: 'numeric' }, ], - isAscending: true, + isAscending: true } as SortConfig; this.toolbarActionConfig = { primaryActions: [], - moreActions: [], + moreActions: [] } as ActionConfig; this.toolbarConfig = { actionConfig: this.toolbarActionConfig, filterConfig: this.filterConfig, sortConfig: this.sortConfig, - views: [], + views: [] } as ToolbarConfig; this.listConfig = { @@ -144,16 +163,16 @@ export class AuthorDetailComponent implements OnInit { selectionMatchProp: 'name', showCheckbox: false, useExpandItems: false, - emptyStateConfig: this.emptyStateConfig, + emptyStateConfig: this.emptyStateConfig } as ListConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; - this.route.data.subscribe(data => { + this.route.data.subscribe((data) => { this.namespace = data['namespace']; this.items = data['repositories']['results']; this.paginationConfig.totalItems = data['repositories']['count']; @@ -179,7 +198,8 @@ export class AuthorDetailComponent implements OnInit { handleListClick($event: ListEvent): void { const repository = $event.item; - this.router.navigate(['/', repository.summary_fields['namespace']['name'], repository.name]); + this.router.navigate(['/', repository.summary_fields['namespace']['name'], + repository.name]); } filterChanged($event: FilterEvent): void { @@ -223,6 +243,7 @@ export class AuthorDetailComponent implements OnInit { } } + // private private searchRepositories() { @@ -231,13 +252,14 @@ export class AuthorDetailComponent implements OnInit { this.filterBy['order'] = this.sortBy; this.filterBy['page_size'] = this.pageSize; this.filterBy['page'] = this.pageNumber; - this.repositoryService.pagedQuery(this.filterBy).subscribe(response => { - this.items = response.results as Repository[]; - this.prepareRepositories(); - this.filterConfig.resultsCount = response.count; - this.paginationConfig.totalItems = response.count; - this.pageLoading = false; - }); + this.repositoryService.pagedQuery(this.filterBy).subscribe( + response => { + this.items = response.results as Repository[]; + this.prepareRepositories(); + this.filterConfig.resultsCount = response.count; + this.paginationConfig.totalItems = response.count; + this.pageLoading = false; + }); } private parepareNamespace() { @@ -308,5 +330,6 @@ export class AuthorDetailComponent implements OnInit { } } }); + } } diff --git a/galaxyui/src/app/authors/detail/detail-actions/detail-actions.component.ts b/galaxyui/src/app/authors/detail/detail-actions/detail-actions.component.ts index 903aebb6e..b328d8747 100644 --- a/galaxyui/src/app/authors/detail/detail-actions/detail-actions.component.ts +++ b/galaxyui/src/app/authors/detail/detail-actions/detail-actions.component.ts @@ -1,18 +1,33 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + OnInit, + Input +} from '@angular/core'; -import { Router } from '@angular/router'; +import { Router } from '@angular/router'; -import { ActionConfig } from 'patternfly-ng/action/action-config'; +import { Action } from 'patternfly-ng/action/action'; +import { ActionConfig } from 'patternfly-ng/action/action-config'; + +import { Repository } from '../../../resources/repositories/repository'; + +import { + RepoFormats, + RepoFormatsTooltips, + RepoFormatsIconClasses +} from '../../../enums/repo-types.enum'; -import { Repository } from '../../../resources/repositories/repository'; @Component({ selector: 'author-detail-actions', templateUrl: './detail-actions.component.html', - styleUrls: ['./detail-actions.component.less'], + styleUrls: ['./detail-actions.component.less'] }) export class DetailActionsComponent implements OnInit { - constructor(private router: Router) {} + + constructor( + private router: Router + ) {} _repository: Repository; actionConfig: ActionConfig; @@ -28,33 +43,29 @@ export class DetailActionsComponent implements OnInit { ngOnInit() { this.actionConfig = { - primaryActions: [ - { - id: 'more', - title: 'View content', - tooltip: 'View content details', - }, - ], - moreActions: [ - { - id: 'scmView', - title: 'View SCM Repository', - tooltip: 'Opens the SCM repository in new browser window or tab', - }, - { - disabled: this._repository.issue_tracker_url ? true : false, - id: 'issueLog', - title: 'Visit the Issue Log', - tooltip: 'Opens the Issue Log in new browser window or tab', - }, - ], + primaryActions: [{ + id: 'more', + title: 'View content', + tooltip: 'View content details' + }], + moreActions: [{ + id: 'scmView', + title: 'View SCM Repository', + tooltip: 'Opens the SCM repository in new browser window or tab' + }, { + disabled: (this._repository.issue_tracker_url) ? true : false, + id: 'issueLog', + title: 'Visit the Issue Log', + tooltip: 'Opens the Issue Log in new browser window or tab' + }], } as ActionConfig; } handleAction($event) { switch ($event.id) { case 'more': - this.router.navigate(['/', this.repository.summary_fields['namespace']['name'], this.repository.name]); + this.router.navigate(['/', this.repository.summary_fields['namespace']['name'], + this.repository.name]); break; case 'scmView': window.open(this.repository.external_url, '_blank'); diff --git a/galaxyui/src/app/content-detail/cards/cloud-platforms/cloud-platforms.component.ts b/galaxyui/src/app/content-detail/cards/cloud-platforms/cloud-platforms.component.ts index 0f52ec5af..4f316d8a8 100644 --- a/galaxyui/src/app/content-detail/cards/cloud-platforms/cloud-platforms.component.ts +++ b/galaxyui/src/app/content-detail/cards/cloud-platforms/cloud-platforms.component.ts @@ -1,24 +1,31 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; + +import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; +import { Content } from '../../../resources/content/content'; +import { Repository } from '../../../resources/repositories/repository'; -import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; @Component({ selector: 'card-cloud-platforms', templateUrl: './cloud-platforms.component.html', - styleUrls: ['./cloud-platforms.component.less'], + styleUrls: ['./cloud-platforms.component.less'] }) export class CardCloudPlatformsComponent implements OnInit { + constructor() {} - @Input() - cloudPlatforms: any[]; + @Input() cloudPlatforms: any[]; config: CardConfig; ngOnInit() { this.config = { titleBorder: true, - topBorder: true, + topBorder: true } as CardConfig; } } diff --git a/galaxyui/src/app/content-detail/cards/dependencies/dependencies.component.ts b/galaxyui/src/app/content-detail/cards/dependencies/dependencies.component.ts index 44137d2ce..2bcbfbe38 100644 --- a/galaxyui/src/app/content-detail/cards/dependencies/dependencies.component.ts +++ b/galaxyui/src/app/content-detail/cards/dependencies/dependencies.component.ts @@ -1,13 +1,21 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; + +import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; +import { Content } from '../../../resources/content/content'; +import { Repository } from '../../../resources/repositories/repository'; -import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; @Component({ selector: 'card-dependencies', templateUrl: './dependencies.component.html', - styleUrls: ['./dependencies.component.less'], + styleUrls: ['./dependencies.component.less'] }) export class CardDependenciesComponent implements OnInit { + constructor() {} private _dependencies: any[]; @@ -19,7 +27,7 @@ export class CardDependenciesComponent implements OnInit { deps.forEach(d => { this._dependencies.push({ name: `${d.namespace}.${d.name}`, - url: `/${d.namespace}/${d.name}`, + url: `/${d.namespace}/${d.name}` }); }); } @@ -34,7 +42,7 @@ export class CardDependenciesComponent implements OnInit { ngOnInit() { this.config = { titleBorder: true, - topBorder: true, + topBorder: true } as CardConfig; } } diff --git a/galaxyui/src/app/content-detail/cards/info/card-info.component.ts b/galaxyui/src/app/content-detail/cards/info/card-info.component.ts index bf379608b..fa26b9cd0 100644 --- a/galaxyui/src/app/content-detail/cards/info/card-info.component.ts +++ b/galaxyui/src/app/content-detail/cards/info/card-info.component.ts @@ -1,19 +1,25 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; -import { RepoFormats } from '../../../enums/repo-types.enum'; -import { ViewTypes } from '../../../enums/view-types.enum'; -import { Content } from '../../../resources/content/content'; -import { Repository } from '../../../resources/repositories/repository'; +import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; +import { Content } from '../../../resources/content/content'; +import { Repository } from '../../../resources/repositories/repository'; +import { ViewTypes } from '../../../enums/view-types.enum'; +import { RepoFormats } from '../../../enums/repo-types.enum'; + +import { ContentTypesPlural } from '../../../enums/content-types.enum'; -import { ContentTypesPlural } from '../../../enums/content-types.enum'; @Component({ selector: 'card-info', templateUrl: './card-info.component.html', - styleUrls: ['./card-info.component.less'], + styleUrls: ['./card-info.component.less'] }) export class CardInfoComponent implements OnInit { + constructor() {} _repoContent: Content; @@ -59,11 +65,12 @@ export class CardInfoComponent implements OnInit { `${this._repoContent.summary_fields['repository']['name']}`; } else { this._repoContent['install_cmd'] = - `ansible-galaxy install ${this._repoContent.summary_fields['namespace']['name']}.` + `${this._repoContent.name}`; + `ansible-galaxy install ${this._repoContent.summary_fields['namespace']['name']}.` + + `${this._repoContent.name}`; } this._repoContent['tags'] = this._repoContent.summary_fields['tags']; this._repoContent['hasTags'] = - this.repoContent.summary_fields['tags'] && this._repoContent.summary_fields['tags'].length ? true : false; + (this.repoContent.summary_fields['tags'] && this._repoContent.summary_fields['tags'].length) ? true : false; this.example_name = this._repoContent.name; this.example_type = this._repoContent.content_type; this.example_type_plural = ContentTypesPlural[this._repoContent.content_type]; @@ -73,6 +80,7 @@ export class CardInfoComponent implements OnInit { return this._repoContent; } + config: CardConfig; ViewTypes: typeof ViewTypes = ViewTypes; @@ -82,7 +90,7 @@ export class CardInfoComponent implements OnInit { this.config = { title: 'Info', titleBorder: true, - topBorder: true, + topBorder: true } as CardConfig; } diff --git a/galaxyui/src/app/content-detail/cards/platforms/platforms.component.ts b/galaxyui/src/app/content-detail/cards/platforms/platforms.component.ts index ceac07e23..76f49cc35 100644 --- a/galaxyui/src/app/content-detail/cards/platforms/platforms.component.ts +++ b/galaxyui/src/app/content-detail/cards/platforms/platforms.component.ts @@ -1,25 +1,31 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; -import { Platform } from '../../../resources/platforms/platform'; +import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; +import { Content } from '../../../resources/content/content'; +import { Repository } from '../../../resources/repositories/repository'; +import { Platform } from '../../../resources/platforms/platform'; @Component({ selector: 'card-platforms', templateUrl: './platforms.component.html', - styleUrls: ['./platforms.component.less'], + styleUrls: ['./platforms.component.less'] }) export class CardPlatformsComponent implements OnInit { + constructor() {} - @Input() - platforms: Platform[]; + @Input() platforms: Platform[]; config: CardConfig; ngOnInit() { this.config = { titleBorder: true, - topBorder: true, + topBorder: true } as CardConfig; } } diff --git a/galaxyui/src/app/content-detail/cards/versions/versions.component.ts b/galaxyui/src/app/content-detail/cards/versions/versions.component.ts index 5c65534de..8a8fbf89a 100644 --- a/galaxyui/src/app/content-detail/cards/versions/versions.component.ts +++ b/galaxyui/src/app/content-detail/cards/versions/versions.component.ts @@ -1,15 +1,22 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; +import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; +import { Content } from '../../../resources/content/content'; +import { Repository } from '../../../resources/repositories/repository'; -import * as moment from 'moment'; +import * as moment from 'moment'; @Component({ selector: 'card-versions', templateUrl: './versions.component.html', - styleUrls: ['./versions.component.less'], + styleUrls: ['./versions.component.less'] }) export class CardVersionsComponent implements OnInit { + constructor() {} _versions: any[]; @@ -24,16 +31,14 @@ export class CardVersionsComponent implements OnInit { } } - get versions(): any[] { - return this._versions; - } + get versions(): any[] { return this._versions; } config: CardConfig; ngOnInit() { this.config = { titleBorder: true, - topBorder: true, + topBorder: true } as CardConfig; } } diff --git a/galaxyui/src/app/content-detail/content-detail.component.spec.ts b/galaxyui/src/app/content-detail/content-detail.component.spec.ts index dc45cbe02..00c63bd7d 100644 --- a/galaxyui/src/app/content-detail/content-detail.component.spec.ts +++ b/galaxyui/src/app/content-detail/content-detail.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ContentDetailComponent } from './content-detail.component'; describe('ContentDetailComponent', () => { - let component: ContentDetailComponent; - let fixture: ComponentFixture; + let component: ContentDetailComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ContentDetailComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ContentDetailComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(ContentDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(ContentDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/content-detail/content-detail.component.ts b/galaxyui/src/app/content-detail/content-detail.component.ts index 307f6214d..be3b4466d 100644 --- a/galaxyui/src/app/content-detail/content-detail.component.ts +++ b/galaxyui/src/app/content-detail/content-detail.component.ts @@ -1,25 +1,35 @@ -import { Component, OnInit } from '@angular/core'; +import { + Component, + OnInit +} from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { + ActivatedRoute, + Router +} from '@angular/router'; -import * as moment from 'moment'; +import * as moment from 'moment'; -import { Observable } from 'rxjs/Observable'; -import { forkJoin } from 'rxjs/observable/forkJoin'; +import { Observable } from 'rxjs/Observable'; +import { forkJoin } from 'rxjs/observable/forkJoin'; import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { Action, ActionConfig } from 'patternfly-ng/action'; +import { + ActionConfig, + Action +} from 'patternfly-ng/action'; -import { ContentTypes } from '../enums/content-types.enum'; -import { RepoFormats } from '../enums/repo-types.enum'; -import { ViewTypes } from '../enums/view-types.enum'; -import { Content } from '../resources/content/content'; -import { Namespace } from '../resources/namespaces/namespace'; -import { PagedResponse } from '../resources/paged-response'; -import { Repository } from '../resources/repositories/repository'; +import { Repository } from '../resources/repositories/repository'; +import { Content } from '../resources/content/content'; +import { Namespace } from '../resources/namespaces/namespace'; +import { PagedResponse } from '../resources/paged-response'; +import { RepoChangeEvent } from './repository/repository.component'; +import { ViewTypes } from '../enums/view-types.enum'; +import { RepoFormats } from '../enums/repo-types.enum'; +import { ContentTypes } from '../enums/content-types.enum'; -import { ContentService } from '../resources/content/content.service'; +import { ContentService } from '../resources/content/content.service'; class ContentTypeCounts { apb: number; @@ -32,10 +42,15 @@ class ContentTypeCounts { @Component({ selector: 'app-content-detail', templateUrl: './content-detail.component.html', - styleUrls: ['./content-detail.component.less'], + styleUrls: ['./content-detail.component.less'] }) export class ContentDetailComponent implements OnInit { - constructor(private router: Router, private route: ActivatedRoute, private contentService: ContentService) {} + + constructor( + private router: Router, + private route: ActivatedRoute, + private contentService: ContentService + ) {} pageTitle = ''; pageIcon = ''; @@ -56,7 +71,7 @@ export class ContentDetailComponent implements OnInit { hasReadme = false; hasMetadata = false; metadataFilename = ''; - showingView: string = ViewTypes.detail; // Control what's displayed on lower half of page + showingView: string = ViewTypes.detail; // Control what's displayed on lower half of page metadata: object; contentCounts: ContentTypeCounts = { @@ -64,32 +79,29 @@ export class ContentDetailComponent implements OnInit { module: 0, moduleUtils: 0, plugin: 0, - role: 0, + role: 0 } as ContentTypeCounts; ngOnInit() { this.actionConfig = { - primaryActions: [ - { - id: 'search', - title: 'Search', - tooltip: 'View the search page', - }, - ], + primaryActions: [{ + id: 'search', + title: 'Search', + tooltip: 'View the search page' + }] } as ActionConfig; this.emptyStateConfig = { actions: this.actionConfig, iconStyleClass: 'fa fa-frown-o', - info: - 'Well this is embarrassing. The content you requested could not be found. ' + - 'It may not exist in the Galaxy search index. Click the Search button below, ' + - 'to search our index.', - title: 'Content Not Found', + info: 'Well this is embarrassing. The content you requested could not be found. ' + + 'It may not exist in the Galaxy search index. Click the Search button below, ' + + 'to search our index.', + title: 'Content Not Found' } as EmptyStateConfig; this.route.params.subscribe(params => { - this.route.data.subscribe(data => { + this.route.data.subscribe((data) => { this.repository = data['repository']; this.namespace = data['namespace']; this.content = data['content']; @@ -103,16 +115,15 @@ export class ContentDetailComponent implements OnInit { if (req_content_name && data['content'] && data['content'].length) { this.selectedContent = this.findSelectedContent(req_content_name); } - if ( - !this.repository || - !this.content || - (this.repository.format === RepoFormats.multi && req_content_name && !this.selectedContent) - ) { + if (!this.repository || !this.content || + (this.repository.format === RepoFormats.multi && + req_content_name && !this.selectedContent)) { // Requested content from a multicontent repo not found || No content found this.showEmptyState = true; this.pageTitle = ' Content Not Found'; this.pageLoading = false; } else { + // Append author type to breadcrumb if (this.namespace.is_vendor) { this.pageTitle = 'Vendors;/vendors;'; @@ -131,12 +142,15 @@ export class ContentDetailComponent implements OnInit { } this.repository.last_import = 'NA'; this.repository.last_commit = 'NA'; - if (this.repository.summary_fields['latest_import'] && this.repository.summary_fields['latest_import']['finished']) { - this.repository.last_import = moment(this.repository.summary_fields['latest_import']['finished']).fromNow(); + if (this.repository.summary_fields['latest_import'] && + this.repository.summary_fields['latest_import']['finished']) { + this.repository.last_import = + moment(this.repository.summary_fields['latest_import']['finished']).fromNow(); } if (this.repository.commit_created) { - this.repository.last_commit = moment(this.repository.commit_created).fromNow(); + this.repository.last_commit = + moment(this.repository.commit_created).fromNow(); } if (this.content && this.content.length) { this.repoContent = this.content[0]; @@ -188,7 +202,7 @@ export class ContentDetailComponent implements OnInit { this.metadataFilename = 'container.yml'; this.metadata = this.repoContent.metadata['container_meta']; } - this.hasReadme = this.repoContent.readme_html ? true : false; + this.hasReadme = (this.repoContent.readme_html) ? true : false; } if (this.repoContent.content_type === RepoFormats.apb) { if (this.repoContent.metadata['apb_metadata']) { @@ -196,7 +210,7 @@ export class ContentDetailComponent implements OnInit { this.metadataFilename = 'apb.yml'; this.metadata = this.repoContent.metadata['apb_metadata']; } - this.hasReadme = this.repoContent.readme_html ? true : false; + this.hasReadme = (this.repoContent.readme_html) ? true : false; } if (this.repository.format === RepoFormats.multi) { if (this.repository.readme_html) { @@ -209,7 +223,7 @@ export class ContentDetailComponent implements OnInit { this.repoContent[key] = this.repoContent.summary_fields[key]; let hasKey = 'has' + key[0].toUpperCase() + key.substring(1); hasKey = hasKey.replace(/\_(\w)/, this.toCamel); - this.repoContent[hasKey] = this.repoContent[key] && this.repoContent[key].length ? true : false; + this.repoContent[hasKey] = (this.repoContent[key] && this.repoContent[key].length) ? true : false; }); if (this.repository.format === RepoFormats.multi) { this.getContentTypeCounts(); @@ -228,19 +242,15 @@ export class ContentDetailComponent implements OnInit { for (const content_type in ContentTypes) { if (ContentTypes.hasOwnProperty(content_type)) { if (ContentTypes[content_type] === 'plugin') { - queries.push( - this.contentService.pagedQuery({ - repository__id: this.repository.id, - content_type__name__icontains: ContentTypes[content_type], - }), - ); + queries.push(this.contentService.pagedQuery({ + 'repository__id': this.repository.id, + 'content_type__name__icontains': ContentTypes[content_type] + })); } else { - queries.push( - this.contentService.pagedQuery({ - repository__id: this.repository.id, - content_type__name: ContentTypes[content_type], - }), - ); + queries.push(this.contentService.pagedQuery({ + 'repository__id': this.repository.id, + 'content_type__name': ContentTypes[content_type] + })); } } } diff --git a/galaxyui/src/app/content-detail/content-detail.module.ts b/galaxyui/src/app/content-detail/content-detail.module.ts index b1b4b2fed..0d8bdb3b8 100644 --- a/galaxyui/src/app/content-detail/content-detail.module.ts +++ b/galaxyui/src/app/content-detail/content-detail.module.ts @@ -1,30 +1,31 @@ +import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { CardModule } from 'patternfly-ng/card/basic-card/card.module'; -import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; -import { FilterModule } from 'patternfly-ng/filter/filter.module'; -import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; -import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; +import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; +import { CardModule } from 'patternfly-ng/card/basic-card/card.module'; +import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; +import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; +import { FilterModule } from 'patternfly-ng/filter/filter.module'; -import { TooltipModule } from 'ngx-bootstrap/tooltip'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { UtilitiesModule } from '../utilities/utilities.module'; +import { UtilitiesModule } from '../utilities/utilities.module'; -import { PageHeaderModule } from '../page-header/page-header.module'; -import { PageLoadingModule } from '../page-loading/page-loading.module'; +import { ContentDetailRoutingModule } from './content-detail.routing.module'; +import { ContentDetailComponent } from './content-detail.component'; +import { RepositoryComponent } from './repository/repository.component'; +import { ModuleUtilsComponent } from './content/module-utils/module-utils.component'; +import { RolesComponent } from './content/roles/roles.component'; +import { ModulesComponent } from './content/modules/modules.component'; +import { PluginsComponent } from './content/plugins/plugins.component'; +import { CardInfoComponent } from './cards/info/card-info.component'; +import { CardPlatformsComponent } from './cards/platforms/platforms.component'; +import { CardVersionsComponent } from './cards/versions/versions.component'; import { CardCloudPlatformsComponent } from './cards/cloud-platforms/cloud-platforms.component'; -import { CardDependenciesComponent } from './cards/dependencies/dependencies.component'; -import { CardInfoComponent } from './cards/info/card-info.component'; -import { CardPlatformsComponent } from './cards/platforms/platforms.component'; -import { CardVersionsComponent } from './cards/versions/versions.component'; -import { ContentDetailComponent } from './content-detail.component'; -import { ContentDetailRoutingModule } from './content-detail.routing.module'; -import { ModuleUtilsComponent } from './content/module-utils/module-utils.component'; -import { ModulesComponent } from './content/modules/modules.component'; -import { PluginsComponent } from './content/plugins/plugins.component'; -import { RolesComponent } from './content/roles/roles.component'; -import { RepositoryComponent } from './repository/repository.component'; +import { CardDependenciesComponent } from './cards/dependencies/dependencies.component'; +import { PageHeaderModule } from '../page-header/page-header.module'; +import { PageLoadingModule } from '../page-loading/page-loading.module'; + @NgModule({ imports: [ @@ -38,10 +39,10 @@ import { RepositoryComponent } from './repository/repository.component'; PageLoadingModule, PageHeaderModule, ListModule, - UtilitiesModule, + UtilitiesModule ], declarations: [ - ContentDetailComponent, + ContentDetailComponent, RepositoryComponent, CardInfoComponent, CardPlatformsComponent, @@ -51,7 +52,7 @@ import { RepositoryComponent } from './repository/repository.component'; ModulesComponent, RolesComponent, ModuleUtilsComponent, - PluginsComponent, - ], + PluginsComponent + ] }) -export class ContentDetailModule {} +export class ContentDetailModule { } diff --git a/galaxyui/src/app/content-detail/content-detail.resolver.service.ts b/galaxyui/src/app/content-detail/content-detail.resolver.service.ts index 7c6d7c1dc..6ec1982e4 100644 --- a/galaxyui/src/app/content-detail/content-detail.resolver.service.ts +++ b/galaxyui/src/app/content-detail/content-detail.resolver.service.ts @@ -1,26 +1,37 @@ -import { Injectable } from '@angular/core'; +import { + Injectable +} from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot +} from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs/Observable'; +import { forkJoin } from 'rxjs/observable/forkJoin'; -import { Content } from '../resources/content/content'; -import { ContentService } from '../resources/content/content.service'; -import { Namespace } from '../resources/namespaces/namespace'; -import { NamespaceService } from '../resources/namespaces/namespace.service'; -import { Repository } from '../resources/repositories/repository'; -import { RepositoryService } from '../resources/repositories/repository.service'; +import { ContentService } from '../resources/content/content.service'; +import { Content } from '../resources/content/content'; +import { RepositoryService } from '../resources/repositories/repository.service'; +import { Repository } from '../resources/repositories/repository'; +import { NamespaceService } from '../resources/namespaces/namespace.service'; +import { Namespace } from '../resources/namespaces/namespace'; @Injectable() export class ContentResolver implements Resolve { - constructor(private contentService: ContentService) {} + constructor( + private contentService: ContentService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { const repository = route.params['repository'].toLowerCase(); const namespace = route.params['namespace'].toLowerCase(); const name = route.params['content_name']; const params = { - repository__name__iexact: repository, - repository__provider_namespace__namespace__name__iexact: namespace, + 'repository__name__iexact': repository, + 'repository__provider_namespace__namespace__name__iexact': namespace }; if (name) { params['name'] = name.toLowerCase(); @@ -31,13 +42,16 @@ export class ContentResolver implements Resolve { @Injectable() export class RepositoryResolver implements Resolve { - constructor(private repositoryService: RepositoryService) {} + constructor( + private repositoryService: RepositoryService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { const repository = route.params['repository'].toLowerCase(); const namespace = route.params['namespace'].toLowerCase(); const params = { - name__iexact: repository, - provider_namespace__namespace__name__iexact: namespace, + 'name__iexact': repository, + 'provider_namespace__namespace__name__iexact': namespace }; return this.repositoryService.query(params).map(results => results[0]); } @@ -45,11 +59,14 @@ export class RepositoryResolver implements Resolve { @Injectable() export class NamespaceResolver implements Resolve { - constructor(private namespaceService: NamespaceService) {} + constructor( + private namespaceService: NamespaceService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { const namespace = route.params['namespace'].toLowerCase(); const params = { - name__iexact: namespace, + 'name__iexact': namespace }; return this.namespaceService.query(params).map(results => results[0]); } diff --git a/galaxyui/src/app/content-detail/content-detail.routing.module.ts b/galaxyui/src/app/content-detail/content-detail.routing.module.ts index 25e53d73d..67e8dcfe1 100644 --- a/galaxyui/src/app/content-detail/content-detail.routing.module.ts +++ b/galaxyui/src/app/content-detail/content-detail.routing.module.ts @@ -1,17 +1,49 @@ import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { + Routes, + RouterModule +} from '@angular/router'; -import { ContentResolver, NamespaceResolver, RepositoryResolver } from './content-detail.resolver.service'; +import { ContentDetailComponent } from './content-detail.component'; +import { + ContentResolver, + RepositoryResolver, + NamespaceResolver +} from './content-detail.resolver.service'; const routes: Routes = [ - // ':namespace/:repository/:content_name' and ':namespace/:repository/ moved - // to app-routing.module + { + path: ':namespace/:repository/:content_name', + component: ContentDetailComponent, + resolve: { + content: ContentResolver, + repository: RepositoryResolver, + namespace: NamespaceResolver + } + }, + { + path: ':namespace/:repository', + component: ContentDetailComponent, + resolve: { + content: ContentResolver, + repository: RepositoryResolver, + namespace: NamespaceResolver + } + }, ]; @NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], - providers: [ContentResolver, RepositoryResolver, NamespaceResolver], + imports: [ + RouterModule.forChild(routes) + ], + exports: [ + RouterModule + ], + providers: [ + ContentResolver, + RepositoryResolver, + NamespaceResolver + ] }) -export class ContentDetailRoutingModule {} +export class ContentDetailRoutingModule { } diff --git a/galaxyui/src/app/content-detail/content/module-utils/module-utils.component.ts b/galaxyui/src/app/content-detail/content/module-utils/module-utils.component.ts index 44994cc13..01c1d24d8 100644 --- a/galaxyui/src/app/content-detail/content/module-utils/module-utils.component.ts +++ b/galaxyui/src/app/content-detail/content/module-utils/module-utils.component.ts @@ -1,34 +1,45 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { Content } from '../../../resources/content/content'; -import { ContentService } from '../../../resources/content/content.service'; -import { Repository } from '../../../resources/repositories/repository'; +import { Content } from '../../../resources/content/content'; +import { ContentService } from '../../../resources/content/content.service'; +import { Repository } from '../../../resources/repositories/repository'; +import { PagedResponse } from '../../../resources/paged-response'; -import { ContentTypes } from '../../../enums/content-types.enum'; +import { ContentTypes } from '../../../enums/content-types.enum'; -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterEvent } from 'patternfly-ng/filter/filter-event'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { FilterQuery } from 'patternfly-ng/filter/filter-query'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { Filter } from 'patternfly-ng/filter/filter'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; + +import { Observable } from 'rxjs/Observable'; +import { forkJoin } from 'rxjs/observable/forkJoin'; -import { Observable } from 'rxjs/Observable'; -import { forkJoin } from 'rxjs/observable/forkJoin'; @Component({ selector: 'module-utils-detail', templateUrl: './module-utils.component.html', - styleUrls: ['./module-utils.component.less'], + styleUrls: ['./module-utils.component.less'] }) export class ModuleUtilsComponent implements OnInit { - constructor(private contentService: ContentService) {} + + constructor( + private contentService: ContentService + ) {} emptyStateConfig: EmptyStateConfig; filterConfig: FilterConfig; @@ -59,7 +70,7 @@ export class ModuleUtilsComponent implements OnInit { if (this.filterConfig && this.filterConfig.fields) { this.filterConfig.appliedFilters.push({ field: this.filterConfig.fields[0], - value: this._selectedContent.name, + value: this._selectedContent.name } as Filter); this.queryContentList(this._selectedContent.name); } @@ -74,7 +85,7 @@ export class ModuleUtilsComponent implements OnInit { this.emptyStateConfig = { iconStyleClass: 'pficon-warning-triangle-o', info: 'This plugin does not contain any documentation or metadata.', - title: 'No Metdata Found', + title: 'No Metdata Found' } as EmptyStateConfig; this.listConfig = { @@ -82,42 +93,39 @@ export class ModuleUtilsComponent implements OnInit { multiSelect: false, selectItems: false, showCheckbox: false, - useExpandItems: true, + useExpandItems: true } as ListConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; this.filterConfig = { - fields: [ - { - id: 'name', - title: 'Name', - placeholder: 'Filter by Name...', - type: FilterType.TEXT, - }, - { - id: 'description', - title: 'Description', - placeholder: 'Filter by Description...', - type: FilterType.TEXT, - }, - ] as FilterField[], + fields: [{ + id: 'name', + title: 'Name', + placeholder: 'Filter by Name...', + type: FilterType.TEXT, + }, { + id: 'description', + title: 'Description', + placeholder: 'Filter by Description...', + type: FilterType.TEXT, + }] as FilterField[], resultsCount: 0, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; if (this._selectedContent) { this.filterConfig.appliedFilters.push({ field: this.filterConfig.fields[0], - value: this._selectedContent.name, + value: this._selectedContent.name } as Filter); } - this.queryContentList(this.selectedContent ? this.selectedContent.name : null); + this.queryContentList((this.selectedContent) ? this.selectedContent.name : null); } handlePageSizeChange($event: PaginationEvent) { @@ -151,16 +159,17 @@ export class ModuleUtilsComponent implements OnInit { this.queryContentList(); } + // private private queryContentList(contentName?: string) { this.loading = true; - let queryString = this.query ? this.query : '?'; + let queryString = (this.query) ? this.query : '?'; const params = { - page_size: this.pageSize, - page: this.pageNumber, - content_type__name: ContentTypes.moduleUtils, - repository__id: this.repository.id, + 'page_size': this.pageSize, + 'page': this.pageNumber, + 'content_type__name': ContentTypes.moduleUtils, + 'repository__id': this.repository.id }; if (contentName) { params['name'] = contentName; @@ -171,13 +180,15 @@ export class ModuleUtilsComponent implements OnInit { _tmp.push(`${key}=${params[key]}`); } } - queryString += queryString === '?' ? _tmp.join('&') : '&' + _tmp.join('&'); - this.contentService.pagedQuery(queryString).subscribe(results => { - this._modules = results.results as Content[]; - this.filterConfig.resultsCount = results.count; - this.paginationConfig.totalItems = results.count; - this.getContentDetail(); - }); + queryString += (queryString === '?') ? _tmp.join('&') : '&' + _tmp.join('&'); + this.contentService.pagedQuery(queryString).subscribe( + results => { + this._modules = results.results as Content[]; + this.filterConfig.resultsCount = results.count; + this.paginationConfig.totalItems = results.count; + this.getContentDetail(); + } + ); } private getContentDetail() { diff --git a/galaxyui/src/app/content-detail/content/modules/modules.component.ts b/galaxyui/src/app/content-detail/content/modules/modules.component.ts index 7c46832f1..1726fc2f4 100644 --- a/galaxyui/src/app/content-detail/content/modules/modules.component.ts +++ b/galaxyui/src/app/content-detail/content/modules/modules.component.ts @@ -1,34 +1,45 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { Content } from '../../../resources/content/content'; -import { ContentService } from '../../../resources/content/content.service'; -import { Repository } from '../../../resources/repositories/repository'; +import { Content } from '../../../resources/content/content'; +import { ContentService } from '../../../resources/content/content.service'; +import { Repository } from '../../../resources/repositories/repository'; +import { PagedResponse } from '../../../resources/paged-response'; -import { ContentTypes } from '../../../enums/content-types.enum'; +import { ContentTypes } from '../../../enums/content-types.enum'; -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterEvent } from 'patternfly-ng/filter/filter-event'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { FilterQuery } from 'patternfly-ng/filter/filter-query'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { Filter } from 'patternfly-ng/filter/filter'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; + +import { Observable } from 'rxjs/Observable'; +import { forkJoin } from 'rxjs/observable/forkJoin'; -import { Observable } from 'rxjs/Observable'; -import { forkJoin } from 'rxjs/observable/forkJoin'; @Component({ selector: 'modules-detail', templateUrl: './modules.component.html', - styleUrls: ['./modules.component.less'], + styleUrls: ['./modules.component.less'] }) export class ModulesComponent implements OnInit { - constructor(private contentService: ContentService) {} + + constructor( + private contentService: ContentService + ) {} emptyStateConfig: EmptyStateConfig; filterConfig: FilterConfig; @@ -59,7 +70,7 @@ export class ModulesComponent implements OnInit { if (this.filterConfig && this.filterConfig.fields) { this.filterConfig.appliedFilters.push({ field: this.filterConfig.fields[0], - value: this._selectedContent.name, + value: this._selectedContent.name } as Filter); this.queryContentList(this._selectedContent.name); } @@ -74,7 +85,7 @@ export class ModulesComponent implements OnInit { this.emptyStateConfig = { iconStyleClass: 'pficon-warning-triangle-o', info: 'This module does not contain any documentation or metadata.', - title: 'No Metadata Found', + title: 'No Metadata Found' } as EmptyStateConfig; this.listConfig = { @@ -82,42 +93,40 @@ export class ModulesComponent implements OnInit { multiSelect: false, selectItems: false, showCheckbox: false, - useExpandItems: true, + useExpandItems: true } as ListConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; this.filterConfig = { - fields: [ - { - id: 'name', - title: 'Name', - placeholder: 'Filter by Name...', - type: FilterType.TEXT, - }, - { - id: 'description', - title: 'Description', - placeholder: 'Filter by Description...', - type: FilterType.TEXT, - }, - ] as FilterField[], + fields: [{ + id: 'name', + title: 'Name', + placeholder: 'Filter by Name...', + type: FilterType.TEXT, + }, { + id: 'description', + title: 'Description', + placeholder: 'Filter by Description...', + type: FilterType.TEXT, + }] as FilterField[], resultsCount: 0, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; + if (this._selectedContent) { this.filterConfig.appliedFilters.push({ field: this.filterConfig.fields[0], - value: this._selectedContent.name, + value: this._selectedContent.name } as Filter); } - this.queryContentList(this.selectedContent ? this.selectedContent.name : null); + this.queryContentList((this.selectedContent) ? this.selectedContent.name : null); } handlePageSizeChange($event: PaginationEvent) { @@ -148,16 +157,17 @@ export class ModulesComponent implements OnInit { this.queryContentList(); } + // private private queryContentList(contentName?: string) { this.loading = true; - let queryString = this.query ? this.query : '?'; + let queryString = (this.query) ? this.query : '?'; const params = { - page_size: this.pageSize, - page: this.pageNumber, - content_type__name: ContentTypes.module, - repository__id: this.repository.id, + 'page_size': this.pageSize, + 'page': this.pageNumber, + 'content_type__name': ContentTypes.module, + 'repository__id': this.repository.id }; if (contentName) { params['name'] = contentName; @@ -168,13 +178,15 @@ export class ModulesComponent implements OnInit { _tmp.push(`${key}=${params[key]}`); } } - queryString += queryString === '?' ? _tmp.join('&') : '&' + _tmp.join('&'); - this.contentService.pagedQuery(queryString).subscribe(results => { - this._modules = results.results as Content[]; - this.filterConfig.resultsCount = results.count; - this.paginationConfig.totalItems = results.count; - this.getContentDetail(); - }); + queryString += (queryString === '?') ? _tmp.join('&') : '&' + _tmp.join('&'); + this.contentService.pagedQuery(queryString).subscribe( + results => { + this._modules = results.results as Content[]; + this.filterConfig.resultsCount = results.count; + this.paginationConfig.totalItems = results.count; + this.getContentDetail(); + } + ); } private getContentDetail() { diff --git a/galaxyui/src/app/content-detail/content/plugins/plugins.component.ts b/galaxyui/src/app/content-detail/content/plugins/plugins.component.ts index 3511e56ee..39b9c2d1e 100644 --- a/galaxyui/src/app/content-detail/content/plugins/plugins.component.ts +++ b/galaxyui/src/app/content-detail/content/plugins/plugins.component.ts @@ -1,36 +1,50 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { Content } from '../../../resources/content/content'; -import { ContentService } from '../../../resources/content/content.service'; -import { Repository } from '../../../resources/repositories/repository'; +import { Content } from '../../../resources/content/content'; +import { ContentService } from '../../../resources/content/content.service'; +import { Repository } from '../../../resources/repositories/repository'; +import { PagedResponse } from '../../../resources/paged-response'; -import { ContentTypes } from '../../../enums/content-types.enum'; +import { ContentTypes } from '../../../enums/content-types.enum'; -import { PluginNames, PluginTypes } from '../../../enums/plugin-types.enum'; +import { + PluginNames, + PluginTypes +} from '../../../enums/plugin-types.enum'; -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterEvent } from 'patternfly-ng/filter/filter-event'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { FilterQuery } from 'patternfly-ng/filter/filter-query'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { Filter } from 'patternfly-ng/filter/filter'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; + +import { Observable } from 'rxjs/Observable'; +import { forkJoin } from 'rxjs/observable/forkJoin'; -import { Observable } from 'rxjs/Observable'; -import { forkJoin } from 'rxjs/observable/forkJoin'; @Component({ selector: 'plugins-detail', templateUrl: './plugins.component.html', - styleUrls: ['./plugins.component.less'], + styleUrls: ['./plugins.component.less'] }) export class PluginsComponent implements OnInit { - constructor(private contentService: ContentService) {} + + constructor( + private contentService: ContentService + ) {} emptyStateConfig: EmptyStateConfig; filterConfig: FilterConfig; @@ -64,7 +78,7 @@ export class PluginsComponent implements OnInit { if (this.filterConfig && this.filterConfig.fields) { this.filterConfig.appliedFilters.push({ field: this.filterConfig.fields[0], - value: this._selectedContent.name, + value: this._selectedContent.name } as Filter); this.queryContentList(this._selectedContent.name); } @@ -79,7 +93,7 @@ export class PluginsComponent implements OnInit { this.emptyStateConfig = { iconStyleClass: 'pficon-warning-triangle-o', info: 'This plugin does not contain any documentation or metadata.', - title: 'No Metadata Found', + title: 'No Metadata Found' } as EmptyStateConfig; this.listConfig = { @@ -87,46 +101,42 @@ export class PluginsComponent implements OnInit { multiSelect: false, selectItems: false, showCheckbox: false, - useExpandItems: true, + useExpandItems: true } as ListConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; this.filterConfig = { - fields: [ - { - id: 'name', - title: 'Name', - placeholder: 'Filter by Name...', - type: FilterType.TEXT, - }, - { - id: 'description', - title: 'Description', - placeholder: 'Filter by Description...', - type: FilterType.TEXT, - }, - { - id: 'plugin_type', - title: 'Plugin Type', - placeholder: 'Plugin Type', - type: FilterType.TYPEAHEAD, - queries: [], - }, - ] as FilterField[], + fields: [{ + id: 'name', + title: 'Name', + placeholder: 'Filter by Name...', + type: FilterType.TEXT, + }, { + id: 'description', + title: 'Description', + placeholder: 'Filter by Description...', + type: FilterType.TEXT, + }, { + id: 'plugin_type', + title: 'Plugin Type', + placeholder: 'Plugin Type', + type: FilterType.TYPEAHEAD, + queries: [] + }] as FilterField[], resultsCount: 0, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; for (const key in PluginTypes) { if (PluginTypes.hasOwnProperty(key)) { this.filterConfig.fields[2].queries.push({ id: key, - value: PluginTypes[key], + value: PluginTypes[key] }); } } @@ -134,11 +144,11 @@ export class PluginsComponent implements OnInit { if (this._selectedContent) { this.filterConfig.appliedFilters.push({ field: this.filterConfig.fields[0], - value: this._selectedContent.name, + value: this._selectedContent.name } as Filter); } - this.queryContentList(this.selectedContent ? this.selectedContent.name : null); + this.queryContentList((this.selectedContent) ? this.selectedContent.name : null); } handlePageSizeChange($event: PaginationEvent) { @@ -176,15 +186,16 @@ export class PluginsComponent implements OnInit { this.queryContentList(); } + // private private queryContentList(contentName?: string) { this.loading = true; - let queryString = this.query ? this.query : '?'; + let queryString = (this.query) ? this.query : '?'; const params = { - page_size: this.pageSize, - page: this.pageNumber, - repository__id: this.repository.id, + 'page_size': this.pageSize, + 'page': this.pageNumber, + 'repository__id': this.repository.id }; if (queryString.indexOf('content_type__name') < 0) { params['content_type__name__icontains'] = ContentTypes.plugin; @@ -198,13 +209,15 @@ export class PluginsComponent implements OnInit { _tmp.push(`${key}=${params[key]}`); } } - queryString += queryString === '?' ? _tmp.join('&') : '&' + _tmp.join('&'); - this.contentService.pagedQuery(queryString).subscribe(results => { - this._plugins = results.results as Content[]; - this.filterConfig.resultsCount = results.count; - this.paginationConfig.totalItems = results.count; - this.getContentDetail(); - }); + queryString += (queryString === '?') ? _tmp.join('&') : '&' + _tmp.join('&'); + this.contentService.pagedQuery(queryString).subscribe( + results => { + this._plugins = results.results as Content[]; + this.filterConfig.resultsCount = results.count; + this.paginationConfig.totalItems = results.count; + this.getContentDetail(); + } + ); } private getContentDetail() { diff --git a/galaxyui/src/app/content-detail/content/roles/roles.component.ts b/galaxyui/src/app/content-detail/content/roles/roles.component.ts index 887af09ba..b7010a9c5 100644 --- a/galaxyui/src/app/content-detail/content/roles/roles.component.ts +++ b/galaxyui/src/app/content-detail/content/roles/roles.component.ts @@ -1,32 +1,43 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { Content } from '../../../resources/content/content'; -import { ContentService } from '../../../resources/content/content.service'; -import { Repository } from '../../../resources/repositories/repository'; +import { Content } from '../../../resources/content/content'; +import { ContentService } from '../../../resources/content/content.service'; +import { Repository } from '../../../resources/repositories/repository'; +import { PagedResponse } from '../../../resources/paged-response'; -import { ContentTypes } from '../../../enums/content-types.enum'; +import { ContentTypes } from '../../../enums/content-types.enum'; -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterEvent } from 'patternfly-ng/filter/filter-event'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { FilterQuery } from 'patternfly-ng/filter/filter-query'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { Filter } from 'patternfly-ng/filter/filter'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; + +import { Observable } from 'rxjs/Observable'; +import { forkJoin } from 'rxjs/observable/forkJoin'; -import { Observable } from 'rxjs/Observable'; -import { forkJoin } from 'rxjs/observable/forkJoin'; @Component({ selector: 'roles-detail', templateUrl: './roles.component.html', - styleUrls: ['./roles.component.less'], + styleUrls: ['./roles.component.less'] }) export class RolesComponent implements OnInit { - constructor(private contentService: ContentService) {} + + constructor( + private contentService: ContentService + ) {} filterConfig: FilterConfig; listConfig: ListConfig; @@ -56,7 +67,7 @@ export class RolesComponent implements OnInit { if (this.filterConfig && this.filterConfig.fields) { this.filterConfig.appliedFilters.push({ field: this.filterConfig.fields[0], - value: this._selectedContent.name, + value: this._selectedContent.name } as Filter); this.queryContentList(this._selectedContent.name); } @@ -73,42 +84,39 @@ export class RolesComponent implements OnInit { multiSelect: false, selectItems: false, showCheckbox: false, - useExpandItems: true, + useExpandItems: true } as ListConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; this.filterConfig = { - fields: [ - { - id: 'name', - title: 'Name', - placeholder: 'Filter by Name...', - type: FilterType.TEXT, - }, - { - id: 'description', - title: 'Description', - placeholder: 'Filter by Description...', - type: FilterType.TEXT, - }, - ] as FilterField[], + fields: [{ + id: 'name', + title: 'Name', + placeholder: 'Filter by Name...', + type: FilterType.TEXT, + }, { + id: 'description', + title: 'Description', + placeholder: 'Filter by Description...', + type: FilterType.TEXT, + }] as FilterField[], resultsCount: 0, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; if (this._selectedContent) { this.filterConfig.appliedFilters.push({ field: this.filterConfig.fields[0], - value: this._selectedContent.name, + value: this._selectedContent.name } as Filter); } - this.queryContentList(this.selectedContent ? this.selectedContent.name : null); + this.queryContentList((this.selectedContent) ? this.selectedContent.name : null); } handlePageSizeChange($event: PaginationEvent) { @@ -142,16 +150,17 @@ export class RolesComponent implements OnInit { this.queryContentList(); } + // private private queryContentList(contentName?: string) { this.loading = true; - let queryString = this.query ? this.query : '?'; + let queryString = (this.query) ? this.query : '?'; const params = { - page_size: this.pageSize, - page: this.pageNumber, - content_type__name: ContentTypes.role, - repository__id: this.repository.id, + 'page_size': this.pageSize, + 'page': this.pageNumber, + 'content_type__name': ContentTypes.role, + 'repository__id': this.repository.id }; if (contentName) { params['name'] = contentName; @@ -162,13 +171,15 @@ export class RolesComponent implements OnInit { _tmp.push(`${key}=${params[key]}`); } } - queryString += queryString === '?' ? _tmp.join('&') : '&' + _tmp.join('&'); - this.contentService.pagedQuery(queryString).subscribe(results => { - this._roles = results.results as Content[]; - this.filterConfig.resultsCount = results.count; - this.paginationConfig.totalItems = results.count; - this.getContentDetail(); - }); + queryString += (queryString === '?') ? _tmp.join('&') : '&' + _tmp.join('&'); + this.contentService.pagedQuery(queryString).subscribe( + results => { + this._roles = results.results as Content[]; + this.filterConfig.resultsCount = results.count; + this.paginationConfig.totalItems = results.count; + this.getContentDetail(); + } + ); } private getContentDetail() { @@ -186,9 +197,8 @@ export class RolesComponent implements OnInit { forkJoin(queries).subscribe((results: Content[]) => { this.items = JSON.parse(JSON.stringify(results)); this.items.forEach(item => { - item['install_cmd'] = `mazer install ${item.summary_fields['namespace']['name']}.${ - item.summary_fields['repository']['name'] - }`; + item['install_cmd'] = + `mazer install ${item.summary_fields['namespace']['name']}.${item.summary_fields['repository']['name']}`; item['hasTags'] = false; if (item.summary_fields['tags'] && item.summary_fields['tags'].length) { item['tags'] = item.summary_fields['tags']; diff --git a/galaxyui/src/app/content-detail/repository/repository.component.ts b/galaxyui/src/app/content-detail/repository/repository.component.ts index 05ac0ed19..71b0e85d8 100644 --- a/galaxyui/src/app/content-detail/repository/repository.component.ts +++ b/galaxyui/src/app/content-detail/repository/repository.component.ts @@ -1,10 +1,28 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + EventEmitter, + Input, + Output, + OnInit +} from '@angular/core'; -import { Content } from '../../resources/content/content'; -import { Namespace } from '../../resources/namespaces/namespace'; -import { Repository } from '../../resources/repositories/repository'; +import { + Router +} from '@angular/router'; + +import { Repository } from '../../resources/repositories/repository'; +import { Content } from '../../resources/content/content'; +import { Namespace } from '../../resources/namespaces/namespace'; +import { ContentService } from '../../resources/content/content.service'; + +import { + RepoFormats, + RepoFormatsTooltips, + RepoFormatsIconClasses +} from '../../enums/repo-types.enum'; + +import * as moment from 'moment'; -import { RepoFormats, RepoFormatsIconClasses, RepoFormatsTooltips } from '../../enums/repo-types.enum'; class RepositoryView { repoType: RepoFormats; @@ -33,15 +51,17 @@ export class RepoChangeEvent { @Component({ selector: 'content-detail-repo', templateUrl: './repository.component.html', - styleUrls: ['./repository.component.less'], + styleUrls: ['./repository.component.less'] }) export class RepositoryComponent implements OnInit { - constructor() {} - @Input() - repository: Repository; - @Input() - namespace: Namespace; + constructor( + private contentService: ContentService, + private router: Router + ) {} + + @Input() repository: Repository; + @Input() namespace: Namespace; mainContent: Content = {} as Content; repositoryView: RepositoryView; diff --git a/galaxyui/src/app/enums/content-types.enum.ts b/galaxyui/src/app/enums/content-types.enum.ts index 7c44f46fa..26c211a5e 100644 --- a/galaxyui/src/app/enums/content-types.enum.ts +++ b/galaxyui/src/app/enums/content-types.enum.ts @@ -1,9 +1,10 @@ + export enum ContentTypes { apb = 'apb', module = 'module', plugin = 'plugin', role = 'role', - moduleUtils = 'module_utils', + moduleUtils = 'module_utils' } export enum ContentTypesPlural { @@ -11,7 +12,7 @@ export enum ContentTypesPlural { module = 'modules', plugin = 'plugins', role = 'roles', - moduleUtils = 'module_utils', + moduleUtils = 'module_utils' } export enum ContentTypesChoices { @@ -19,7 +20,7 @@ export enum ContentTypesChoices { module = 'Module', plugin = 'Plugin', role = 'Role', - moduleUtils = 'Module Utils', + moduleUtils = 'Module Utils' } export enum ContentTypesPluralChoices { @@ -27,7 +28,7 @@ export enum ContentTypesPluralChoices { module = 'Modules', plugin = 'Plugins', role = 'Roles', - moduleUtils = 'Module Utils', + moduleUtils = 'Module Utils' } export enum ContentTypesIconClasses { @@ -35,5 +36,5 @@ export enum ContentTypesIconClasses { module = 'fa fa-microchip', plugin = 'fa fa-plug', role = 'fa fa-gear', - moduleUtils = 'fa fa-microchip', + moduleUtils = 'fa fa-microchip' } diff --git a/galaxyui/src/app/enums/contributor-types.enum.ts b/galaxyui/src/app/enums/contributor-types.enum.ts index b50367ab2..603d468d0 100644 --- a/galaxyui/src/app/enums/contributor-types.enum.ts +++ b/galaxyui/src/app/enums/contributor-types.enum.ts @@ -1,9 +1,9 @@ export enum ContributorTypes { vendor = 'partner', - community = 'community', + community = 'community' } export enum ContributorTypesIconClasses { vendor = 'fa fa-star', - community = 'fa fa-users', + community = 'fa fa-users' } diff --git a/galaxyui/src/app/enums/import-state.enum.ts b/galaxyui/src/app/enums/import-state.enum.ts index 9c1663ace..62b33d63c 100644 --- a/galaxyui/src/app/enums/import-state.enum.ts +++ b/galaxyui/src/app/enums/import-state.enum.ts @@ -2,5 +2,5 @@ export enum ImportState { pending = 'PENDING', running = 'RUNNING', failed = 'FAILED', - success = 'SUCCESS', + success = 'SUCCESS' } diff --git a/galaxyui/src/app/enums/repo-types.enum.ts b/galaxyui/src/app/enums/repo-types.enum.ts index 35cd4ba40..8eac9acfb 100644 --- a/galaxyui/src/app/enums/repo-types.enum.ts +++ b/galaxyui/src/app/enums/repo-types.enum.ts @@ -6,8 +6,8 @@ export enum RepoFormats { export enum RepoFormatsIconClasses { apb = 'pficon-bundle', - role = 'fa fa-gear', - multi = 'pficon-repository', + role = 'fa fa-gear' , + multi= 'pficon-repository', } export enum RepoFormatsTooltips { diff --git a/galaxyui/src/app/enums/view-types.enum.ts b/galaxyui/src/app/enums/view-types.enum.ts index 18857177d..9f7e30f0d 100644 --- a/galaxyui/src/app/enums/view-types.enum.ts +++ b/galaxyui/src/app/enums/view-types.enum.ts @@ -2,8 +2,8 @@ export enum ViewTypes { readme = 'readme', meta = 'meta', detail = 'detail', - modules = 'modules', - moduleUtils = 'moduleUtils', - roles = 'roles', - plugins = 'plugins', + modules = 'modules', + moduleUtils = 'moduleUtils', + roles = 'roles', + plugins = 'plugins' } diff --git a/galaxyui/src/app/exception-pages/access-denied/access-denied.component.ts b/galaxyui/src/app/exception-pages/access-denied/access-denied.component.ts index 776c55f4e..ca140596a 100644 --- a/galaxyui/src/app/exception-pages/access-denied/access-denied.component.ts +++ b/galaxyui/src/app/exception-pages/access-denied/access-denied.component.ts @@ -1,19 +1,35 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; - -import { Router } from '@angular/router'; - -import { EmptyStateConfig } from 'patternfly-ng/empty-state'; - -import { Action, ActionConfig } from 'patternfly-ng/action'; +import { + Component, + OnInit, + TemplateRef, + ViewEncapsulation +} from '@angular/core'; + +import { + ActivatedRoute, + Router +} from '@angular/router'; + +import { + EmptyStateConfig +} from 'patternfly-ng/empty-state'; + +import { + ActionConfig, + Action +} from 'patternfly-ng/action'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'app-access-denied', templateUrl: './access-denied.component.html', - styleUrls: ['./access-denied.component.less'], + styleUrls: ['./access-denied.component.less'] }) export class AccessDeniedComponent implements OnInit { - constructor(private router: Router) {} + + constructor( + private router: Router + ) {} pageTitle = 'Access Denied'; pageIcon = 'fa fa-exclamation-triangle'; @@ -22,22 +38,19 @@ export class AccessDeniedComponent implements OnInit { ngOnInit(): void { this.actionConfig = { - primaryActions: [ - { - id: 'home', - title: 'Home', - tooltip: 'View the home page', - }, - ], + primaryActions: [{ + id: 'home', + title: 'Home', + tooltip: 'View the home page' + }] } as ActionConfig; this.emptyStateConfig = { actions: this.actionConfig, iconStyleClass: 'fa fa-frown-o', - info: - 'You do not have access to the requested page. Choose one of the navigation options on the left, ' + + info: 'You do not have access to the requested page. Choose one of the navigation options on the left, ' + 'or click the Home button below, to visit the home page', - title: 'Access Denied', + title: 'Access Denied' } as EmptyStateConfig; } diff --git a/galaxyui/src/app/exception-pages/exception-pages.module.ts b/galaxyui/src/app/exception-pages/exception-pages.module.ts index 60fc36335..9c7d2d0f9 100644 --- a/galaxyui/src/app/exception-pages/exception-pages.module.ts +++ b/galaxyui/src/app/exception-pages/exception-pages.module.ts @@ -1,16 +1,25 @@ +import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { ActionModule } from 'patternfly-ng/action/action.module'; +import { ActionModule } from 'patternfly-ng/action/action.module'; import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; -import { PageHeaderModule } from '../page-header/page-header.module'; -import { AccessDeniedComponent } from './access-denied/access-denied.component'; +import { PageHeaderModule } from '../page-header/page-header.module'; +import { AccessDeniedComponent } from './access-denied/access-denied.component'; +import { NotFoundComponent } from './not-found/not-found.component'; import { ExceptionPagesRoutingModule } from './exception-pages.routing.module'; -import { NotFoundComponent } from './not-found/not-found.component'; @NgModule({ - declarations: [AccessDeniedComponent, NotFoundComponent], - imports: [ActionModule, CommonModule, PageHeaderModule, ExceptionPagesRoutingModule, EmptyStateModule], + declarations: [ + AccessDeniedComponent, + NotFoundComponent + ], + imports: [ + ActionModule, + CommonModule, + PageHeaderModule, + ExceptionPagesRoutingModule, + EmptyStateModule, + ], }) export class ExceptionPagesModule {} diff --git a/galaxyui/src/app/exception-pages/exception-pages.routing.module.ts b/galaxyui/src/app/exception-pages/exception-pages.routing.module.ts index cc4ab11c1..be610a340 100644 --- a/galaxyui/src/app/exception-pages/exception-pages.routing.module.ts +++ b/galaxyui/src/app/exception-pages/exception-pages.routing.module.ts @@ -1,9 +1,12 @@ -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { + RouterModule, + Routes +} from '@angular/router'; import { AccessDeniedComponent } from './access-denied/access-denied.component'; -import { NotFoundComponent } from './not-found/not-found.component'; +import { NotFoundComponent } from './not-found/not-found.component'; const exceptionPagesRoutes: Routes = [ { @@ -12,12 +15,16 @@ const exceptionPagesRoutes: Routes = [ }, { path: 'not-found', - component: NotFoundComponent, - }, + component: NotFoundComponent + } ]; @NgModule({ - imports: [RouterModule.forChild(exceptionPagesRoutes)], - exports: [RouterModule], + imports: [ + RouterModule.forChild(exceptionPagesRoutes) + ], + exports: [ + RouterModule, + ] }) export class ExceptionPagesRoutingModule {} diff --git a/galaxyui/src/app/exception-pages/not-found/not-found.component.ts b/galaxyui/src/app/exception-pages/not-found/not-found.component.ts index d02edc08d..4b427e2cf 100644 --- a/galaxyui/src/app/exception-pages/not-found/not-found.component.ts +++ b/galaxyui/src/app/exception-pages/not-found/not-found.component.ts @@ -1,19 +1,35 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; - -import { Router } from '@angular/router'; - -import { EmptyStateConfig } from 'patternfly-ng/empty-state'; - -import { Action, ActionConfig } from 'patternfly-ng/action'; +import { + Component, + OnInit, + TemplateRef, + ViewEncapsulation +} from '@angular/core'; + +import { + ActivatedRoute, + Router +} from '@angular/router'; + +import { + EmptyStateConfig +} from 'patternfly-ng/empty-state'; + +import { + ActionConfig, + Action +} from 'patternfly-ng/action'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'app-not-found', templateUrl: './not-found.component.html', - styleUrls: ['./not-found.component.less'], + styleUrls: ['./not-found.component.less'] }) export class NotFoundComponent implements OnInit { - constructor(private router: Router) {} + + constructor( + private router: Router + ) {} pageTitle = 'Page Not Found'; pageIcon = 'fa fa-frown-o'; @@ -22,23 +38,20 @@ export class NotFoundComponent implements OnInit { ngOnInit(): void { this.actionConfig = { - primaryActions: [ - { - id: 'home', - title: 'Home', - tooltip: 'View the home page', - }, - ], + primaryActions: [{ + id: 'home', + title: 'Home', + tooltip: 'View the home page' + }] } as ActionConfig; this.emptyStateConfig = { actions: this.actionConfig, iconStyleClass: 'fa fa-frown-o', - info: - 'Well this is embarrassing. The page you requested could not be found. ' + + info: 'Well this is embarrassing. The page you requested could not be found. ' + 'Choose one of the navigation options on the left, or click the Home button ' + 'below, to visit the home page', - title: 'Page Not Found', + title: 'Page Not Found' } as EmptyStateConfig; } diff --git a/galaxyui/src/app/home/carousel/carousel.component.ts b/galaxyui/src/app/home/carousel/carousel.component.ts index 81178e2d6..c2cb03dae 100644 --- a/galaxyui/src/app/home/carousel/carousel.component.ts +++ b/galaxyui/src/app/home/carousel/carousel.component.ts @@ -1,15 +1,23 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit, + AfterViewInit +} from '@angular/core'; -import { Router } from '@angular/router'; +import { + Router +} from '@angular/router'; import { Namespace } from '../../resources/namespaces/namespace'; @Component({ selector: 'carousel-component', templateUrl: './carousel.component.html', - styleUrls: ['./carousel.component.less'], + styleUrls: ['./carousel.component.less'] }) export class CarouselComponent implements OnInit { + @Input() set vendors(data: Namespace[]) { this._vendors = JSON.parse(JSON.stringify(data)); @@ -31,9 +39,11 @@ export class CarouselComponent implements OnInit { _vendors: Namespace[] = []; - constructor(private router: Router) {} + constructor( + private router: Router + ) { } - ngOnInit() {} + ngOnInit() { } handleLeftClick() { document.getElementById('slider-inner').scrollLeft += 260; @@ -45,8 +55,8 @@ export class CarouselComponent implements OnInit { handleVendorClick(vendor: Namespace) { const params = { - vendor: 'true', - namespaces: vendor.name, + 'vendor': 'true', + 'namespaces': vendor.name }; this.router.navigate(['/', 'search'], { queryParams: params }); } diff --git a/galaxyui/src/app/home/home.component.spec.ts b/galaxyui/src/app/home/home.component.spec.ts index 2dafb79dd..490e81bdf 100644 --- a/galaxyui/src/app/home/home.component.spec.ts +++ b/galaxyui/src/app/home/home.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HomeComponent } from './home.component'; describe('HomeComponent', () => { - let component: HomeComponent; - let fixture: ComponentFixture; + let component: HomeComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [HomeComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HomeComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(HomeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/home/home.component.ts b/galaxyui/src/app/home/home.component.ts index a300d7584..eb76014f0 100644 --- a/galaxyui/src/app/home/home.component.ts +++ b/galaxyui/src/app/home/home.component.ts @@ -1,19 +1,29 @@ -import { AfterViewInit, Component, OnInit } from '@angular/core'; +import { + Component, + OnInit, + AfterViewInit +} from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { + ActivatedRoute, + Router +} from '@angular/router'; -import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; +import { + CardConfig +} from 'patternfly-ng/card/basic-card/card-config'; -import { Namespace } from '../resources/namespaces/namespace'; +import { Namespace } from '../resources/namespaces/namespace'; import * as $ from 'jquery'; @Component({ - selector: 'home', + selector: 'home', templateUrl: './home.component.html', - styleUrls: ['./home.component.less'], + styleUrls: ['./home.component.less'] }) export class HomeComponent implements OnInit, AfterViewInit { + downloadConfig: CardConfig; shareConfig: CardConfig; featureConfig: CardConfig; @@ -27,10 +37,13 @@ export class HomeComponent implements OnInit, AfterViewInit { showCards = false; vendors: Namespace[] = []; - constructor(private route: ActivatedRoute, private router: Router) {} + constructor( + private route: ActivatedRoute, + private router: Router + ) {} ngOnInit() { - this.route.data.subscribe(data => { + this.route.data.subscribe((data) => { this.vendors = data['vendors']['results']; data['contentBlocks'].forEach(item => { switch (item.name) { @@ -48,15 +61,15 @@ export class HomeComponent implements OnInit, AfterViewInit { }); this.downloadConfig = { - titleBorder: true, + titleBorder: true } as CardConfig; this.shareConfig = { - titleBorder: true, + titleBorder: true } as CardConfig; this.featureConfig = { - titleBorder: true, + titleBorder: true } as CardConfig; } @@ -70,7 +83,7 @@ export class HomeComponent implements OnInit, AfterViewInit { } searchContent(): void { - this.router.navigate(['/search'], { queryParams: { keywords: this.searchText } }); + this.router.navigate(['/search'], {queryParams: {keywords: this.searchText}}); } // private @@ -78,6 +91,7 @@ export class HomeComponent implements OnInit, AfterViewInit { private setCardHeight(): void { // Set the cards to a consistent height setTimeout(_ => { + const windowHeight = window.innerHeight; const windowWidth = window.innerWidth; $('#card-1 .pfng-card').css('height', 'auto'); $('#card-2 .pfng-card').css('height', 'auto'); diff --git a/galaxyui/src/app/home/home.module.ts b/galaxyui/src/app/home/home.module.ts index 864623bbe..d6d27ed84 100644 --- a/galaxyui/src/app/home/home.module.ts +++ b/galaxyui/src/app/home/home.module.ts @@ -1,22 +1,36 @@ -import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { + NgModule, + CUSTOM_ELEMENTS_SCHEMA +} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; -import { CarouselComponent } from './carousel/carousel.component'; -import { HomeComponent } from './home.component'; -import { HomeRoutingModule } from './home.routing.module'; -import { PopularComponent } from './popular/popular.component'; +import { CarouselComponent } from './carousel/carousel.component'; +import { PopularComponent } from './popular/popular.component'; +import { HomeComponent } from './home.component'; +import { HomeRoutingModule } from './home.routing.module'; -import { CardModule } from 'patternfly-ng/card/basic-card/card.module'; +import { CardModule } from 'patternfly-ng/card/basic-card/card.module'; -import { PageHeaderModule } from '../page-header/page-header.module'; -import { PageLoadingModule } from '../page-loading/page-loading.module'; +import { PageHeaderModule } from '../page-header/page-header.module'; +import { PageLoadingModule } from '../page-loading/page-loading.module'; @NgModule({ - declarations: [CarouselComponent, PopularComponent, HomeComponent], - imports: [CardModule, PageHeaderModule, PageLoadingModule, HomeRoutingModule, FormsModule, CommonModule], + declarations: [ + CarouselComponent, + PopularComponent, + HomeComponent + ], + imports: [ + CardModule, + PageHeaderModule, + PageLoadingModule, + HomeRoutingModule, + FormsModule, + CommonModule + ], providers: [], - schemas: [CUSTOM_ELEMENTS_SCHEMA], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class HomeModule {} +export class HomeModule { } diff --git a/galaxyui/src/app/home/home.resolver.service.ts b/galaxyui/src/app/home/home.resolver.service.ts index 8cdd4d41d..6b98da3e8 100644 --- a/galaxyui/src/app/home/home.resolver.service.ts +++ b/galaxyui/src/app/home/home.resolver.service.ts @@ -1,25 +1,40 @@ -import { Injectable } from '@angular/core'; +import { + Injectable +} from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot +} from '@angular/router'; -import { Observable } from 'rxjs/Observable'; -import { ContentBlock } from '../resources/content-blocks/content-block'; -import { ContentBlocksService } from '../resources/content-blocks/content-blocks.service'; -import { NamespaceService } from '../resources/namespaces/namespace.service'; -import { PagedResponse } from '../resources/paged-response'; +import { Observable } from 'rxjs/Observable'; + +import { ContentBlocksService } from '../resources/content-blocks/content-blocks.service'; +import { ContentBlock } from '../resources/content-blocks/content-block'; +import { NamespaceService } from '../resources/namespaces/namespace.service'; +import { Namespace } from '../resources/namespaces/namespace'; +import { PagedResponse } from '../resources/paged-response'; @Injectable() export class VendorListResolver implements Resolve { - constructor(private namespaceService: NamespaceService) {} + constructor( + private namespaceService: NamespaceService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.namespaceService.pagedQuery({ is_vendor: 'true' }); + return this.namespaceService.pagedQuery({is_vendor: 'true'}); } } @Injectable() export class ContentBlockResolver implements Resolve { - constructor(private blockService: ContentBlocksService) {} + constructor( + private blockService: ContentBlocksService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { return this.blockService.query(); } diff --git a/galaxyui/src/app/home/home.routing.module.ts b/galaxyui/src/app/home/home.routing.module.ts index 13e3e645f..837a13354 100644 --- a/galaxyui/src/app/home/home.routing.module.ts +++ b/galaxyui/src/app/home/home.routing.module.ts @@ -1,10 +1,20 @@ -import { NgModule } from '@angular/core'; +import { + NgModule +} from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { + RouterModule, + Routes +} from '@angular/router'; -import { HomeComponent } from './home.component'; +import { + HomeComponent +} from './home.component'; -import { ContentBlockResolver, VendorListResolver } from './home.resolver.service'; +import { + VendorListResolver, + ContentBlockResolver +} from './home.resolver.service'; const homeRoutes: Routes = [ { @@ -12,14 +22,21 @@ const homeRoutes: Routes = [ component: HomeComponent, resolve: { vendors: VendorListResolver, - contentBlocks: ContentBlockResolver, - }, - }, + contentBlocks: ContentBlockResolver + } + } ]; @NgModule({ - imports: [RouterModule.forChild(homeRoutes)], - exports: [RouterModule], - providers: [VendorListResolver, ContentBlockResolver], + imports: [ + RouterModule.forChild(homeRoutes) + ], + exports: [ + RouterModule, + ], + providers: [ + VendorListResolver, + ContentBlockResolver + ] }) -export class HomeRoutingModule {} +export class HomeRoutingModule { } diff --git a/galaxyui/src/app/home/popular/popular.component.ts b/galaxyui/src/app/home/popular/popular.component.ts index 913abd621..14e2f07d1 100644 --- a/galaxyui/src/app/home/popular/popular.component.ts +++ b/galaxyui/src/app/home/popular/popular.component.ts @@ -1,8 +1,18 @@ -import { Component, OnInit } from '@angular/core'; +import { + Component, + OnInit, + Input, + AfterViewInit +} from '@angular/core'; -import { Router } from '@angular/router'; +import { + Router +} from '@angular/router'; + +import { + ContentTypes +} from '../../enums/content-types.enum'; -import { ContentTypes } from '../../enums/content-types.enum'; class Category { name: string; @@ -10,57 +20,60 @@ class Category { } @Component({ - selector: 'popular-component', + selector: 'popular-component', templateUrl: './popular.component.html', - styleUrls: ['./popular.component.less'], + styleUrls: ['./popular.component.less'] }) export class PopularComponent implements OnInit { + categories: Category[] = []; - constructor(private router: Router) {} + constructor( + private router: Router + ) {} ngOnInit() { this.categories = [ { name: 'System', - iconClass: 'fa fa-desktop', + iconClass: 'fa fa-desktop' }, { name: 'Development', - iconClass: 'fa fa-code', + iconClass: 'fa fa-code' }, { name: 'Networking', - iconClass: 'fa fa-sitemap', + iconClass: 'fa fa-sitemap' }, { name: 'Cloud', - iconClass: 'fa fa-cloud-upload', + iconClass: 'fa fa-cloud-upload' }, { name: 'Database', - iconClass: 'fa fa-database', + iconClass: 'fa fa-database' }, { name: 'Monitoring', - iconClass: 'fa fa-bar-chart', + iconClass: 'fa fa-bar-chart' }, { name: 'Packaging', - iconClass: 'fa fa-cube', + iconClass: 'fa fa-cube' }, { name: 'Playbook Bundles', - iconClass: 'pficon-bundle', + iconClass: 'pficon-bundle' }, { name: 'Security', - iconClass: 'fa fa-lock', + iconClass: 'fa fa-lock' }, { name: 'Web', - iconClass: 'fa fa-globe', - }, + iconClass: 'fa fa-globe' + } ] as Category[]; } @@ -71,6 +84,7 @@ export class PopularComponent implements OnInit { } else { params['tags'] = category.name.toLowerCase(); } - this.router.navigate(['/', 'search'], { queryParams: params }); + this.router.navigate(['/', 'search'], {queryParams: params}); } + } diff --git a/galaxyui/src/app/login/login.component.spec.ts b/galaxyui/src/app/login/login.component.spec.ts index 2dafb79dd..490e81bdf 100644 --- a/galaxyui/src/app/login/login.component.spec.ts +++ b/galaxyui/src/app/login/login.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HomeComponent } from './home.component'; describe('HomeComponent', () => { - let component: HomeComponent; - let fixture: ComponentFixture; + let component: HomeComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [HomeComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HomeComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(HomeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/login/login.component.ts b/galaxyui/src/app/login/login.component.ts index 7b1303b80..dbe534825 100644 --- a/galaxyui/src/app/login/login.component.ts +++ b/galaxyui/src/app/login/login.component.ts @@ -16,11 +16,27 @@ * along with Galaxy. If not, see . */ -import { Component, OnInit } from '@angular/core'; +import { + Component, + OnInit +} from '@angular/core'; -import { ActivatedRoute, ParamMap } from '@angular/router'; +import { + ActivatedRoute, + ParamMap +} from '@angular/router'; -import { CardConfig } from 'patternfly-ng/card/basic-card/card-config'; +import { + CardConfig +} from 'patternfly-ng/card/basic-card/card-config'; + +import { + Location +} from '@angular/common'; + +import { + Router +} from '@angular/router'; import { Observable } from 'rxjs/Observable'; @@ -29,34 +45,40 @@ import 'rxjs/add/operator/switchMap'; import { AuthService } from '../auth/auth.service'; @Component({ - selector: 'login', + selector: 'login', templateUrl: './login.component.html', - styleUrls: ['./login.component.less'], + styleUrls: ['./login.component.less'] }) export class LoginComponent implements OnInit { + config: CardConfig; msgText = 'Log into Galaxy by clicking on one of the above SCMs'; connectingMsg = ''; errorParam: Observable; redirectUrl: string = null; - constructor(private authService: AuthService, private route: ActivatedRoute) {} + constructor( + private authService: AuthService, + private route: ActivatedRoute, + private location: Location + ) {} ngOnInit() { this.config = { noPadding: true, - topBorder: false, + topBorder: false } as CardConfig; this.redirectUrl = this.authService.redirectUrl; - this.errorParam = this.route.paramMap.switchMap((params: ParamMap) => { - return new Observable(observer => { - return observer.next(params.get('error') === 'true' ? true : false); + this.errorParam = this.route.paramMap + .switchMap((params: ParamMap) => { + return new Observable(observer => { + return observer.next((params.get('error') === 'true') ? true : false); + }); }); - }); - this.errorParam.subscribe(result => { + this.errorParam.subscribe((result) => { if (result) { this.msgText = 'To view the selected page, you must first log into Galaxy by clicking on one of the above SCMs'; } else { diff --git a/galaxyui/src/app/login/login.module.ts b/galaxyui/src/app/login/login.module.ts index 6fde5eb3b..17de59532 100644 --- a/galaxyui/src/app/login/login.module.ts +++ b/galaxyui/src/app/login/login.module.ts @@ -1,14 +1,27 @@ -import { NgModule } from '@angular/core'; +import { + NgModule +} from '@angular/core'; -import { LoginComponent } from './login.component'; +import { + LoginComponent +} from './login.component'; -import { LoginRoutingModule } from './login.routing.module'; +import { + LoginRoutingModule +} from './login.routing.module'; -import { CardModule } from 'patternfly-ng/card/basic-card/card.module'; +import { + CardModule +} from 'patternfly-ng/card/basic-card/card.module'; @NgModule({ - declarations: [LoginComponent], - imports: [CardModule, LoginRoutingModule], - providers: [], + declarations: [ + LoginComponent + ], + imports: [ + CardModule, + LoginRoutingModule + ], + providers: [] }) -export class LoginModule {} +export class LoginModule { } diff --git a/galaxyui/src/app/login/login.routing.module.ts b/galaxyui/src/app/login/login.routing.module.ts index 46b3baf90..a6fb7aaeb 100644 --- a/galaxyui/src/app/login/login.routing.module.ts +++ b/galaxyui/src/app/login/login.routing.module.ts @@ -1,19 +1,32 @@ -import { NgModule } from '@angular/core'; +import { + NgModule +} from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { + RouterModule, + Routes +} from '@angular/router'; + +import { + LoginComponent +} from './login.component'; -import { LoginComponent } from './login.component'; const loginRoutes: Routes = [ { path: 'login', - component: LoginComponent, - }, + component: LoginComponent + } ]; + @NgModule({ - imports: [RouterModule.forChild(loginRoutes)], - exports: [RouterModule], - providers: [], + imports: [ + RouterModule.forChild(loginRoutes) + ], + exports: [ + RouterModule, + ], + providers: [] }) -export class LoginRoutingModule {} +export class LoginRoutingModule { } diff --git a/galaxyui/src/app/my-content/add-repository-modal/add-repository-modal.component.spec.ts b/galaxyui/src/app/my-content/add-repository-modal/add-repository-modal.component.spec.ts index 34da042bc..24fd36791 100644 --- a/galaxyui/src/app/my-content/add-repository-modal/add-repository-modal.component.spec.ts +++ b/galaxyui/src/app/my-content/add-repository-modal/add-repository-modal.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AddRepositoryModalComponent } from './add-repository-modal.component'; describe('AddRepositoryModalComponent', () => { - let component: AddRepositoryModalComponent; - let fixture: ComponentFixture; + let component: AddRepositoryModalComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [AddRepositoryModalComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AddRepositoryModalComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(AddRepositoryModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AddRepositoryModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-content/add-repository-modal/add-repository-modal.component.ts b/galaxyui/src/app/my-content/add-repository-modal/add-repository-modal.component.ts index 722ab6ec5..863732f30 100644 --- a/galaxyui/src/app/my-content/add-repository-modal/add-repository-modal.component.ts +++ b/galaxyui/src/app/my-content/add-repository-modal/add-repository-modal.component.ts @@ -1,19 +1,25 @@ -import { Component, OnInit } from '@angular/core'; +import { + Component, + OnInit +} from '@angular/core'; -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { ListEvent } from 'patternfly-ng/list/list-event'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { cloneDeep } from 'lodash'; -import { BsModalRef } from 'ngx-bootstrap'; +import { BsModalRef } from 'ngx-bootstrap'; +import { cloneDeep } from 'lodash'; -import { Observable } from 'rxjs/Observable'; -import { forkJoin } from 'rxjs/observable/forkJoin'; +import { Subject } from 'rxjs'; +import { forkJoin } from 'rxjs/observable/forkJoin'; +import { Observable } from 'rxjs/Observable'; -import { Namespace } from '../../resources/namespaces/namespace'; -import { ProviderSourceService } from '../../resources/provider-namespaces/provider-source.service'; -import { Repository } from '../../resources/repositories/repository'; -import { RepositoryService } from '../../resources/repositories/repository.service'; +import { Namespace } from '../../resources/namespaces/namespace'; +import { ProviderSourceService } from '../../resources/provider-namespaces/provider-source.service'; +import { RepositoryService } from '../../resources/repositories/repository.service'; +import { Repository } from '../../resources/repositories/repository'; +import { RepositoryImport } from '../../resources/repository-imports/repository-import'; +import { RepositoryImportService } from '../../resources/repository-imports/repository-import.service'; class RepositorySource { name: string; @@ -47,12 +53,14 @@ class ProviderNamespace { filteredSources: RepositorySource[]; } + @Component({ selector: 'add-repository-modal', templateUrl: './add-repository-modal.component.html', - styleUrls: ['./add-repository-modal.component.less'], + styleUrls: ['./add-repository-modal.component.less'] }) export class AddRepositoryModalComponent implements OnInit { + emptyStateConfig: EmptyStateConfig = {} as EmptyStateConfig; namespace: Namespace; selectedPNS: ProviderNamespace; @@ -64,11 +72,11 @@ export class AddRepositoryModalComponent implements OnInit { listConfig: ListConfig; filterValue = ''; - constructor( - public bsModalRef: BsModalRef, - private repositoryService: RepositoryService, - private providerSourceService: ProviderSourceService, - ) {} + constructor(public bsModalRef: BsModalRef, + private repositoryService: RepositoryService, + private repositoryImportService: RepositoryImportService, + private providerSourceService: ProviderSourceService) { + } ngOnInit() { this.providerNamespaces = []; @@ -89,7 +97,7 @@ export class AddRepositoryModalComponent implements OnInit { showCheckbox: true, showRadioButton: false, useExpandItems: false, - emptyStateConfig: this.emptyStateConfig, + emptyStateConfig: this.emptyStateConfig } as ListConfig; this.getRepoSources(); @@ -103,9 +111,8 @@ export class AddRepositoryModalComponent implements OnInit { filterRepos(filterValue: string) { if (filterValue) { this.filterValue = filterValue; - this.selectedPNS.filteredSources = this.selectedPNS.repoSources.filter(repo => - repo.name.toLowerCase().match(filterValue.toLowerCase()), - ); + this.selectedPNS.filteredSources = this.selectedPNS.repoSources.filter( + repo => repo.name.toLowerCase().match(filterValue.toLowerCase())); } else { this.filterValue = ''; this.selectedPNS.filteredSources = this.selectedPNS.repoSources; @@ -135,7 +142,8 @@ export class AddRepositoryModalComponent implements OnInit { this.repositoriesAdded = true; this.saveInProgress = true; const saveRequests: Observable[] = []; - const selected: RepositorySource[] = this.selectedPNS.repoSources.filter(repoSource => repoSource.isSelected); + const selected: RepositorySource[] = this.selectedPNS.repoSources + .filter((repoSource) => repoSource.isSelected); if (!selected.length) { // nothing was selected @@ -146,14 +154,14 @@ export class AddRepositoryModalComponent implements OnInit { } selected.forEach(repoSource => { - const newRepo = new Repository(); - newRepo.name = repoSource.name; - newRepo.original_name = repoSource.name; - newRepo.description = repoSource.description ? repoSource.description : repoSource.name; - newRepo.provider_namespace = this.selectedPNS.id; - newRepo.is_enabled = true; - saveRequests.push(this.repositoryService.save(newRepo)); - }); + const newRepo = new Repository(); + newRepo.name = repoSource.name; + newRepo.original_name = repoSource.name; + newRepo.description = repoSource.description ? repoSource.description : repoSource.name; + newRepo.provider_namespace = this.selectedPNS.id; + newRepo.is_enabled = true; + saveRequests.push(this.repositoryService.save(newRepo)); + }); forkJoin(saveRequests).subscribe((results: Repository[]) => { this.saveInProgress = false; @@ -180,20 +188,18 @@ export class AddRepositoryModalComponent implements OnInit { this.setLoadingStateConfig(); this.selectedPNS.repoSources = []; this.selectedPNS.filteredSources = []; - this.providerSourceService - .getRepoSources({ - providerName: this.selectedPNS.provider_name, - name: this.selectedPNS.name, - }) - .subscribe(repoSources => { - repoSources.forEach(repoSource => { - if (!repoSource.summary_fields.repository) { - this.selectedPNS.repoSources.push(repoSource as RepositorySource); - } - }); - this.filterRepos(this.filterValue); - this.setEmptyStateConfig(); + this.providerSourceService.getRepoSources({ + providerName: this.selectedPNS.provider_name, + name: this.selectedPNS.name + }).subscribe(repoSources => { + repoSources.forEach(repoSource => { + if (!repoSource.summary_fields.repository) { + this.selectedPNS.repoSources.push(repoSource as RepositorySource); + } }); + this.filterRepos(this.filterValue); + this.setEmptyStateConfig(); + }); } else { this.filterRepos(this.filterValue); this.setEmptyStateConfig(); diff --git a/galaxyui/src/app/my-content/my-content.module.ts b/galaxyui/src/app/my-content/my-content.module.ts index 533b9e021..cfaca65f8 100644 --- a/galaxyui/src/app/my-content/my-content.module.ts +++ b/galaxyui/src/app/my-content/my-content.module.ts @@ -1,46 +1,58 @@ +import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { + FormsModule, + ReactiveFormsModule +} from '@angular/forms'; import { MyContentRoutingModule } from './my-content.routing.module'; -import { BsDropdownConfig, BsDropdownModule } from 'ngx-bootstrap'; +import { + BsDropdownConfig, + BsDropdownModule +} from 'ngx-bootstrap'; + -import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { ModalModule } from 'patternfly-ng'; -import { ActionModule } from 'patternfly-ng/action/action.module'; +import { ActionModule } from 'patternfly-ng/action/action.module'; import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; -import { FilterModule } from 'patternfly-ng/filter/filter.module'; -import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; +import { FilterModule } from 'patternfly-ng/filter/filter.module'; +import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; +import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; +import { ModalModule } from 'patternfly-ng'; import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; -import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; -import { NamespaceDetailComponent } from './namespace-detail/namespace-detail.component'; -import { OwnersContentComponent } from './namespace-list/content/owners-content/owners-content.component'; -import { RepositoriesContentComponent } from './namespace-list/content/repositories-content/repositories-content.component'; -import { NamespaceListComponent } from './namespace-list/namespace-list.component'; +import { NamespaceListComponent } from './namespace-list/namespace-list.component'; +import { NamespaceDetailComponent } from './namespace-detail/namespace-detail.component'; +import { RepositoriesContentComponent } from './namespace-list/content/repositories-content/repositories-content.component'; +import { OwnersContentComponent } from './namespace-list/content/owners-content/owners-content.component'; -// prettier-ignore import { ProviderNamespacesContentComponent } from './namespace-list/content/provider-namespaces-content/provider-namespaces-content.component'; -import { AddRepositoryModalComponent } from './add-repository-modal/add-repository-modal.component'; +import { + AddRepositoryModalComponent +} from './add-repository-modal/add-repository-modal.component'; -// prettier-ignore import { AlternateNameModalComponent } from './namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component'; -import { PageHeaderModule } from '../page-header/page-header.module'; -import { PageLoadingModule } from '../page-loading/page-loading.module'; -import { NamespaceActionComponent } from './namespace-list/action/action.component'; +import { PageHeaderModule } from '../page-header/page-header.module'; +import { PageLoadingModule } from '../page-loading/page-loading.module'; +import { NamespaceActionComponent } from './namespace-list/action/action.component'; -import { NamespaceRepositoryActionComponent } from './namespace-list/content/repositories-content/action/action.component'; +import { + NamespaceRepositoryActionComponent +} from './namespace-list/content/repositories-content/action/action.component'; @NgModule({ - entryComponents: [AddRepositoryModalComponent, AlternateNameModalComponent], + entryComponents: [ + AddRepositoryModalComponent, + AlternateNameModalComponent, + ], declarations: [ NamespaceListComponent, NamespaceDetailComponent, @@ -50,7 +62,7 @@ import { NamespaceRepositoryActionComponent } from './namespace-list/content/rep AddRepositoryModalComponent, AlternateNameModalComponent, NamespaceActionComponent, - NamespaceRepositoryActionComponent, + NamespaceRepositoryActionComponent ], imports: [ ActionModule, @@ -67,8 +79,11 @@ import { NamespaceRepositoryActionComponent } from './namespace-list/content/rep PaginationModule, PageHeaderModule, PageLoadingModule, - MyContentRoutingModule, + MyContentRoutingModule ], - providers: [BsDropdownConfig], + providers: [ + BsDropdownConfig + ] }) -export class MyContentModule {} +export class MyContentModule { +} diff --git a/galaxyui/src/app/my-content/my-content.routing.module.ts b/galaxyui/src/app/my-content/my-content.routing.module.ts index 4770c7399..4011dc1da 100644 --- a/galaxyui/src/app/my-content/my-content.routing.module.ts +++ b/galaxyui/src/app/my-content/my-content.routing.module.ts @@ -1,57 +1,72 @@ -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { + RouterModule, + Routes +} from '@angular/router'; -import { AuthService } from '../auth/auth.service'; +import { AuthService } from '../auth/auth.service'; import { NamespaceDetailComponent } from './namespace-detail/namespace-detail.component'; -import { MeResolver, NamespaceDetailResolver } from './namespace-detail/namespace-detail.resolver.service'; +import { + NamespaceDetailResolver, + MeResolver +} from './namespace-detail/namespace-detail.resolver.service'; -import { NamespaceListResolver } from './namespace-list/namespace-list-resolver.service'; -import { NamespaceListComponent } from './namespace-list/namespace-list.component'; +import { NamespaceListComponent } from './namespace-list/namespace-list.component'; +import { NamespaceListResolver } from './namespace-list/namespace-list-resolver.service'; const myContentRoutes: Routes = [ { - path: '', - redirectTo: 'namespaces', + path: 'my-content', + redirectTo: 'my-content/namespaces', pathMatch: 'full', - canActivate: [AuthService], + canActivate: [AuthService] }, { - path: 'namespaces/new', + path: 'my-content/namespaces/new', component: NamespaceDetailComponent, resolve: { me: MeResolver, namespace: NamespaceDetailResolver, }, data: { - expectedRole: 'isStaff', + expectedRole: 'isStaff' }, - canActivate: [AuthService], + canActivate: [AuthService] }, { - path: 'namespaces/:id', + path: 'my-content/namespaces/:id', component: NamespaceDetailComponent, resolve: { me: MeResolver, namespace: NamespaceDetailResolver, }, - canActivate: [AuthService], + canActivate: [AuthService] }, { - path: 'namespaces', + path: 'my-content/namespaces', component: NamespaceListComponent, resolve: { me: MeResolver, - namespaces: NamespaceListResolver, + namespaces: NamespaceListResolver }, - canActivate: [AuthService], - }, + canActivate: [AuthService] + } ]; @NgModule({ - imports: [RouterModule.forChild(myContentRoutes)], - exports: [RouterModule], - providers: [NamespaceDetailResolver, NamespaceListResolver, MeResolver], + imports: [ + RouterModule.forChild(myContentRoutes) + ], + exports: [ + RouterModule, + ], + providers: [ + NamespaceDetailResolver, + NamespaceListResolver, + MeResolver + ] }) -export class MyContentRoutingModule {} +export class MyContentRoutingModule { +} diff --git a/galaxyui/src/app/my-content/namespace-detail/namespace-detail.component.spec.ts b/galaxyui/src/app/my-content/namespace-detail/namespace-detail.component.spec.ts index 2fb108444..ed2ddb06f 100644 --- a/galaxyui/src/app/my-content/namespace-detail/namespace-detail.component.spec.ts +++ b/galaxyui/src/app/my-content/namespace-detail/namespace-detail.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NamespaceDetailComponent } from './namespace-detail.component'; describe('NamespaceDetailComponent', () => { - let component: NamespaceDetailComponent; - let fixture: ComponentFixture; + let component: NamespaceDetailComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [NamespaceDetailComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ NamespaceDetailComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(NamespaceDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(NamespaceDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-content/namespace-detail/namespace-detail.component.ts b/galaxyui/src/app/my-content/namespace-detail/namespace-detail.component.ts index fbc787272..5ecec3cc0 100644 --- a/galaxyui/src/app/my-content/namespace-detail/namespace-detail.component.ts +++ b/galaxyui/src/app/my-content/namespace-detail/namespace-detail.component.ts @@ -1,24 +1,34 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Router, ActivatedRoute } from '@angular/router'; import { cloneDeep } from 'lodash'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; - -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterEvent } from 'patternfly-ng/filter/filter-event'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; - -import { IMe } from '../../auth/auth.service'; -import { Namespace } from '../../resources/namespaces/namespace'; -import { NamespaceService } from '../../resources/namespaces/namespace.service'; -import { ProviderNamespace } from '../../resources/provider-namespaces/provider-namespace'; -import { ProviderSource } from '../../resources/provider-namespaces/provider-source'; +import { + FormBuilder, + FormControl, + FormGroup, + Validators +} from '@angular/forms'; + +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { FilterComponent } from 'patternfly-ng/filter/filter.component'; + +import { Me } from '../../auth/auth.service'; +import { Namespace } from '../../resources/namespaces/namespace'; +import { NamespaceService } from '../../resources/namespaces/namespace.service'; +import { UserService } from '../../resources/users/user.service'; +import { User } from '../../resources/users/user'; +import { ProviderNamespace } from '../../resources/provider-namespaces/provider-namespace'; +import { ProviderSource } from '../../resources/provider-namespaces/provider-source'; import { ProviderSourceService } from '../../resources/provider-namespaces/provider-source.service'; -import { User } from '../../resources/users/user'; -import { UserService } from '../../resources/users/user.service'; class Owner { username: string; @@ -45,9 +55,10 @@ class Source { @Component({ selector: 'app-namespace-detail', templateUrl: './namespace-detail.component.html', - styleUrls: ['./namespace-detail.component.less'], + styleUrls: ['./namespace-detail.component.less'] }) export class NamespaceDetailComponent implements OnInit { + @Input() set namespace(data: Namespace) { this._namespace = data; @@ -58,12 +69,13 @@ export class NamespaceDetailComponent implements OnInit { } _namespace: Namespace; - me: IMe; + me: Me; pageTitle = 'My Content;/my-content;Add Namespace'; pageIcon = 'fa fa-list'; pageLoading = true; + namespaceForm: FormGroup; namespaceFilterConfig: FilterConfig; userFilterConfig: FilterConfig; @@ -82,64 +94,64 @@ export class NamespaceDetailComponent implements OnInit { private formBuilder: FormBuilder, private namespaceService: NamespaceService, private userService: UserService, - private providerSourceService: ProviderSourceService, + private providerSourceService: ProviderSourceService ) {} ngOnInit() { - this.route.data.subscribe(data => { - this.me = data['me']; - this.namespace = new Namespace(); - this.pageLoading = false; - if (data['namespace']) { - this.namespace = data['namespace']; - if (this.namespace && this.namespace['summary_fields']) { - this.selectedUsers = this.namespace.summary_fields['owners'] as Owner[]; - this.selectedNamespaces = this.namespace.summary_fields['provider_namespaces'] as Source[]; - this.pageTitle = 'My Content;/my-content;Edit Namespace'; - } else { - // Requested namespace not found - this.router.navigate(['/not-found']); + this.route.data + .subscribe(data => { + this.me = data['me']; + this.namespace = new Namespace(); + this.pageLoading = false; + if (data['namespace']) { + this.namespace = data['namespace']; + if (this.namespace && this.namespace['summary_fields']) { + this.selectedUsers = this.namespace.summary_fields['owners'] as Owner[]; + this.selectedNamespaces = this.namespace.summary_fields['provider_namespaces'] as Source[]; + this.pageTitle = 'My Content;/my-content;Edit Namespace'; + } else { + // Requested namespace not found + this.router.navigate(['/not-found']); + } } - } - this.createForm(); - this.getUsers(); - this.getProviderSources(); - }); + this.createForm(); + this.getUsers(); + this.getProviderSources(); + }); this.namespaceFilterConfig = { - fields: [ - { - id: 'name', - title: 'Name', - placeholder: 'Filter by Name', - type: FilterType.TEXT, - }, - ] as FilterField[], + fields: [{ + id: 'name', + title: 'Name', + placeholder: 'Filter by Name', + type: FilterType.TEXT + }] as FilterField[], resultsCount: 0, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; this.userFilterConfig = { - fields: [ - { - id: 'name', - title: 'Name', - placeholder: 'Filter by Name', - type: FilterType.TEXT, - }, - ] as FilterField[], + fields: [{ + id: 'name', + title: 'Name', + placeholder: 'Filter by Name', + type: FilterType.TEXT + }] as FilterField[], resultsCount: 0, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; } saveNamespace($event) { const namespace: Namespace = this.prepareSaveNamespace(); - this.namespaceService.save(namespace).subscribe(result => { - if (!this.namespaceService.encounteredErrors) { - this.router.navigate(['/my-content']); - } - }); + this.namespaceService.save(namespace) + .subscribe( + result => { + if (!this.namespaceService.encounteredErrors) { + this.router.navigate(['/my-content']); + } + } + ); } toggleUser(id: number): void { @@ -247,6 +259,7 @@ export class NamespaceDetailComponent implements OnInit { } } + // private private createForm() { @@ -258,7 +271,7 @@ export class NamespaceDetailComponent implements OnInit { avatar_url: [this.namespace.avatar_url], email: [this.namespace.email], html_url: [this.namespace.html_url], - namespaceType: this.namespace.is_vendor ? ['vendor'] : ['community'], + namespaceType: (this.namespace.is_vendor) ? ['vendor'] : ['community'] }); if (!this.me.staff) { this.namespaceForm.controls['namespaceType'].disable(); @@ -268,20 +281,26 @@ export class NamespaceDetailComponent implements OnInit { private getUsers(params?: any): void { this.usersLoading = true; - this.userService.query(params).subscribe(users => { - this.users = this.prepUsersForList(users); - this.userFilterConfig.resultsCount = this.users.length; - this.usersLoading = false; - }); + this.userService.query(params) + .subscribe( + users => { + this.users = this.prepUsersForList(users); + this.userFilterConfig.resultsCount = this.users.length; + this.usersLoading = false; + } + ); } private getProviderSources(): void { this.namespacesLoading = true; - this.providerSourceService.query().subscribe(providerSources => { - this.providerSources = this.prepProviderSourcesForList(providerSources); - this.providerSourcesFiltered = this.providerSources; - this.namespacesLoading = false; - }); + this.providerSourceService.query() + .subscribe( + providerSources => { + this.providerSources = this.prepProviderSourcesForList(providerSources); + this.providerSourcesFiltered = this.providerSources; + this.namespacesLoading = false; + } + ); } private prepUsersForList(users: User[]): User[] { @@ -331,7 +350,7 @@ export class NamespaceDetailComponent implements OnInit { ns.email = formModel.email as string; ns.html_url = formModel.html_url as string; ns.active = true; - ns.is_vendor = formModel.namespaceType === 'vendor' ? true : false; + ns.is_vendor = (formModel.namespaceType === 'vendor') ? true : false; const owners: User[] = []; const pns: ProviderNamespace[] = []; diff --git a/galaxyui/src/app/my-content/namespace-detail/namespace-detail.resolver.service.spec.ts b/galaxyui/src/app/my-content/namespace-detail/namespace-detail.resolver.service.spec.ts index 22679bfb6..43f754c84 100644 --- a/galaxyui/src/app/my-content/namespace-detail/namespace-detail.resolver.service.spec.ts +++ b/galaxyui/src/app/my-content/namespace-detail/namespace-detail.resolver.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { NamespaceDetailResolver } from './namespace-detail-resolver.service'; describe('NamespaceDetailResolver', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [NamespaceDetailResolver], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [NamespaceDetailResolver] }); + }); - it('should be created', inject([NamespaceDetailResolver], (service: NamespaceDetailResolver) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([NamespaceDetailResolver], (service: NamespaceDetailResolver) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/my-content/namespace-detail/namespace-detail.resolver.service.ts b/galaxyui/src/app/my-content/namespace-detail/namespace-detail.resolver.service.ts index 73b2bf4fd..73b11b7c2 100644 --- a/galaxyui/src/app/my-content/namespace-detail/namespace-detail.resolver.service.ts +++ b/galaxyui/src/app/my-content/namespace-detail/namespace-detail.resolver.service.ts @@ -1,19 +1,30 @@ import 'rxjs/add/operator/map'; import 'rxjs/add/operator/take'; -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; -import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; +import { + Router, + Resolve, + RouterStateSnapshot, + ActivatedRouteSnapshot +} from '@angular/router'; -import { Namespace } from '../../resources/namespaces/namespace'; -import { NamespaceService } from '../../resources/namespaces/namespace.service'; +import { Namespace } from '../../resources/namespaces/namespace'; +import { NamespaceService } from '../../resources/namespaces/namespace.service'; + +import { + AuthService, + Me +} from '../../auth/auth.service'; -import { AuthService, IMe } from '../../auth/auth.service'; @Injectable() export class NamespaceDetailResolver implements Resolve { - constructor(private namespaceService: NamespaceService, private router: Router) {} + constructor( + private namespaceService: NamespaceService, + private router: Router) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { const id = route.paramMap.get('id'); @@ -22,25 +33,24 @@ export class NamespaceDetailResolver implements Resolve { return null; } - return this.namespaceService - .get(Number(id)) - .take(1) - .map(namespace => { - if (namespace) { - return namespace; - } else { - this.router.navigate(['/my-content/namespaces/new']); - return null; - } - }); + return this.namespaceService.get(Number(id)).take(1).map(namespace => { + if (namespace) { + return namespace; + } else { + this.router.navigate(['/my-content/namespaces/new']); + return null; + } + }); } } @Injectable() -export class MeResolver implements Resolve { - constructor(private authService: AuthService) {} +export class MeResolver implements Resolve { + constructor( + private authService: AuthService, + private router: Router) {} - resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { return this.authService.me(); } } diff --git a/galaxyui/src/app/my-content/namespace-list/action/action.component.ts b/galaxyui/src/app/my-content/namespace-list/action/action.component.ts index 3bd380af6..c403036b2 100644 --- a/galaxyui/src/app/my-content/namespace-list/action/action.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/action/action.component.ts @@ -1,20 +1,30 @@ -import { Component, EventEmitter, Input, OnInit, Output, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; +import { + Component, + EventEmitter, + Input, + Output, + OnInit, + TemplateRef, + ViewChild, + ViewEncapsulation +} from '@angular/core'; -import { Action } from 'patternfly-ng/action/action'; -import { ActionConfig } from 'patternfly-ng/action/action-config'; +import { Action } from 'patternfly-ng/action/action'; +import { ActionConfig } from 'patternfly-ng/action/action-config'; + +import { Namespace } from '../../../resources/namespaces/namespace'; +import { AuthService } from '../../../auth/auth.service'; -import { AuthService } from '../../../auth/auth.service'; -import { Namespace } from '../../../resources/namespaces/namespace'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'namespace-action', templateUrl: './action.component.html', - styleUrls: ['./action.component.less'], + styleUrls: ['./action.component.less'] }) export class NamespaceActionComponent implements OnInit { - @ViewChild('addContentButtonTemplate') - public buttonTemplate: TemplateRef; + + @ViewChild('addContentButtonTemplate') public buttonTemplate: TemplateRef; @Input() set namespace(data: Namespace) { @@ -25,72 +35,68 @@ export class NamespaceActionComponent implements OnInit { return this._namespace; } - @Output() - handleAction = new EventEmitter(); + @Output() handleAction = new EventEmitter(); _namespace: Namespace; actionConfig: ActionConfig; - constructor(private authService: AuthService) {} + constructor( + private authService: AuthService + ) {} ngOnInit(): void { const provider_namespaces = this.namespace['summary_fields']['provider_namespaces']; let primaryTooltip = 'Add yor Ansible content repositories'; if (!this.namespace.active) { - primaryTooltip = 'Namespace is disabled'; + primaryTooltip = 'Namespace is disabled'; } if (!provider_namespaces.length) { - primaryTooltip = 'Missing provider namespaces'; + primaryTooltip = 'Missing provider namespaces'; } this.actionConfig = { - primaryActions: [ - { - id: 'addContent', - title: 'Add Content', - styleClass: 'btn-primary', - tooltip: primaryTooltip, - template: this.buttonTemplate, - disabled: !this.namespace.active || !provider_namespaces.length, - }, - ] as Action[], - moreActions: [ - { - id: 'enableNamespace', - title: 'Enable', - styleClass: 'btn-default', - tooltip: 'Enable namespace', - visible: !this.namespace.active, - }, - { - id: 'editNamespaceProps', - title: 'Edit Properties', - tooltip: 'Edit namespace properties', - }, - { - id: 'disableNamespace', - title: 'Disable', - tooltip: 'Disable namespace', - visible: this.namespace.active, - }, - { - id: 'deleteNamespace', - title: 'Delete', - tooltip: 'Delete namespace', - visible: this.authService.meCache.staff, - }, - ] as Action[], + primaryActions: [{ + id: 'addContent', + title: 'Add Content', + styleClass: 'btn-primary', + tooltip: primaryTooltip, + template: this.buttonTemplate, + disabled: !this.namespace.active || !provider_namespaces.length + }] as Action[], + moreActions: [{ + id: 'enableNamespace', + title: 'Enable', + styleClass: 'btn-default', + tooltip: 'Enable namespace', + visible: !this.namespace.active + }, + { + id: 'editNamespaceProps', + title: 'Edit Properties', + tooltip: 'Edit namespace properties' + }, + { + id: 'disableNamespace', + title: 'Disable', + tooltip: 'Disable namespace', + visible: this.namespace.active + }, { + id: 'deleteNamespace', + title: 'Delete', + tooltip: 'Delete namespace', + visible: this.authService.meCache.staff + }] as Action[], moreActionsDisabled: false, moreActionsVisible: true, - moreActionsStyleClass: '', + moreActionsStyleClass: '' } as ActionConfig; } handleListAction($event: Action) { const event = { id: $event.id, - item: this.namespace, + item: this.namespace }; this.handleAction.emit(event); } diff --git a/galaxyui/src/app/my-content/namespace-list/content/owners-content/owners-content.component.spec.ts b/galaxyui/src/app/my-content/namespace-list/content/owners-content/owners-content.component.spec.ts index 70004c707..129fe6124 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/owners-content/owners-content.component.spec.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/owners-content/owners-content.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OwnersContentComponent } from './owners-content.component'; describe('OwnersContentComponent', () => { - let component: OwnersContentComponent; - let fixture: ComponentFixture; + let component: OwnersContentComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [OwnersContentComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ OwnersContentComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(OwnersContentComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(OwnersContentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-content/namespace-list/content/owners-content/owners-content.component.ts b/galaxyui/src/app/my-content/namespace-list/content/owners-content/owners-content.component.ts index a5aa27fee..8e8139311 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/owners-content/owners-content.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/owners-content/owners-content.component.ts @@ -1,17 +1,19 @@ -import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; -import { Namespace } from '../../../../resources/namespaces/namespace'; +import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core'; +import { Namespace } from '../../../../resources/namespaces/namespace'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'owners-content', templateUrl: './owners-content.component.html', - styleUrls: ['./owners-content.component.less'], + styleUrls: ['./owners-content.component.less'] }) export class OwnersContentComponent implements OnInit { - @Input() - namespace: Namespace; + @Input() namespace: Namespace; - constructor() {} + constructor() { + } + + ngOnInit() { + } - ngOnInit() {} } diff --git a/galaxyui/src/app/my-content/namespace-list/content/provider-namespaces-content/provider-namespaces-content.component.spec.ts b/galaxyui/src/app/my-content/namespace-list/content/provider-namespaces-content/provider-namespaces-content.component.spec.ts index ee0dabaa3..4de2194b0 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/provider-namespaces-content/provider-namespaces-content.component.spec.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/provider-namespaces-content/provider-namespaces-content.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ProviderNamespacesContentComponent } from './provider-namespaces-content.component'; describe('ProviderNamespacesContentComponent', () => { - let component: ProviderNamespacesContentComponent; - let fixture: ComponentFixture; + let component: ProviderNamespacesContentComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ProviderNamespacesContentComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ProviderNamespacesContentComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(ProviderNamespacesContentComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(ProviderNamespacesContentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-content/namespace-list/content/provider-namespaces-content/provider-namespaces-content.component.ts b/galaxyui/src/app/my-content/namespace-list/content/provider-namespaces-content/provider-namespaces-content.component.ts index 777e91f66..0c47fc6cd 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/provider-namespaces-content/provider-namespaces-content.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/provider-namespaces-content/provider-namespaces-content.component.ts @@ -1,18 +1,20 @@ -import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core'; -import { Namespace } from '../../../../resources/namespaces/namespace'; +import { Namespace } from '../../../../resources/namespaces/namespace'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'provider-namespaces-content', templateUrl: './provider-namespaces-content.component.html', - styleUrls: ['./provider-namespaces-content.component.less'], + styleUrls: ['./provider-namespaces-content.component.less'] }) export class ProviderNamespacesContentComponent implements OnInit { - @Input() - namespace: Namespace; + @Input() namespace: Namespace; - constructor() {} + constructor() { + } + + ngOnInit() { + } - ngOnInit() {} } diff --git a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/action/action.component.ts b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/action/action.component.ts index 1e77bd115..baf550582 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/action/action.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/action/action.component.ts @@ -1,19 +1,30 @@ -import { Component, EventEmitter, Input, OnInit, Output, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; +import { + Component, + EventEmitter, + Input, + Output, + OnInit, + TemplateRef, + ViewChild, + ViewEncapsulation +} from '@angular/core'; -import { Action } from 'patternfly-ng/action/action'; -import { ActionConfig } from 'patternfly-ng/action/action-config'; +import { Action } from 'patternfly-ng/action/action'; +import { ActionConfig } from 'patternfly-ng/action/action-config'; + +import { Repository } from '../../../../../resources/repositories/repository'; +import { AuthService } from '../../../../../auth/auth.service'; -import { Repository } from '../../../../../resources/repositories/repository'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'namespace-repository-action', templateUrl: './action.component.html', - styleUrls: ['./action.component.less'], + styleUrls: ['./action.component.less'] }) export class NamespaceRepositoryActionComponent implements OnInit { - @ViewChild('importButtonTemplate') - public buttonTemplate: TemplateRef; + + @ViewChild('importButtonTemplate') public buttonTemplate: TemplateRef; @Input() set repository(data: Repository) { @@ -24,48 +35,44 @@ export class NamespaceRepositoryActionComponent implements OnInit { return this._repository; } - @Output() - handleAction = new EventEmitter(); + @Output() handleAction = new EventEmitter(); _repository: Repository; actionConfig: ActionConfig; - constructor() {} + constructor( + private authService: AuthService + ) {} ngOnInit(): void { let importing = false; - if ( - this.repository['latest_import'] && - (this.repository['latest_import']['state'] === 'PENDING' || this.repository['latest_import']['state'] === 'RUNNING') - ) { + if (this.repository['latest_import'] && + (this.repository['latest_import']['state'] === 'PENDING' || + this.repository['latest_import']['state'] === 'RUNNING')) { importing = true; } this.actionConfig = { - primaryActions: [ - { - id: 'import', - title: 'Import', - tooltip: 'Import Repository', - template: this.buttonTemplate, - disabled: importing, - }, - ], - moreActions: [ - { - id: 'delete', - title: 'Delete', - tooltip: 'Delete Repository', - }, - ], + primaryActions: [{ + id: 'import', + title: 'Import', + tooltip: 'Import Repository', + template: this.buttonTemplate, + disabled: importing + }], + moreActions: [{ + id: 'delete', + title: 'Delete', + tooltip: 'Delete Repository' + }], moreActionsDisabled: false, - moreActionsVisible: !importing, + moreActionsVisible: !importing } as ActionConfig; } handleListAction($event: Action) { const event = { id: $event.id, - item: this.repository, + item: this.repository }; this.handleAction.emit(event); } diff --git a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component.spec.ts b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component.spec.ts index 8ad522399..a9ec1e48d 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component.spec.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component.spec.ts @@ -1,22 +1,25 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { AddRepositoryModalComponent } from './alternate-name-modal.component'; + describe('AlternateNameModalComponent', () => { - let component: AlternateNameModalComponent; - let fixture: ComponentFixture; + let component: AlternateNameModalComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [AlternateNameModalComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AlternateNameModalComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(AlternateNameModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AlternateNameModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component.ts b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component.ts index 48bb17aa8..1f8cb969a 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/alternate-name-modal/alternate-name-modal.component.ts @@ -1,18 +1,32 @@ -import { Component, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit + } from '@angular/core'; -import { AbstractControl, FormControl, ValidatorFn, Validators } from '@angular/forms'; +import { + FormControl, + Validators, + ValidatorFn, + AbstractControl + } from '@angular/forms'; -import { BsModalRef } from 'ngx-bootstrap'; +import { BsModalRef } from 'ngx-bootstrap'; -import { Repository } from '../../../../../resources/repositories/repository'; -import { RepositoryService } from '../../../../../resources/repositories/repository.service'; +import { Subject } from 'rxjs'; +import { forkJoin } from 'rxjs/observable/forkJoin'; +import { Observable } from 'rxjs/Observable'; + +import { RepositoryService } from '../../../../../resources/repositories/repository.service'; +import { Repository } from '../../../../../resources/repositories/repository'; import { RepositoryImportService } from '../../../../../resources/repository-imports/repository-import.service'; + export function forbiddenCharValidator(): ValidatorFn { const charRE = new RegExp('[^0-9A-Za-z-_]'); return (control: AbstractControl): { [key: string]: any } => { const forbidden = charRE.test(control.value); - return forbidden ? { forbiddenChar: { value: control.value } } : null; + return forbidden ? { 'forbiddenChar': { value: control.value } } : null; }; } @@ -20,7 +34,7 @@ export function forbiddenFirstCharValidator(): ValidatorFn { const charRE = new RegExp('^[A-Za-z0-9]'); return (control: AbstractControl): { [key: string]: any } => { const forbidden = !charRE.test(control.value); - return forbidden ? { forbiddenFirstChar: { value: control.value } } : null; + return forbidden ? { 'forbiddenFirstChar': { value: control.value } } : null; }; } @@ -28,33 +42,35 @@ export function forbiddenLastCharValidator(): ValidatorFn { const charRE = new RegExp('[A-Za-z0-9]$'); return (control: AbstractControl): { [key: string]: any } => { const forbidden = !charRE.test(control.value); - return forbidden ? { forbiddenLastChar: { value: control.value } } : null; + return forbidden ? { 'forbiddenLastChar': { value: control.value } } : null; }; } @Component({ selector: 'alternate-name-modale', templateUrl: './alternate-name-modal.component.html', - styleUrls: ['./alternate-name-modal.component.less'], + styleUrls: ['./alternate-name-modal.component.less'] }) export class AlternateNameModalComponent implements OnInit { + saveInProgress = false; repository: Repository; startedImport = false; - name: FormControl = new FormControl('', [ + name: FormControl = new FormControl( + '', [ Validators.required, Validators.minLength(3), forbiddenCharValidator(), forbiddenFirstCharValidator(), - forbiddenLastCharValidator(), - ]); + forbiddenLastCharValidator() + ]); + constructor( public bsModalRef: BsModalRef, private repositoryService: RepositoryService, - private repositoryImportService: RepositoryImportService, - ) {} + private repositoryImportService: RepositoryImportService) {} ngOnInit() { this.name.setValue(this.repository.name); @@ -75,12 +91,13 @@ export class AlternateNameModalComponent implements OnInit { repo.import_branch = this.repository.import_branch; repo.is_enabled = this.repository.is_enabled; this.repositoryService.save(repo).subscribe(saveResult => { - this.repositoryImportService.save({ repository_id: this.repository.id }).subscribe(importResult => { - console.log(`Started import for ${this.repository.name}`); - this.saveInProgress = true; - this.startedImport = true; - this.bsModalRef.hide(); - }); + this.repositoryImportService + .save({'repository_id': this.repository.id}).subscribe(importResult => { + console.log(`Started import for ${this.repository.name}`); + this.saveInProgress = true; + this.startedImport = true; + this.bsModalRef.hide(); + }); }); } } diff --git a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.spec.ts b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.spec.ts index 42ee36198..7d493423a 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.spec.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RepositoriesContentComponent } from './repositories-content.component'; describe('RepositoriesContentComponent', () => { - let component: RepositoriesContentComponent; - let fixture: ComponentFixture; + let component: RepositoriesContentComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [RepositoriesContentComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ RepositoriesContentComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(RepositoriesContentComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(RepositoriesContentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.ts b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.ts index 89f9a1967..875893d3a 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.ts @@ -1,43 +1,59 @@ -import { Component, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; - -import { ActionConfig } from 'patternfly-ng/action/action-config'; -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; - -import { BsModalRef, BsModalService } from 'ngx-bootstrap'; - -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; - -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; -import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; - -import { Namespace } from '../../../../resources/namespaces/namespace'; -import { PagedResponse } from '../../../../resources/paged-response'; -import { ProviderNamespace } from '../../../../resources/provider-namespaces/provider-namespace'; -import { Repository } from '../../../../resources/repositories/repository'; -import { RepositoryService } from '../../../../resources/repositories/repository.service'; +import { + Component, + OnInit, + OnDestroy, + TemplateRef, + ViewEncapsulation, + Input, +} from '@angular/core'; + +import { flatten } from 'lodash'; +import { Action } from 'patternfly-ng/action/action'; +import { ActionConfig } from 'patternfly-ng/action/action-config'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; + +import { + BsModalService, + BsModalRef +} from 'ngx-bootstrap'; + +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; + +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; +import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; + +import { Namespace } from '../../../../resources/namespaces/namespace'; +import { PagedResponse } from '../../../../resources/paged-response'; +import { ProviderNamespace } from '../../../../resources/provider-namespaces/provider-namespace'; +import { Repository } from '../../../../resources/repositories/repository'; +import { RepositoryService } from '../../../../resources/repositories/repository.service'; import { RepositoryImportService } from '../../../../resources/repository-imports/repository-import.service'; +import { RepositoryImport } from '../../../../resources/repository-imports/repository-import'; -import { AlternateNameModalComponent } from './alternate-name-modal/alternate-name-modal.component'; +import { + AlternateNameModalComponent +} from './alternate-name-modal/alternate-name-modal.component'; +import { Observable } from 'rxjs/Observable'; +import { forkJoin } from 'rxjs/observable/forkJoin'; import 'rxjs/add/observable/interval'; -import { Observable } from 'rxjs/Observable'; -import { forkJoin } from 'rxjs/observable/forkJoin'; -import * as moment from 'moment'; +import * as moment from 'moment'; + @Component({ encapsulation: ViewEncapsulation.None, selector: 'repositories-content', templateUrl: './repositories-content.component.html', - styleUrls: ['./repositories-content.component.less'], + styleUrls: ['./repositories-content.component.less'] }) export class RepositoriesContentComponent implements OnInit, OnDestroy { - @Input() - namespace: Namespace; + @Input() namespace: Namespace; @Input() set contentAdded(state: number) { @@ -80,7 +96,7 @@ export class RepositoriesContentComponent implements OnInit, OnDestroy { constructor( private repositoryService: RepositoryService, private repositoryImportService: RepositoryImportService, - private modalService: BsModalService, + private modalService: BsModalService ) { this.modalService.onHidden.subscribe(_ => { if (this.bsModalRef && this.bsModalRef.content.startedImport) { @@ -100,44 +116,44 @@ export class RepositoriesContentComponent implements OnInit, OnDestroy { id: 'name', title: 'Name', placeholder: 'Filter by Name...', - type: FilterType.TEXT, + type: FilterType.TEXT }, ] as FilterField[], resultsCount: this.items.length, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; this.toolbarConfig = { filterConfig: this.filterConfig, - views: [], + views: [] } as ToolbarConfig; this.emptyStateConfig = { actions: { primaryActions: [], - moreActions: [], + moreActions: [] } as ActionConfig, iconStyleClass: 'pficon-warning-triangle-o', title: 'No Repositories', - info: 'Add repositories by clicking the "Add Content" button above.', - helpLink: {}, + info: 'Add repositories by clicking the \'Add Content\' button above.', + helpLink: {} } as EmptyStateConfig; this.nonEmptyStateConfig = { actions: { primaryActions: [], - moreActions: [], + moreActions: [] } as ActionConfig, iconStyleClass: '', title: '', info: '', - helpLink: {}, + helpLink: {} } as EmptyStateConfig; this.disabledStateConfig = { iconStyleClass: 'pficon-warning-triangle-o', info: `The Namespace ${this.namespace.name} is disabled. You'll need to re-enable it before viewing and modifying its content.`, - title: 'Namespace Disabled', + title: 'Namespace Disabled' } as EmptyStateConfig; this.listConfig = { @@ -147,7 +163,7 @@ export class RepositoriesContentComponent implements OnInit, OnDestroy { selectItems: false, selectionMatchProp: 'name', showCheckbox: false, - useExpandItems: false, + useExpandItems: false } as ListConfig; if (this.namespace.active && provider_namespaces.length) { @@ -197,9 +213,10 @@ export class RepositoriesContentComponent implements OnInit, OnDestroy { private getRepositories() { this.loading = true; - this.polling = Observable.interval(10000).subscribe(pollingResult => { - this.refreshRepositories(); - }); + this.polling = Observable.interval(10000) + .subscribe(pollingResult => { + this.refreshRepositories(); + }); } private getDetailUrl(item: Repository) { @@ -237,9 +254,9 @@ export class RepositoriesContentComponent implements OnInit, OnDestroy { const queries: Observable[] = []; this.namespace.summary_fields.provider_namespaces.forEach((pns: ProviderNamespace) => { const query = { - provider_namespace__id: pns.id, - page_size: this.paginationConfig.pageSize, - page: this.paginationConfig.pageNumber, + 'provider_namespace__id': pns.id, + 'page_size': this.paginationConfig.pageSize, + 'page': this.paginationConfig.pageNumber, }; if (this.filterConfig) { @@ -257,7 +274,7 @@ export class RepositoriesContentComponent implements OnInit, OnDestroy { let resultCount = 0; for (const response of results) { - repositories = repositories.concat(response.results as Repository[]); + repositories = repositories.concat(response.results as Repository[]); resultCount += response.count; } @@ -299,14 +316,15 @@ export class RepositoriesContentComponent implements OnInit, OnDestroy { // Start an import repository['latest_import']['state'] = 'PENDING'; repository['latest_import']['as_of_dt'] = ''; - this.repositoryImportService.save({ repository_id: repository.id }).subscribe(response => { - console.log(`Started import for repository ${repository.id}`); - }); + this.repositoryImportService.save({'repository_id': repository.id}) + .subscribe(response => { + console.log(`Started import for repository ${repository.id}`); + }); } private deleteRepository(repository: Repository) { this.loading = true; - this.repositoryService.destroy(repository).subscribe(_ => { + this.repositoryService.destroy(repository).subscribe( _ => { this.items.forEach((item: Repository, idx: number) => { if (item.id === repository.id) { this.items.splice(idx, 1); @@ -319,12 +337,9 @@ export class RepositoriesContentComponent implements OnInit, OnDestroy { private changeRepositoryName(repository: Repository) { const initialState = { - repository: repository, + repository: repository }; - this.bsModalRef = this.modalService.show(AlternateNameModalComponent, { - initialState: initialState, - keyboard: true, - animated: true, - }); + this.bsModalRef = this.modalService.show(AlternateNameModalComponent, + { initialState: initialState, keyboard: true, animated: true }); } } diff --git a/galaxyui/src/app/my-content/namespace-list/namespace-list-resolver.service.spec.ts b/galaxyui/src/app/my-content/namespace-list/namespace-list-resolver.service.spec.ts index 77224d6c2..097cadf25 100644 --- a/galaxyui/src/app/my-content/namespace-list/namespace-list-resolver.service.spec.ts +++ b/galaxyui/src/app/my-content/namespace-list/namespace-list-resolver.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { NamespaceListResolver } from './namespace-list-resolver.service'; describe('NamespaceListResolver', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [NamespaceListResolver], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [NamespaceListResolver] }); + }); - it('should be created', inject([NamespaceListResolver], (service: NamespaceListResolver) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([NamespaceListResolver], (service: NamespaceListResolver) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/my-content/namespace-list/namespace-list-resolver.service.ts b/galaxyui/src/app/my-content/namespace-list/namespace-list-resolver.service.ts index 41f146241..b1028d475 100644 --- a/galaxyui/src/app/my-content/namespace-list/namespace-list-resolver.service.ts +++ b/galaxyui/src/app/my-content/namespace-list/namespace-list-resolver.service.ts @@ -1,21 +1,31 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot +} from '@angular/router'; -import { Observable } from 'rxjs/Observable'; -import { AuthService } from '../../auth/auth.service'; -import { NamespaceService } from '../../resources/namespaces/namespace.service'; -import { PagedResponse } from '../../resources/paged-response'; +import { Observable } from 'rxjs/Observable'; +import { NamespaceService } from '../../resources/namespaces/namespace.service'; +import { Namespace } from '../../resources/namespaces/namespace'; +import { PagedResponse } from '../../resources/paged-response'; +import { AuthService } from '../../auth/auth.service'; @Injectable() export class NamespaceListResolver implements Resolve { - constructor(private namespaceService: NamespaceService, private authService: AuthService) {} + + constructor( + private namespaceService: NamespaceService, + private router: Router, + private authService: AuthService) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { if (this.authService.meCache.staff) { // staff can view and update all namespaces return this.namespaceService.pagedQuery({}); } - return this.namespaceService.pagedQuery({ owners__username: this.authService.meCache.username }); + return this.namespaceService.pagedQuery({'owners__username': this.authService.meCache.username}); } } diff --git a/galaxyui/src/app/my-content/namespace-list/namespace-list.component.spec.ts b/galaxyui/src/app/my-content/namespace-list/namespace-list.component.spec.ts index 71fe1ae16..4ca13f504 100644 --- a/galaxyui/src/app/my-content/namespace-list/namespace-list.component.spec.ts +++ b/galaxyui/src/app/my-content/namespace-list/namespace-list.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NamespaceListComponent } from './namespace-list.component'; describe('NamespaceListComponent', () => { - let component: NamespaceListComponent; - let fixture: ComponentFixture; + let component: NamespaceListComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [NamespaceListComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ NamespaceListComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(NamespaceListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(NamespaceListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-content/namespace-list/namespace-list.component.ts b/galaxyui/src/app/my-content/namespace-list/namespace-list.component.ts index ae7a0a155..94e932e3d 100644 --- a/galaxyui/src/app/my-content/namespace-list/namespace-list.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/namespace-list.component.ts @@ -1,41 +1,54 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { + Component, + OnInit, + TemplateRef, + ViewEncapsulation +} from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { + ActivatedRoute, + Router +} from '@angular/router'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash'; +import { Action } from 'patternfly-ng/action/action'; import { ActionConfig } from 'patternfly-ng/action/action-config'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; - -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; - -import { BsModalRef, BsModalService } from 'ngx-bootstrap'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; -import { SortConfig } from 'patternfly-ng/sort/sort-config'; -import { SortEvent } from 'patternfly-ng/sort/sort-event'; -import { SortField } from 'patternfly-ng/sort/sort-field'; -import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; -import { ToolbarView } from 'patternfly-ng/toolbar/toolbar-view'; -import { IMe } from '../../auth/auth.service'; -import { AuthService } from '../../auth/auth.service'; -import { Namespace } from '../../resources/namespaces/namespace'; -import { NamespaceService } from '../../resources/namespaces/namespace.service'; -import { PagedResponse } from '../../resources/paged-response'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; + +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; + +import { AuthService } from '../../auth/auth.service'; +import { Namespace } from '../../resources/namespaces/namespace'; +import { NamespaceService } from '../../resources/namespaces/namespace.service'; +import { BsModalService, BsModalRef } from 'ngx-bootstrap'; import { AddRepositoryModalComponent } from '../add-repository-modal/add-repository-modal.component'; +import { Me } from '../../auth/auth.service'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { SortConfig } from 'patternfly-ng/sort/sort-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { SortField } from 'patternfly-ng/sort/sort-field'; +import { ToolbarView } from 'patternfly-ng/toolbar/toolbar-view'; +import { SortEvent } from 'patternfly-ng/sort/sort-event'; +import { Filter } from 'patternfly-ng/filter/filter'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { PagedResponse } from '../../resources/paged-response'; + @Component({ encapsulation: ViewEncapsulation.None, selector: 'namespace-list', templateUrl: './namespace-list.component.html', - styleUrls: ['./namespace-list.component.less'], + styleUrls: ['./namespace-list.component.less'] }) export class NamespaceListComponent implements OnInit { items: Namespace[] = []; namespaces: Namespace[] = []; - me: IMe; + me: Me; pageTitle = 'My Content'; pageIcon = 'fa fa-list'; @@ -67,7 +80,7 @@ export class NamespaceListComponent implements OnInit { private router: Router, private modalService: BsModalService, private namespaceService: NamespaceService, - private authService: AuthService, + private authService: AuthService ) { this.modalService.onHidden.subscribe(_ => { if (this.bsModalRef && this.bsModalRef.content.repositoriesAdded) { @@ -88,17 +101,17 @@ export class NamespaceListComponent implements OnInit { id: 'name', title: 'Name', placeholder: 'Filter by Name...', - type: FilterType.TEXT, + type: FilterType.TEXT }, { id: 'description', title: 'Description', placeholder: 'Filter by Description...', - type: FilterType.TEXT, - }, + type: FilterType.TEXT + } ] as FilterField[], resultsCount: this.items.length, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; this.sortConfig = { @@ -106,27 +119,27 @@ export class NamespaceListComponent implements OnInit { { id: 'name', title: 'Name', - sortType: 'alpha', + sortType: 'alpha' }, { id: 'description', title: 'Description', - sortType: 'alpha', - }, + sortType: 'alpha' + } ], - isAscending: this.isAscendingSort, + isAscending: this.isAscendingSort } as SortConfig; this.toolbarActionConfig = { primaryActions: [], - moreActions: [], + moreActions: [] } as ActionConfig; this.toolbarConfig = { actionConfig: this.toolbarActionConfig, filterConfig: this.filterConfig, sortConfig: this.sortConfig, - views: [], + views: [] } as ToolbarConfig; this.listConfig = { @@ -135,23 +148,24 @@ export class NamespaceListComponent implements OnInit { selectItems: false, selectionMatchProp: 'name', showCheckbox: false, - useExpandItems: true, + useExpandItems: true } as ListConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; - this.route.data.subscribe(data => { - const results = data['namespaces'] as PagedResponse; - this.me = data['me']; - this.items = this.prepForList(results.results as Namespace[]); - this.filterConfig.resultsCount = results.count; - this.paginationConfig.totalItems = results.count; - this.pageLoading = false; - }); + this.route.data + .subscribe(data => { + const results = data['namespaces'] as PagedResponse; + this.me = data['me']; + this.items = this.prepForList(results.results as Namespace[]); + this.filterConfig.resultsCount = results.count; + this.paginationConfig.totalItems = results.count; + this.pageLoading = false; + }); } handleListAction($event: any): void { @@ -206,7 +220,7 @@ export class NamespaceListComponent implements OnInit { // View viewSelected(currentView: ToolbarView): void { - this.sortConfig.visible = currentView.id === 'tableView' ? false : true; + this.sortConfig.visible = (currentView.id === 'tableView' ? false : true); } handlePageSizeChange($event: PaginationEvent) { @@ -236,20 +250,15 @@ export class NamespaceListComponent implements OnInit { private addContent(namespace: Namespace) { const initialState = { - namespace: namespace, + namespace: namespace }; - this.bsModalRef = this.modalService.show(AddRepositoryModalComponent, { - initialState: initialState, - keyboard: true, - animated: true, - }); + this.bsModalRef = this.modalService.show(AddRepositoryModalComponent, {initialState: initialState, keyboard: true, animated: true}); } private enableDisableNamespace(namespace: Namespace) { namespace.active = !namespace.active; - this.namespaceService.save(namespace).subscribe(_ => { - this.searchNamespaces(); - }); + this.namespaceService.save(namespace) + .subscribe(_ => { this.searchNamespaces(); }); } private searchNamespaces() { diff --git a/galaxyui/src/app/my-imports/import-detail/import-detail.component.spec.ts b/galaxyui/src/app/my-imports/import-detail/import-detail.component.spec.ts index 85992b500..c07144ef4 100644 --- a/galaxyui/src/app/my-imports/import-detail/import-detail.component.spec.ts +++ b/galaxyui/src/app/my-imports/import-detail/import-detail.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ImportDetailComponent } from './import-detail.component'; describe('ImportDetailComponent', () => { - let component: ImportDetailComponent; - let fixture: ComponentFixture; + let component: ImportDetailComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ImportDetailComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ImportDetailComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(ImportDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(ImportDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-imports/import-detail/import-detail.component.ts b/galaxyui/src/app/my-imports/import-detail/import-detail.component.ts index 961941d2b..9ffd09513 100644 --- a/galaxyui/src/app/my-imports/import-detail/import-detail.component.ts +++ b/galaxyui/src/app/my-imports/import-detail/import-detail.component.ts @@ -1,22 +1,40 @@ -import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; - -import { ImportState } from '../../enums/import-state.enum'; -import { Import } from '../../resources/imports/import'; +import { + AfterViewInit, + Component, + EventEmitter, + OnInit, + Output, + Input +} from '@angular/core'; + +import { + ImportsService, + SaveParams +} from '../../resources/imports/imports.service'; + +import { Import } from '../../resources/imports/import'; +import { ImportLatest } from '../../resources/imports/import-latest'; +import { ImportState } from '../../enums/import-state.enum'; import { RepositoryImportService } from '../../resources/repository-imports/repository-import.service'; +import { RepositoryImport } from '../../resources/repository-imports/repository-import'; + +import { NamespaceService } from '../../resources/namespaces/namespace.service'; +import { Namespace } from '../../resources/namespaces/namespace'; -import { NamespaceService } from '../../resources/namespaces/namespace.service'; +import { AuthService } from '../../auth/auth.service'; -import { AuthService } from '../../auth/auth.service'; +import * as $ from 'jquery'; +import * as lodash from 'lodash'; -import * as $ from 'jquery'; @Component({ - selector: 'app-import-detail', - templateUrl: './import-detail.component.html', - styleUrls: ['./import-detail.component.less'], + selector: 'app-import-detail', + templateUrl: './import-detail.component.html', + styleUrls: ['./import-detail.component.less'] }) export class ImportDetailComponent implements OnInit, AfterViewInit { + private _importTask: Import; private _refreshing: boolean; private canImport: boolean; @@ -30,20 +48,24 @@ export class ImportDetailComponent implements OnInit, AfterViewInit { this.canImport = false; if (data) { - this.authService.me().subscribe(me => { - if (me.staff) { - this.canImport = true; - } else { - this.namespaceService.get(data.summary_fields.namespace.id).subscribe(namespace => { - for (const owner of namespace.summary_fields.owners) { - if (me.username === owner.username) { - this.canImport = true; - break; + this.authService.me().subscribe( + (me) => { + if (me.staff) { + this.canImport = true; + } else { + this.namespaceService.get(data.summary_fields.namespace.id).subscribe( + (namespace) => { + for (const owner of namespace.summary_fields.owners) { + if (me.username === owner.username) { + this.canImport = true; + break; + } + } } - } - }); + ); + } } - }); + ); } if (this._importTask && this.importTask.id !== data.id) { @@ -69,15 +91,13 @@ export class ImportDetailComponent implements OnInit, AfterViewInit { return this._refreshing; } - @Output() - startedImport = new EventEmitter(); - @Output() - scrollToggled = new EventEmitter(); + @Output() startedImport = new EventEmitter(); + @Output() scrollToggled = new EventEmitter(); constructor( private repositoryImportService: RepositoryImportService, private authService: AuthService, - private namespaceService: NamespaceService, + private namespaceService: NamespaceService ) {} ngOnInit() {} @@ -85,10 +105,13 @@ export class ImportDetailComponent implements OnInit, AfterViewInit { ngAfterViewInit() {} startImport(): void { - this.repositoryImportService.save({ repository_id: this.importTask.summary_fields.repository.id }).subscribe(response => { - console.log(`Started import for repository ${this.importTask.summary_fields.repository.id}`); - this.startedImport.emit(true); - }); + this.repositoryImportService.save({'repository_id': this.importTask.summary_fields.repository.id}) + .subscribe(response => { + console.log( + `Started import for repository ${this.importTask.summary_fields.repository.id}` + ); + this.startedImport.emit(true); + }); } affix(): void { diff --git a/galaxyui/src/app/my-imports/import-list/import-list.component.spec.ts b/galaxyui/src/app/my-imports/import-list/import-list.component.spec.ts index 1ab3f6b1b..5e58d2594 100644 --- a/galaxyui/src/app/my-imports/import-list/import-list.component.spec.ts +++ b/galaxyui/src/app/my-imports/import-list/import-list.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ImportListComponent } from './import-list.component'; describe('ImportListComponent', () => { - let component: ImportListComponent; - let fixture: ComponentFixture; + let component: ImportListComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ImportListComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ImportListComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(ImportListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(ImportListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/my-imports/import-list/import-list.component.ts b/galaxyui/src/app/my-imports/import-list/import-list.component.ts index 27af074f3..307bee48b 100644 --- a/galaxyui/src/app/my-imports/import-list/import-list.component.ts +++ b/galaxyui/src/app/my-imports/import-list/import-list.component.ts @@ -1,45 +1,62 @@ -import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; - -import { ActivatedRoute } from '@angular/router'; - -import { Location } from '@angular/common'; - -import { ImportsService } from '../../resources/imports/imports.service'; - +import { + Component, + OnInit, + OnDestroy, + ViewChild, + AfterViewInit, +} from '@angular/core'; + +import { + ActivatedRoute, + Router +} from '@angular/router'; + +import { + Location +} from '@angular/common'; + +import { + ImportsService, + SaveParams +} from '../../resources/imports/imports.service'; + +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/observable/interval'; -import { Observable } from 'rxjs/Observable'; -import { Import } from '../../resources/imports/import'; -import { ImportLatest } from '../../resources/imports/import-latest'; +import { Import } from '../../resources/imports/import'; +import { ImportLatest } from '../../resources/imports/import-latest'; -import { ImportState } from '../../enums/import-state.enum'; +import { ImportState } from '../../enums/import-state.enum'; import { PagedResponse } from '../../resources/paged-response'; -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterEvent } from 'patternfly-ng/filter/filter-event'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterQuery } from 'patternfly-ng/filter/filter-query'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { PageHeaderComponent } from '../../page-header/page-header.component'; + +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; import { ListComponent } from 'patternfly-ng/list/basic-list/list.component'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { FilterQuery } from 'patternfly-ng/filter/filter-query'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { Filter } from 'patternfly-ng/filter/filter'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; -import { AuthService } from '../../auth/auth.service'; +import { AuthService } from '../../auth/auth.service'; -import * as $ from 'jquery'; -import * as moment from 'moment'; +import * as moment from 'moment'; +import * as $ from 'jquery'; @Component({ selector: 'import-list', templateUrl: './import-list.component.html', - styleUrls: ['./import-list.component.less'], + styleUrls: ['./import-list.component.less'] }) export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild(ListComponent) - pfList: ListComponent; + + @ViewChild(ListComponent) pfList: ListComponent; listConfig: ListConfig; filterConfig: FilterConfig; @@ -65,66 +82,68 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { constructor( private route: ActivatedRoute, + private router: Router, private importsService: ImportsService, private location: Location, - private authService: AuthService, + private authService: AuthService ) {} ngOnInit() { + this.listConfig = { dblClick: false, multiSelect: false, selectItems: true, showCheckbox: false, - useExpandItems: false, + useExpandItems: false } as ListConfig; this.filterConfig = { - fields: [ - { - id: 'repository_name', - title: 'Repository Name', - placeholder: 'Filter by Repository Name...', - type: FilterType.TEXT, - }, - { - id: 'namespace', - title: 'Namespace', - placeholder: 'Filter by Namespace...', - type: FilterType.TEXT, - }, - ] as FilterField[], + fields: [{ + id: 'repository_name', + title: 'Repository Name', + placeholder: 'Filter by Repository Name...', + type: FilterType.TEXT, + }, { + id: 'namespace', + title: 'Namespace', + placeholder: 'Filter by Namespace...', + type: FilterType.TEXT, + }] as FilterField[], resultsCount: 0, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; this.route.queryParams.subscribe(params => { + const event: FilterEvent = new FilterEvent(); this.setPageSize(params); this.setAppliedFilters(params); this.setQuery(); - this.route.data.subscribe(data => { - const imports: PagedResponse = data['imports'] as PagedResponse; - this.items = imports.results; - this.filterConfig.resultsCount = this.items.length; - this.paginationConfig.totalItems = imports.count; - this.prepareImports(this.items); - if (this.items.length) { - if (params['selected']) { - this.getImport(Number(params['selected']), true); + this.route.data.subscribe( + (data) => { + const imports: PagedResponse = data['imports'] as PagedResponse; + this.items = imports.results; + this.filterConfig.resultsCount = this.items.length; + this.paginationConfig.totalItems = imports.count; + this.prepareImports(this.items); + if (this.items.length) { + if (params['selected']) { + this.getImport(Number(params['selected']), true); + } else { + this.getImport(this.items[0].id, true); + } } else { - this.getImport(this.items[0].id, true); + this.cancelPageLoading(); } - } else { - this.cancelPageLoading(); } - }); + ); this.cancelPageLoading(); }); } @@ -194,20 +213,23 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { if (this.polling) { this.polling.unsubscribe(); } - this.importsService.get(id).subscribe(result => { - this.prepareImport(result); - this.selected = result; - this.selectedId = result.id; - this.setQuery(); - if (this.pfList) { - this.selectItem(this.selected.id, deselectId); - } - this.cancelPageLoading(); - if (this.selected.state === ImportState.running || this.selected.state === ImportState.pending) { - // monitor the state of a running import - this.polling = Observable.interval(5000).subscribe(_ => this.refreshImport()); - } - }); + this.importsService.get(id).subscribe( + result => { + this.prepareImport(result); + this.selected = result; + this.selectedId = result.id; + this.setQuery(); + if (this.pfList) { + this.selectItem(this.selected.id, deselectId); + } + this.cancelPageLoading(); + if (this.selected.state === ImportState.running || + this.selected.state === ImportState.pending) { + // monitor the state of a running import + this.polling = Observable.interval(5000) + .subscribe(_ => this.refreshImport()); + } + }); } applyFilters($event: FilterEvent): void { @@ -242,7 +264,8 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { startedImport($event): void { this.refreshImport(); - this.polling = Observable.interval(5000).subscribe(_ => this.refreshImport()); + this.polling = Observable.interval(5000) + .subscribe(_ => this.refreshImport()); } toggleScroll($event): void { @@ -255,7 +278,7 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { // private private scrollDetails() { - $('#import-details-container').animate({ scrollTop: $('#import-details-container')[0].scrollHeight }, 1000); + $('#import-details-container').animate({scrollTop: $('#import-details-container')[0].scrollHeight}, 1000); } private setPageSize(params: any) { @@ -264,10 +287,10 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { this.pageSize = params['page_size']; this.pageNumber = 1; } - if (params['page']) { - this.paginationConfig.pageNumber = params['page']; - this.pageNumber = params['page']; - } + if (params['page']) { + this.paginationConfig.pageNumber = params['page']; + this.pageNumber = params['page']; + } } private prepareImport(data: Import): void { @@ -283,7 +306,8 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { } else if (data.state === ImportState.running) { data.last_run = 'Running...'; } else if (data.state === ImportState.failed || data.state === ImportState.success) { - const state = data.state.charAt(0).toUpperCase() + data.state.slice(1).toLowerCase(); + const state = data.state.charAt(0).toUpperCase() + + data.state.slice(1).toLowerCase(); data.last_run = state + ' ' + moment(data.finished).fromNow(); } } @@ -322,7 +346,7 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { if (!field) { continue; } - const values = typeof params[key] === 'object' ? params[key] : [params[key]]; + const values = (typeof params[key] === 'object') ? params[key] : [params[key]]; values.forEach(value => { if (filterParams !== '') { filterParams += '&'; @@ -338,7 +362,7 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { const ffield: Filter = {} as Filter; ffield.field = field; if (field.type === FilterType.TEXT) { - ffield.value = value; + ffield.value = value; } else if (field.type === FilterType.TYPEAHEAD) { field.queries.forEach((query: FilterQuery) => { if (query.id === value) { @@ -367,8 +391,8 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { paging += '&page=' + this.pageNumber; } - const query = (this.filterParams + paging).replace(/^&/, ''); // remove leading & - const selected = this.selectedId ? `&selected=${this.selectedId}` : ''; + const query = (this.filterParams + paging).replace(/^&/, ''); // remove leading & + const selected = (this.selectedId) ? `&selected=${this.selectedId}` : ''; // Refresh params on location URL const location = (this.locationParams + selected + paging).replace(/^&/, ''); // remove leading & @@ -402,39 +426,42 @@ export class ImportListComponent implements OnInit, AfterViewInit, OnDestroy { const selectedId = this.selected.id; this.refreshing = true; const params: any = { - repository__id: this.selected.summary_fields.repository.id, - order_by: '-id', + 'repository__id': this.selected.summary_fields.repository.id, + 'order_by': '-id' }; - this.importsService.query(params).subscribe(result => { - if (result.length) { - const import_result: Import = result[0]; - this.prepareImport(import_result); - this.items.forEach((item: ImportLatest) => { - if (item.repository_id === import_result.summary_fields.repository.id) { - item.finished = moment(import_result.modified).fromNow(); - item.state = import_result.state.charAt(0).toUpperCase() + import_result.state.slice(1).toLowerCase(); - } - }); - if (this.selected.id === selectedId) { - // If the selected item has not changed, - // copy result property values -> this.selected - const keys = Object.keys(import_result); - for (const key of keys) { - this.selected[key] = import_result[key]; - } - if (this.selected.state === ImportState.failed || this.selected.state === ImportState.success) { - // The import finished - if (this.polling) { - this.polling.unsubscribe(); + this.importsService.query(params).subscribe( + result => { + if (result.length) { + const import_result: Import = result[0]; + this.prepareImport(import_result); + this.items.forEach((item: ImportLatest) => { + if (item.repository_id === import_result.summary_fields.repository.id) { + item.finished = moment(import_result.modified).fromNow(); + item.state = import_result.state.charAt(0).toUpperCase() + + import_result.state.slice(1).toLowerCase(); + } + }); + if (this.selected.id === selectedId) { + // If the selected item has not changed, + // copy result property values -> this.selected + const keys = Object.keys(import_result); + for (let i = 0; i < keys.length; i++ ) { + this.selected[keys[i]] = import_result[keys[i]]; + } + if (this.selected.state === ImportState.failed || + this.selected.state === ImportState.success) { + // The import finished + if (this.polling) { + this.polling.unsubscribe(); + } } } } - } - this.refreshing = false; - if (this.scroll) { - this.scrollDetails(); - } - }); + this.refreshing = false; + if (this.scroll) { + this.scrollDetails(); + } + }); } } diff --git a/galaxyui/src/app/my-imports/import-list/import-list.resolver.service.ts b/galaxyui/src/app/my-imports/import-list/import-list.resolver.service.ts index 04e50b73b..8b6659886 100644 --- a/galaxyui/src/app/my-imports/import-list/import-list.resolver.service.ts +++ b/galaxyui/src/app/my-imports/import-list/import-list.resolver.service.ts @@ -1,21 +1,34 @@ -import { Injectable } from '@angular/core'; +import { + Injectable +} from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot +} from '@angular/router'; -import { Observable } from 'rxjs/Observable'; -import { AuthService } from '../../auth/auth.service'; -import { ImportsService } from '../../resources/imports/imports.service'; -import { PagedResponse } from '../../resources/paged-response'; +import { Observable } from 'rxjs/Observable'; +import { ImportsService } from '../../resources/imports/imports.service'; +import { ImportLatest } from '../../resources/imports/import-latest'; +import { AuthService } from '../../auth/auth.service'; +import { PagedResponse } from '../../resources/paged-response'; @Injectable() export class ImportListResolver implements Resolve { - constructor(private importsService: ImportsService, private authService: AuthService) {} - resolve(route: ActivatedRouteSnapshot): Observable { + constructor( + private importsService: ImportsService, + private router: Router, + private authService: AuthService + ) {} + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { let params = ''; for (const key in route.queryParams) { if (route.queryParams.hasOwnProperty(key)) { - const values = typeof route.queryParams[key] === 'object' ? route.queryParams[key] : [route.queryParams[key]]; + const values = (typeof route.queryParams[key] === 'object') ? route.queryParams[key] : [route.queryParams[key]]; values.forEach(value => { if (params !== '') { params += '&'; diff --git a/galaxyui/src/app/my-imports/my-imports.module.ts b/galaxyui/src/app/my-imports/my-imports.module.ts index a249d0df9..fc20b2c42 100644 --- a/galaxyui/src/app/my-imports/my-imports.module.ts +++ b/galaxyui/src/app/my-imports/my-imports.module.ts @@ -1,20 +1,20 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; -import { ActionModule } from 'patternfly-ng/action/action.module'; -import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; -import { FilterModule } from 'patternfly-ng/filter/filter.module'; -import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; -import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; -import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { ActionModule } from 'patternfly-ng/action/action.module'; +import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; +import { FilterModule } from 'patternfly-ng/filter/filter.module'; +import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; +import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; -import { TooltipModule } from 'ngx-bootstrap/tooltip'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { PageHeaderModule } from '../page-header/page-header.module'; -import { PageLoadingModule } from '../page-loading/page-loading.module'; -import { ImportDetailComponent } from './import-detail/import-detail.component'; -import { ImportListComponent } from './import-list/import-list.component'; -import { MyImportsRoutingModule } from './my-imports.routing.module'; +import { ImportListComponent } from './import-list/import-list.component'; +import { ImportDetailComponent } from './import-detail/import-detail.component'; +import { MyImportsRoutingModule } from './my-imports.routing.module'; +import { PageHeaderModule } from '../page-header/page-header.module'; +import { PageLoadingModule } from '../page-loading/page-loading.module'; @NgModule({ imports: [ @@ -28,9 +28,14 @@ import { MyImportsRoutingModule } from './my-imports.routing.module'; PageHeaderModule, PageLoadingModule, PaginationModule, - MyImportsRoutingModule, + MyImportsRoutingModule ], - declarations: [ImportListComponent, ImportDetailComponent], - exports: [ImportDetailComponent], + declarations: [ + ImportListComponent, + ImportDetailComponent + ], + exports: [ + ImportDetailComponent + ] }) export class MyImportsModule {} diff --git a/galaxyui/src/app/my-imports/my-imports.routing.module.ts b/galaxyui/src/app/my-imports/my-imports.routing.module.ts index 96ac6025c..77971bedd 100644 --- a/galaxyui/src/app/my-imports/my-imports.routing.module.ts +++ b/galaxyui/src/app/my-imports/my-imports.routing.module.ts @@ -16,28 +16,37 @@ * along with Galaxy. If not, see . */ -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { + RouterModule, + Routes +} from '@angular/router'; -import { AuthService } from '../auth/auth.service'; -import { ImportListComponent } from './import-list/import-list.component'; -import { ImportListResolver } from './import-list/import-list.resolver.service'; +import { AuthService } from '../auth/auth.service'; +import { ImportListResolver } from './import-list/import-list.resolver.service'; +import { ImportListComponent } from './import-list/import-list.component'; const myImportRoutes: Routes = [ { - path: '', + path: 'my-imports', component: ImportListComponent, resolve: { - imports: ImportListResolver, + imports: ImportListResolver }, - canActivate: [AuthService], - }, + canActivate: [AuthService] + } ]; @NgModule({ - imports: [RouterModule.forChild(myImportRoutes)], - exports: [RouterModule], - providers: [ImportListResolver], + imports: [ + RouterModule.forChild(myImportRoutes) + ], + exports: [ + RouterModule, + ], + providers: [ + ImportListResolver + ] }) export class MyImportsRoutingModule {} diff --git a/galaxyui/src/app/page-header/page-header.component.spec.ts b/galaxyui/src/app/page-header/page-header.component.spec.ts index 206d8114a..8b7949daf 100644 --- a/galaxyui/src/app/page-header/page-header.component.spec.ts +++ b/galaxyui/src/app/page-header/page-header.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PageHeaderComponent } from './page-header.component'; describe('PageHeaderComponent', () => { - let component: PageHeaderComponent; - let fixture: ComponentFixture; + let component: PageHeaderComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [PageHeaderComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PageHeaderComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(PageHeaderComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(PageHeaderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/page-header/page-header.component.ts b/galaxyui/src/app/page-header/page-header.component.ts index 412ec05e3..6d3770ab4 100644 --- a/galaxyui/src/app/page-header/page-header.component.ts +++ b/galaxyui/src/app/page-header/page-header.component.ts @@ -1,4 +1,8 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + OnInit, + Input +} from '@angular/core'; class Title { name: string; @@ -6,16 +10,18 @@ class Title { } @Component({ - selector: 'app-page-header', - templateUrl: './page-header.component.html', - styleUrls: ['./page-header.component.less'], + selector: 'app-page-header', + templateUrl: './page-header.component.html', + styleUrls: ['./page-header.component.less'] }) export class PageHeaderComponent implements OnInit { + _headerTitle: Title[]; _headerIcon: string; @Input() set headerTitle(headerTitle: string) { + // Set headerTitle to a string. For sub pages, where you want a breadcrumb trail, // pass a list of page names and paths separated by ';'. For example: // 'page_name;/path;page_name;/path/foo;page_name'. @@ -44,4 +50,5 @@ export class PageHeaderComponent implements OnInit { constructor() {} ngOnInit() {} + } diff --git a/galaxyui/src/app/page-header/page-header.module.ts b/galaxyui/src/app/page-header/page-header.module.ts index b930a97e0..5cda939ab 100644 --- a/galaxyui/src/app/page-header/page-header.module.ts +++ b/galaxyui/src/app/page-header/page-header.module.ts @@ -1,12 +1,19 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; import { PageHeaderComponent } from './page-header.component'; @NgModule({ - imports: [RouterModule, CommonModule], - declarations: [PageHeaderComponent], - exports: [PageHeaderComponent], + imports: [ + RouterModule, + CommonModule + ], + declarations: [ + PageHeaderComponent + ], + exports: [ + PageHeaderComponent + ] }) export class PageHeaderModule {} diff --git a/galaxyui/src/app/page-loading/page-loading.component.spec.ts b/galaxyui/src/app/page-loading/page-loading.component.spec.ts index 199c9575f..7795d4668 100644 --- a/galaxyui/src/app/page-loading/page-loading.component.spec.ts +++ b/galaxyui/src/app/page-loading/page-loading.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PageLoadingComponent } from './page-loading.component'; describe('PageLoadingComponent', () => { - let component: PageLoadingComponent; - let fixture: ComponentFixture; + let component: PageLoadingComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [PageLoadingComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PageLoadingComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(PageLoadingComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(PageLoadingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/page-loading/page-loading.component.ts b/galaxyui/src/app/page-loading/page-loading.component.ts index 49ed800ec..6dbb67d6a 100644 --- a/galaxyui/src/app/page-loading/page-loading.component.ts +++ b/galaxyui/src/app/page-loading/page-loading.component.ts @@ -1,15 +1,18 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + OnInit, + Input +} from '@angular/core'; @Component({ selector: 'app-page-loading', templateUrl: './page-loading.component.html', - styleUrls: ['./page-loading.component.less'], + styleUrls: ['./page-loading.component.less'] }) export class PageLoadingComponent implements OnInit { - @Input() - loading: boolean; + @Input() loading: boolean; - constructor() {} + constructor() { } ngOnInit() {} } diff --git a/galaxyui/src/app/page-loading/page-loading.module.ts b/galaxyui/src/app/page-loading/page-loading.module.ts index 4f5df5b99..d4e9256b9 100644 --- a/galaxyui/src/app/page-loading/page-loading.module.ts +++ b/galaxyui/src/app/page-loading/page-loading.module.ts @@ -1,10 +1,16 @@ -import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; import { PageLoadingComponent } from './page-loading.component'; @NgModule({ - imports: [CommonModule], - declarations: [PageLoadingComponent], - exports: [PageLoadingComponent], + imports: [ + CommonModule + ], + declarations: [ + PageLoadingComponent + ], + exports: [ + PageLoadingComponent + ] }) -export class PageLoadingModule {} +export class PageLoadingModule { } diff --git a/galaxyui/src/app/resources/api-root/api-root.service.spec.ts b/galaxyui/src/app/resources/api-root/api-root.service.spec.ts index 98f834e9f..480ae0b5e 100644 --- a/galaxyui/src/app/resources/api-root/api-root.service.spec.ts +++ b/galaxyui/src/app/resources/api-root/api-root.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { ApiRootService } from './api-root.service'; describe('ContentSearchService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ApiRootService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ApiRootService] }); + }); - it('should be created', inject([ApiRootService], (service: ApiRootService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([ApiRootService], (service: ApiRootService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/api-root/api-root.service.ts b/galaxyui/src/app/resources/api-root/api-root.service.ts index 61b504980..d15db5844 100644 --- a/galaxyui/src/app/resources/api-root/api-root.service.ts +++ b/galaxyui/src/app/resources/api-root/api-root.service.ts @@ -1,29 +1,34 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import { catchError, tap } from 'rxjs/operators'; -import { ApiRoot } from './api-root'; +import { Injectable } from '@angular/core'; +import { catchError, tap } from 'rxjs/operators'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { ApiRoot } from './api-root'; +import { of } from 'rxjs/observable/of'; + @Injectable() export class ApiRootService { + private url = '/api/'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor( + private http: HttpClient, + private notificationService: NotificationService) { } get(): Observable { - return this.http.get(this.url).pipe( - tap(_ => this.log('fetched api information')), - catchError(this.handleError(`get api root`)), - ); + return this.http.get(this.url) + .pipe( + tap(_ => this.log('fetched api information')), + catchError(this.handleError(`get api root`)) + ); } private handleError(operation = '', result?: T) { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} user error: ${error.message}`); - this.notificationService.httpError(`${operation} user failed:`, { data: error }); + this.notificationService.httpError(`${operation} user failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); diff --git a/galaxyui/src/app/resources/api-root/api-root.ts b/galaxyui/src/app/resources/api-root/api-root.ts index 26b0fde14..561300f31 100644 --- a/galaxyui/src/app/resources/api-root/api-root.ts +++ b/galaxyui/src/app/resources/api-root/api-root.ts @@ -3,5 +3,5 @@ export class ApiRoot { current_version: string; server_version: string; version_name: string; - team_members: string[]; + team_members: string []; } diff --git a/galaxyui/src/app/resources/cloud-platforms/cloud-platform.service.spec.ts b/galaxyui/src/app/resources/cloud-platforms/cloud-platform.service.spec.ts index 5b8dd36c7..235e49ef7 100644 --- a/galaxyui/src/app/resources/cloud-platforms/cloud-platform.service.spec.ts +++ b/galaxyui/src/app/resources/cloud-platforms/cloud-platform.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { CloudPlatformService } from './cloud-platform.service'; describe('CloudPlatformService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [CloudPlatformService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [CloudPlatformService] }); + }); - it('should be created', inject([CloudPlatformService], (service: CloudPlatformService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([CloudPlatformService], (service: CloudPlatformService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/cloud-platforms/cloud-platform.service.ts b/galaxyui/src/app/resources/cloud-platforms/cloud-platform.service.ts index 73e1b7485..11230d766 100644 --- a/galaxyui/src/app/resources/cloud-platforms/cloud-platform.service.ts +++ b/galaxyui/src/app/resources/cloud-platforms/cloud-platform.service.ts @@ -1,43 +1,57 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { + HttpClient, + HttpHeaders +} from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; import { catchError, map, tap } from 'rxjs/operators'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { PagedResponse } from '../paged-response'; -import { CloudPlatform } from './cloud-platform'; +import { CloudPlatform } from './cloud-platform'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { PagedResponse } from '../paged-response'; + +const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json' + }) +}; @Injectable() export class CloudPlatformService { + private url = '/api/v1/cloud_platforms'; private searchUrl = '/api/v1/search/cloud_platforms'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor(private http: HttpClient, + private notificationService: NotificationService) { + } query(params?: any): Observable { - return this.http.get(this.url + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched content types')), - catchError(this.handleError('Query', [] as CloudPlatform[])), - ); + return this.http.get(this.url + '/', {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched content types')), + catchError(this.handleError('Query', [] as CloudPlatform[])) + ); } search(params?: any): Observable { - return this.http.get(this.searchUrl + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched content types')), - catchError(this.handleError('Query', [] as CloudPlatform[])), - ); + return this.http.get(this.searchUrl + '/', {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched content types')), + catchError(this.handleError('Query', [] as CloudPlatform[])) + ); } private handleError(operation = '', result?: T) { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} repository error: ${error.message}`); - this.notificationService.httpError(`${operation} repository failed:`, { data: error }); + this.notificationService.httpError(`${operation} repository failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); @@ -47,4 +61,5 @@ export class CloudPlatformService { private log(message: string) { console.log('CloudPlatformService: ' + message); } + } diff --git a/galaxyui/src/app/resources/content-blocks/content-blocks.service.spec.ts b/galaxyui/src/app/resources/content-blocks/content-blocks.service.spec.ts index 941ef3c22..b26195c25 100644 --- a/galaxyui/src/app/resources/content-blocks/content-blocks.service.spec.ts +++ b/galaxyui/src/app/resources/content-blocks/content-blocks.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { UserService } from './user.service'; describe('UserService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [UserService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [UserService] }); + }); - it('should be created', inject([UserService], (service: UserService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([UserService], (service: UserService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/content-blocks/content-blocks.service.ts b/galaxyui/src/app/resources/content-blocks/content-blocks.service.ts index d68288f6a..f7ab4f2d0 100644 --- a/galaxyui/src/app/resources/content-blocks/content-blocks.service.ts +++ b/galaxyui/src/app/resources/content-blocks/content-blocks.service.ts @@ -1,39 +1,45 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Injectable } from '@angular/core'; import { catchError, map, tap } from 'rxjs/operators'; -import { PagedResponse } from '../paged-response'; -import { ContentBlock } from './content-block'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { PagedResponse } from '../paged-response'; +import { ContentBlock } from './content-block'; +import { of } from 'rxjs/observable/of'; + @Injectable() export class ContentBlocksService { + private url = '/api/v1/content_blocks/'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor( + private http: HttpClient, + private notificationService: NotificationService) { } query(): Observable { - return this.http.get(this.url).pipe( - map(response => response.results as ContentBlock[]), - tap(_ => this.log('fetched content blocks')), - catchError(this.handleError('Query', [])), - ); + return this.http.get(this.url) + .pipe( + map(response => response.results as ContentBlock[]), + tap(_ => this.log('fetched content blocks')), + catchError(this.handleError('Query', [])) + ); } get(name: string): Observable { const url = `${this.url}${name}/`; - return this.http.get(url).pipe( - tap(_ => this.log('fetched content block')), - catchError(this.handleError(`Get content block ${name}`)), - ); + return this.http.get(url) + .pipe( + tap(_ => this.log('fetched content block')), + catchError(this.handleError(`Get content block ${name}`)) + ); } private handleError(operation = '', result?: T) { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} user error: ${error.message}`); - this.notificationService.httpError(`${operation} user failed:`, { data: error }); + this.notificationService.httpError(`${operation} user failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); diff --git a/galaxyui/src/app/resources/content-search/content-search.service.spec.ts b/galaxyui/src/app/resources/content-search/content-search.service.spec.ts index 93b7c73c6..7762ae71d 100644 --- a/galaxyui/src/app/resources/content-search/content-search.service.spec.ts +++ b/galaxyui/src/app/resources/content-search/content-search.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { ContentSearchService } from './content-search.service'; describe('ContentSearchService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ContentSearchService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ContentSearchService] }); + }); - it('should be created', inject([ContentSearchService], (service: ContentSearchService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([ContentSearchService], (service: ContentSearchService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/content-search/content-search.service.ts b/galaxyui/src/app/resources/content-search/content-search.service.ts index 11a731baf..586af0eec 100644 --- a/galaxyui/src/app/resources/content-search/content-search.service.ts +++ b/galaxyui/src/app/resources/content-search/content-search.service.ts @@ -1,17 +1,34 @@ -import { Injectable } from '@angular/core'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { catchError, tap } from 'rxjs/operators'; +import { Injectable } from '@angular/core'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { catchError, map, tap } from 'rxjs/operators'; -import { HttpClient } from '@angular/common/http'; +import { + HttpClient, + HttpHeaders, +} from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; +import { PagedResponse } from '../paged-response'; -import { ContentResponse } from './content'; +import { + Content, + ContentResponse +} from './content'; + +const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json' + }) +}; @Injectable() export class ContentSearchService { - constructor(private http: HttpClient, private notificationService: NotificationService) {} + + constructor( + private http: HttpClient, + private notificationService: NotificationService + ) { } private url = '/api/v1/search/content/'; @@ -20,17 +37,19 @@ export class ContentSearchService { if (query) { requestUrl += `?${query}`; } - return this.http.get(requestUrl).pipe( - tap(_ => this.log('fetched content')), - catchError(this.handleError('Query', {} as ContentResponse)), - ); + return this.http.get(requestUrl) + .pipe( + tap(_ => this.log('fetched content')), + catchError(this.handleError('Query', {} as ContentResponse)) + ); } get(id: number): Observable { - return this.http.get(`${this.url}${id.toString()}/`).pipe( - tap(_ => this.log('fetched import')), - catchError(this.handleError('Get', [])), - ); + return this.http.get(`${this.url}${id.toString()}/`) + .pipe( + tap(_ => this.log('fetched import')), + catchError(this.handleError('Get', [])) + ); } private handleError(operation = '', result?: T) { diff --git a/galaxyui/src/app/resources/content-types/content-type.service.spec.ts b/galaxyui/src/app/resources/content-types/content-type.service.spec.ts index 3f4295d9f..cb333e65e 100644 --- a/galaxyui/src/app/resources/content-types/content-type.service.spec.ts +++ b/galaxyui/src/app/resources/content-types/content-type.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { PlatformService } from './platform.service'; describe('PlatformService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [PlatformService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [PlatformService] }); + }); - it('should be created', inject([PlatformService], (service: PlatformService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([PlatformService], (service: PlatformService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/content-types/content-type.service.ts b/galaxyui/src/app/resources/content-types/content-type.service.ts index ceea2e4f0..c3e07b719 100644 --- a/galaxyui/src/app/resources/content-types/content-type.service.ts +++ b/galaxyui/src/app/resources/content-types/content-type.service.ts @@ -1,34 +1,47 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { + HttpClient, + HttpHeaders +} from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; import { catchError, map, tap } from 'rxjs/operators'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { PagedResponse } from '../paged-response'; -import { ContentType } from './content-type'; +import { ContentType } from './content-type'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { PagedResponse } from '../paged-response'; + +const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json' + }) +}; @Injectable() export class ContentTypeService { + private url = '/api/v1/content_types'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor(private http: HttpClient, + private notificationService: NotificationService) { + } query(params?: any): Observable { - return this.http.get(this.url + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched content types')), - catchError(this.handleError('Query', [] as ContentType[])), - ); + return this.http.get(this.url + '/', {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched content types')), + catchError(this.handleError('Query', [] as ContentType[])) + ); } private handleError(operation = '', result?: T) { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} repository error: ${error.message}`); - this.notificationService.httpError(`${operation} repository failed:`, { data: error }); + this.notificationService.httpError(`${operation} repository failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); @@ -38,4 +51,5 @@ export class ContentTypeService { private log(message: string) { console.log('ContentTypeService: ' + message); } + } diff --git a/galaxyui/src/app/resources/content/content.service.spec.ts b/galaxyui/src/app/resources/content/content.service.spec.ts index 909fcf8d6..df5027a7d 100644 --- a/galaxyui/src/app/resources/content/content.service.spec.ts +++ b/galaxyui/src/app/resources/content/content.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { ContentService } from './content.service'; describe('ContentSearchService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ContentService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ContentService] }); + }); - it('should be created', inject([ContentService], (service: ContentService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([ContenthService], (service: ContentService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/content/content.service.ts b/galaxyui/src/app/resources/content/content.service.ts index 44f00e2cd..422e9c2e4 100644 --- a/galaxyui/src/app/resources/content/content.service.ts +++ b/galaxyui/src/app/resources/content/content.service.ts @@ -1,53 +1,71 @@ -import { Injectable } from '@angular/core'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { Injectable } from '@angular/core'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; import { catchError, map, tap } from 'rxjs/operators'; -import { HttpClient } from '@angular/common/http'; +import { + HttpClient, + HttpHeaders, +} from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; import { PagedResponse } from '../paged-response'; -import { Content } from './content'; +import { Content } from './content'; + +const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json' + }) +}; @Injectable() export class ContentService { - constructor(private http: HttpClient, private notificationService: NotificationService) {} + + constructor( + private http: HttpClient, + private notificationService: NotificationService + ) { } private url = '/api/v1/content/'; query(params?: any): Observable { - return this.http.get(this.url, { params: params }).pipe( - map(result => result.results as Content[]), - tap(_ => this.log('fetched content')), - catchError(this.handleError('Query', [] as Content[])), - ); + return this.http.get(this.url, {params: params}) + .pipe( + map(result => result.results as Content[]), + tap(_ => this.log('fetched content')), + catchError(this.handleError('Query', [] as Content[])) + ); } pagedQuery(params?: any): Observable { if (params && typeof params === 'object') { - return this.http.get(this.url, { params: params }).pipe( - tap(_ => this.log('fetched paged content')), - catchError(this.handleError('Query', {} as PagedResponse)), - ); + return this.http.get(this.url, {params: params}) + .pipe( + tap(_ => this.log('fetched paged content')), + catchError(this.handleError('Query', {} as PagedResponse)) + ); } if (params && typeof params === 'string') { - return this.http.get(this.url + params).pipe( + return this.http.get(this.url + params) + .pipe( + tap(_ => this.log('fetched paged content')), + catchError(this.handleError('Query', {} as PagedResponse)) + ); + } + return this.http.get(this.url) + .pipe( tap(_ => this.log('fetched paged content')), - catchError(this.handleError('Query', {} as PagedResponse)), + catchError(this.handleError('Query', {} as PagedResponse)) ); - } - return this.http.get(this.url).pipe( - tap(_ => this.log('fetched paged content')), - catchError(this.handleError('Query', {} as PagedResponse)), - ); } get(id: number): Observable { - return this.http.get(`${this.url}${id.toString()}/`).pipe( - tap(_ => this.log('fetched content')), - catchError(this.handleError('Get', {} as Content)), - ); + return this.http.get(`${this.url}${id.toString()}/`) + .pipe( + tap(_ => this.log('fetched content')), + catchError(this.handleError('Get', {} as Content)) + ); } private handleError(operation = '', result?: T) { diff --git a/galaxyui/src/app/resources/imports/imports.service.spec.ts b/galaxyui/src/app/resources/imports/imports.service.spec.ts index bc38ebb04..41bacd6fe 100644 --- a/galaxyui/src/app/resources/imports/imports.service.spec.ts +++ b/galaxyui/src/app/resources/imports/imports.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { ImportsService } from './imports.service'; describe('ImportsService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ImportsService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ImportsService] }); + }); - it('should be created', inject([ImportsService], (service: ImportsService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([ImportsService], (service: ImportsService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/imports/imports.service.ts b/galaxyui/src/app/resources/imports/imports.service.ts index 15e078fd3..8bdc7d6e4 100644 --- a/galaxyui/src/app/resources/imports/imports.service.ts +++ b/galaxyui/src/app/resources/imports/imports.service.ts @@ -17,15 +17,19 @@ */ import { Injectable } from '@angular/core'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; import { catchError, map, tap } from 'rxjs/operators'; -import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { + HttpClient, + HttpHeaders, +} from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import { PagedResponse } from '../paged-response'; -import { Import } from './import'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; +import { PagedResponse } from '../paged-response'; +import { Import } from './import'; +import { ImportLatest } from './import-latest'; export class SaveParams { github_user: string; @@ -34,40 +38,47 @@ export class SaveParams { const httpOptions = { headers: new HttpHeaders({ - 'Content-Type': 'application/json', - }), + 'Content-Type': 'application/json' + }) }; @Injectable() export class ImportsService { - constructor(private http: HttpClient, private notificationService: NotificationService) {} - private url = '/api/v1/imports'; + constructor( + private http: HttpClient, + private notificationService: NotificationService + ) {} + + private url = '/api/v1/imports'; latest(query?: string): Observable { let requestUrl = `${this.url}/latest/`; if (query) { requestUrl += `?${query}`; } - return this.http.get(requestUrl).pipe( - tap(_ => this.log('fetched latest imports')), - catchError(this.handleError('Latest', {} as PagedResponse)), - ); + return this.http.get(requestUrl) + .pipe( + tap(_ => this.log('fetched latest imports')), + catchError(this.handleError('Latest', {} as PagedResponse)) + ); } query(params?: any): Observable { - return this.http.get(this.url + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched imports')), - catchError(this.handleError('Query', [] as Import[])), - ); + return this.http.get(this.url + '/', {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched imports')), + catchError(this.handleError('Query', [] as Import[])) + ); } get(id: number): Observable { - return this.http.get(`${this.url}/${id.toString()}/`).pipe( - tap(_ => this.log('fetched import')), - catchError(this.handleError('Get', {} as Import)), - ); + return this.http.get(`${this.url}/${id.toString()}/`) + .pipe( + tap(_ => this.log('fetched import')), + catchError(this.handleError('Get', {} as Import)) + ); } save(params: SaveParams): Observable { @@ -75,7 +86,7 @@ export class ImportsService { httpResult = this.http.post(this.url, params, httpOptions); return httpResult.pipe( tap((newImport: Import) => this.log(`Saved import w/ id=${newImport.id}`)), - catchError(this.handleError('Save')), + catchError(this.handleError('Save')) ); } @@ -83,7 +94,7 @@ export class ImportsService { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} provider source error: ${error.message}`); - this.notificationService.httpError(`${operation} user failed:`, { data: error }); + this.notificationService.httpError(`${operation} user failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); diff --git a/galaxyui/src/app/resources/namespaces/namespace.service.spec.ts b/galaxyui/src/app/resources/namespaces/namespace.service.spec.ts index adf69e1f4..33857296d 100644 --- a/galaxyui/src/app/resources/namespaces/namespace.service.spec.ts +++ b/galaxyui/src/app/resources/namespaces/namespace.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { NamespaceService } from './namespace.service'; describe('NamespaceService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [NamespaceService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [NamespaceService] }); + }); - it('should be created', inject([NamespaceService], (service: NamespaceService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([NamespaceService], (service: NamespaceService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/namespaces/namespace.service.ts b/galaxyui/src/app/resources/namespaces/namespace.service.ts index 8dd0c7675..fd5c4b628 100644 --- a/galaxyui/src/app/resources/namespaces/namespace.service.ts +++ b/galaxyui/src/app/resources/namespaces/namespace.service.ts @@ -10,52 +10,60 @@ import { Namespace } from './namespace'; import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; import { PagedResponse } from '../paged-response'; + const httpOptions = { headers: new HttpHeaders({ - 'Content-Type': 'application/json', - }), + 'Content-Type': 'application/json' + }) }; + @Injectable() export class NamespaceService { private url = '/api/v1/namespaces'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor(private http: HttpClient, + private notificationService: NotificationService) { + } encounteredErrors = false; query(params?: any): Observable { - return this.http.get(this.url + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched namespaces')), - catchError(this.handleError('Query', [])), - ); + return this.http.get(this.url + '/', { params: params }) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched namespaces')), + catchError(this.handleError('Query', [])) + ); } pagedQuery(params: any): Observable { if (params && typeof params === 'object') { - return this.http.get(this.url + '/', { params: params }).pipe( - tap(_ => this.log('fetched paged content')), - catchError(this.handleError('Query', {} as PagedResponse)), - ); + return this.http.get(this.url + '/', { params: params }) + .pipe( + tap(_ => this.log('fetched paged content')), + catchError(this.handleError('Query', {} as PagedResponse)) + ); } if (params && typeof params === 'string') { - return this.http.get(this.url + '/' + params).pipe( + return this.http.get(this.url + '/' + params) + .pipe( + tap(_ => this.log('fetched paged content')), + catchError(this.handleError('Query', {} as PagedResponse)) + ); + } + return this.http.get(this.url + '/') + .pipe( tap(_ => this.log('fetched paged content')), - catchError(this.handleError('Query', {} as PagedResponse)), + catchError(this.handleError('Query', {} as PagedResponse)) ); - } - return this.http.get(this.url + '/').pipe( - tap(_ => this.log('fetched paged content')), - catchError(this.handleError('Query', {} as PagedResponse)), - ); } get(id: number): Observable { const url = `${this.url}/${id}/`; return this.http.get(url).pipe( tap(_ => this.log(`fetched namespace id=${id}`)), - catchError(this.handleError(`Get id=${id}`)), + catchError(this.handleError(`Get id=${id}`)) ); } @@ -68,17 +76,17 @@ export class NamespaceService { } return httpResult.pipe( tap((newNamespace: Namespace) => this.log(`Saved namespace w/ id=${newNamespace.id}`)), - catchError(this.handleError('Save', namespace)), + catchError(this.handleError('Save', namespace)) ); } - delete(namespace: Namespace | number): Observable { + delete (namespace: Namespace | number): Observable { const id = typeof namespace === 'number' ? namespace : namespace.id; const url = `${this.url}/${id}`; return this.http.delete(url, httpOptions).pipe( tap(_ => this.log(`deleted namespace id=${id}`)), - catchError(this.handleError('Delete')), + catchError(this.handleError('Delete')) ); } @@ -87,7 +95,8 @@ export class NamespaceService { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} namespace error: ${error.message}`); - if (typeof error === 'object' && 'error' in error && typeof error['error'] === 'object' && result !== undefined) { + if (typeof error === 'object' && 'error' in error && typeof error['error'] === 'object' && + result !== undefined) { // Unpack error messages, sending each to the notification service for (const fld in error['error']) { if (error['error'].hasOwnProperty(fld)) { diff --git a/galaxyui/src/app/resources/namespaces/namespace.ts b/galaxyui/src/app/resources/namespaces/namespace.ts index 002207d5c..bb86f74a6 100644 --- a/galaxyui/src/app/resources/namespaces/namespace.ts +++ b/galaxyui/src/app/resources/namespaces/namespace.ts @@ -1,6 +1,6 @@ import { ProviderNamespace } from '../provider-namespaces/provider-namespace'; -import { Repository } from '../repositories/repository'; -import { User } from '../users/user'; +import { Repository } from '../repositories/repository'; +import { User } from '../users/user'; export class Namespace { id: number; diff --git a/galaxyui/src/app/resources/pf-body/pf-body.service.ts b/galaxyui/src/app/resources/pf-body/pf-body.service.ts index fb9fead10..99953ad1a 100644 --- a/galaxyui/src/app/resources/pf-body/pf-body.service.ts +++ b/galaxyui/src/app/resources/pf-body/pf-body.service.ts @@ -2,32 +2,34 @@ import { Injectable } from '@angular/core'; import { Subject } from 'rxjs'; @Injectable() + export class BodyCommand { propertyName: string; propertyValue: number; } export class PFBodyService { - private messageSource = new Subject(); - currentMessage = this.messageSource.asObservable(); - constructor() {} + private messageSource = new Subject(); + currentMessage = this.messageSource.asObservable(); + + constructor() { } - scrollToTop() { - const top = { - propertyName: 'scrollTop', - propertyValue: 0, - } as BodyCommand; + scrollToTop() { + const top = { + propertyName: 'scrollTop', + propertyValue: 0, + } as BodyCommand; - this.messageSource.next(top); - } + this.messageSource.next(top); + } - scrollTo(xCoord: number) { - const location = { - propertyName: 'scrollTop', - propertyValue: xCoord, - }; + scrollTo(xCoord: number) { + const location = { + propertyName: 'scrollTop', + propertyValue: xCoord, + }; - this.messageSource.next(location); - } + this.messageSource.next(location); + } } diff --git a/galaxyui/src/app/resources/platforms/platform.service.spec.ts b/galaxyui/src/app/resources/platforms/platform.service.spec.ts index 3f4295d9f..cb333e65e 100644 --- a/galaxyui/src/app/resources/platforms/platform.service.spec.ts +++ b/galaxyui/src/app/resources/platforms/platform.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { PlatformService } from './platform.service'; describe('PlatformService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [PlatformService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [PlatformService] }); + }); - it('should be created', inject([PlatformService], (service: PlatformService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([PlatformService], (service: PlatformService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/platforms/platform.service.ts b/galaxyui/src/app/resources/platforms/platform.service.ts index 707fb845c..165586847 100644 --- a/galaxyui/src/app/resources/platforms/platform.service.ts +++ b/galaxyui/src/app/resources/platforms/platform.service.ts @@ -1,42 +1,53 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; import { catchError, map, tap } from 'rxjs/operators'; +import { Platform } from './platform'; import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { PagedResponse } from '../paged-response'; -import { Platform } from './platform'; +import { PagedResponse } from '../paged-response'; + +const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json' + }) +}; @Injectable() export class PlatformService { + private url = '/api/v1/platforms'; private searchUrl = '/api/v1/search/platforms'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor(private http: HttpClient, + private notificationService: NotificationService) { + } - query(params?: any): Observable { - return this.http.get(this.url + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched repositories')), - catchError(this.handleError('Query', [] as Platform[])), - ); + query(params?: any ): Observable { + return this.http.get(this.url + '/', {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched repositories')), + catchError(this.handleError('Query', [] as Platform[])) + ); } - search(params?: any): Observable { - return this.http.get(this.searchUrl + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched repositories')), - catchError(this.handleError('Query', [] as Platform[])), - ); + search(params?: any ): Observable { + return this.http.get(this.searchUrl + '/', {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched repositories')), + catchError(this.handleError('Query', [] as Platform[])) + ); } private handleError(operation = '', result?: T) { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} repository error: ${error.message}`); - this.notificationService.httpError(`${operation} repository failed:`, { data: error }); + this.notificationService.httpError(`${operation} repository failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); @@ -46,4 +57,5 @@ export class PlatformService { private log(message: string) { console.log('PlatformService: ' + message); } + } diff --git a/galaxyui/src/app/resources/provider-namespaces/provider-source.service.spec.ts b/galaxyui/src/app/resources/provider-namespaces/provider-source.service.spec.ts index 02c193bc8..fd6fd2f2f 100644 --- a/galaxyui/src/app/resources/provider-namespaces/provider-source.service.spec.ts +++ b/galaxyui/src/app/resources/provider-namespaces/provider-source.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { ProviderSourceService } from './provider-source.service'; describe('ProviderSourceService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ProviderSourceService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ProviderSourceService] }); + }); - it('should be created', inject([ProviderSourceService], (service: ProviderSourceService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([ProviderSourceService], (service: ProviderSourceService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/provider-namespaces/provider-source.service.ts b/galaxyui/src/app/resources/provider-namespaces/provider-source.service.ts index 09512abe5..7fad4c95c 100644 --- a/galaxyui/src/app/resources/provider-namespaces/provider-source.service.ts +++ b/galaxyui/src/app/resources/provider-namespaces/provider-source.service.ts @@ -1,29 +1,35 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import { catchError, tap } from 'rxjs/operators'; -import { RepositorySource } from '../repositories/repository-source'; -import { ProviderSource } from './provider-source'; +import { Injectable } from '@angular/core'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { catchError, map, tap } from 'rxjs/operators'; +import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; +import { ProviderNamespace } from './provider-namespace'; +import { ProviderSource } from './provider-source'; +import { RepositorySource } from '../repositories/repository-source'; @Injectable() export class ProviderSourceService { + private url = '/api/v1/providers/sources'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor( + private http: HttpClient, + private notificationService: NotificationService) {} query(): Observable { - return this.http.get(this.url + '/').pipe( - tap(providerNamespaces => this.log('fetched provider sources')), - catchError(this.handleError('Query', [])), - ); + return this.http.get(this.url + '/') + .pipe( + tap(providerNamespaces => this.log('fetched provider sources')), + catchError(this.handleError('Query', [])) + ); } - getRepoSources(params): Observable { - return this.http.get(`${this.url}/${params.providerName}/${params.name}/`).pipe( + getRepoSources(params): Observable { + return this.http.get(`${this.url}/${params.providerName}/${params.name}/`) + .pipe( tap(providerNamespaces => this.log('fetched source repositories')), - catchError(this.handleError('Query', [])), + catchError(this.handleError('Query', [])) ); } @@ -31,7 +37,7 @@ export class ProviderSourceService { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} provider source error: ${error.message}`); - this.notificationService.httpError(`${operation} user failed:`, { data: error }); + this.notificationService.httpError(`${operation} user failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); @@ -42,3 +48,4 @@ export class ProviderSourceService { console.log('ProviderSourceService: ' + message); } } + diff --git a/galaxyui/src/app/resources/repositories/repository.service.spec.ts b/galaxyui/src/app/resources/repositories/repository.service.spec.ts index 590f25690..7bc4905d2 100644 --- a/galaxyui/src/app/resources/repositories/repository.service.spec.ts +++ b/galaxyui/src/app/resources/repositories/repository.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { RepositoryService } from './repository.service'; describe('RepositoryService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [RepositoryService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [RepositoryService] }); + }); - it('should be created', inject([RepositoryService], (service: RepositoryService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([RepositoryService], (service: RepositoryService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/repositories/repository.service.ts b/galaxyui/src/app/resources/repositories/repository.service.ts index 4f99e276a..48e2ad89c 100644 --- a/galaxyui/src/app/resources/repositories/repository.service.ts +++ b/galaxyui/src/app/resources/repositories/repository.service.ts @@ -11,48 +11,56 @@ import { Repository } from './repository'; const httpOptions = { headers: new HttpHeaders({ - 'Content-Type': 'application/json', - }), + 'Content-Type': 'application/json' + }) }; @Injectable() export class RepositoryService { + private url = '/api/v1/repositories'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor(private http: HttpClient, + private notificationService: NotificationService) { + } query(params?: any): Observable { - return this.http.get(this.url + '/', { params: params }).pipe( - map(response => response.results as Repository[]), - tap(_ => this.log('fetched repositories')), - catchError(this.handleError('Query', [] as Repository[])), - ); + return this.http.get(this.url + '/', { params: params }) + .pipe( + map(response => response.results as Repository[]), + tap(_ => this.log('fetched repositories')), + catchError(this.handleError('Query', [] as Repository[])) + ); } pagedQuery(params?: any): Observable { if (params && typeof params === 'object') { - return this.http.get(this.url + '/', { params: params }).pipe( - tap(_ => this.log('fetched repositories')), - catchError(this.handleError('Query', {} as PagedResponse)), - ); + return this.http.get(this.url + '/', { params: params }) + .pipe( + tap(_ => this.log('fetched repositories')), + catchError(this.handleError('Query', {} as PagedResponse)) + ); } if (params && typeof params === 'string') { - return this.http.get(this.url + '/' + params).pipe( + return this.http.get(this.url + '/' + params) + .pipe( + tap(_ => this.log('fetched repositories')), + catchError(this.handleError('Query', {} as PagedResponse)) + ); + } + return this.http.get(this.url + '/') + .pipe( tap(_ => this.log('fetched repositories')), - catchError(this.handleError('Query', {} as PagedResponse)), + catchError(this.handleError('Query', {} as PagedResponse)) ); - } - return this.http.get(this.url + '/').pipe( - tap(_ => this.log('fetched repositories')), - catchError(this.handleError('Query', {} as PagedResponse)), - ); } get(id: number): Observable { - return this.http.get(`${this.url}/${id.toString()}/`).pipe( - tap(_ => this.log('Fetched repository')), - catchError(this.handleError('Get', {} as Repository)), - ); + return this.http.get(`${this.url}/${id.toString()}/`) + .pipe( + tap(_ => this.log('Fetched repository')), + catchError(this.handleError('Get', {} as Repository)) + ); } save(repository: Repository): Observable { @@ -65,15 +73,16 @@ export class RepositoryService { return httpResult.pipe( tap((newRepo: Repository) => this.log(`Saved repository w/ id=${newRepo.id}`)), - catchError(this.handleError('Save')), + catchError(this.handleError('Save')) ); } destroy(repository: Repository): Observable { - return this.http.delete(`${this.url}/${repository.id}/`).pipe( - tap(_ => this.log(`Deleted repository w/ id=${repository.id}`)), - catchError(this.handleError('Save')), - ); + return this.http.delete(`${this.url}/${repository.id}/`) + .pipe( + tap(_ => this.log(`Deleted repository w/ id=${repository.id}`)), + catchError(this.handleError('Save')) + ); } private handleError(operation = '', result?: T) { @@ -103,4 +112,5 @@ export class RepositoryService { private log(message: string) { console.log('RepositoryService: ' + message); } + } diff --git a/galaxyui/src/app/resources/repository-imports/repository-import.service.spec.ts b/galaxyui/src/app/resources/repository-imports/repository-import.service.spec.ts index ed932e5c2..9014aae5f 100644 --- a/galaxyui/src/app/resources/repository-imports/repository-import.service.spec.ts +++ b/galaxyui/src/app/resources/repository-imports/repository-import.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { RepositoryImportService } from './repository-import.service'; describe('RepositoryImportService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [RepositoryImportService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [RepositoryImportService] }); + }); - it('should be created', inject([RepositoryImportService], (service: RepositoryImportService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([RepositoryImportService], (service: RepositoryImportService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/repository-imports/repository-import.service.ts b/galaxyui/src/app/resources/repository-imports/repository-import.service.ts index 12ea58a43..31c1df418 100644 --- a/galaxyui/src/app/resources/repository-imports/repository-import.service.ts +++ b/galaxyui/src/app/resources/repository-imports/repository-import.service.ts @@ -1,44 +1,49 @@ +import { Injectable } from '@angular/core'; +import { catchError, map, tap } from 'rxjs/operators'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { PagedResponse } from '../paged-response'; +import { of } from 'rxjs/observable/of'; import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import { catchError, map, tap } from 'rxjs/operators'; -import { PagedResponse } from '../paged-response'; -import { RepositoryImport } from './repository-import'; +import { Observable } from 'rxjs/Observable'; +import { RepositoryImport } from './repository-import'; const httpOptions = { headers: new HttpHeaders({ - 'Content-Type': 'application/json', - }), + 'Content-Type': 'application/json' + }) }; @Injectable() export class RepositoryImportService { + private url = '/api/v1/imports'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor(private http: HttpClient, + private notificationService: NotificationService) { + } query(params): Observable { - return this.http.get(this.url, { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched repository imports')), - catchError(this.handleError('Query', [])), - ); + return this.http.get(this.url, {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched repository imports')), + catchError(this.handleError('Query', [])) + ); } save(params: any): Observable { - return this.http.post(`${this.url}/`, params, httpOptions).pipe( - tap((newImport: RepositoryImport) => this.log(`Saved repository import`)), - catchError(this.handleError('Save')), - ); + return this.http.post(`${this.url}/`, params, httpOptions) + .pipe( + tap((newImport: RepositoryImport) => this.log(`Saved repository import`)), + catchError(this.handleError('Save')) + ); } private handleError(operation = '', result?: T) { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} repository import error: ${error.message}`); - this.notificationService.httpError(`${operation} repository import failed:`, { data: error }); + this.notificationService.httpError(`${operation} repository import failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); @@ -48,4 +53,5 @@ export class RepositoryImportService { private log(message: string) { console.log('RepositoryImportService: ' + message); } + } diff --git a/galaxyui/src/app/resources/tags/tags.service.spec.ts b/galaxyui/src/app/resources/tags/tags.service.spec.ts index 2c152451f..880003545 100644 --- a/galaxyui/src/app/resources/tags/tags.service.spec.ts +++ b/galaxyui/src/app/resources/tags/tags.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { TagsService } from './tags.service'; describe('TagsService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [TagsService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [TagsService] }); + }); - it('should be created', inject([TagsService], (service: TagsService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([TagsService], (service: TagsService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/tags/tags.service.ts b/galaxyui/src/app/resources/tags/tags.service.ts index f70ed97ca..98b2e7421 100644 --- a/galaxyui/src/app/resources/tags/tags.service.ts +++ b/galaxyui/src/app/resources/tags/tags.service.ts @@ -1,43 +1,57 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { + HttpClient, + HttpHeaders +} from '@angular/common/http'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; import { catchError, map, tap } from 'rxjs/operators'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { PagedResponse } from '../paged-response'; -import { Tag } from './tag'; +import { Tag } from './tag'; +import { PagedResponse } from '../paged-response'; + +const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json' + }) +}; @Injectable() export class TagsService { + private url = '/api/v1/tags'; private searchUrl = '/api/v1/search/tags'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor(private http: HttpClient, + private notificationService: NotificationService) { + } query(params?: any): Observable { - return this.http.get(this.url + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched content types')), - catchError(this.handleError('Query', [] as Tag[])), - ); + return this.http.get(this.url + '/', {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched content types')), + catchError(this.handleError('Query', [] as Tag[])) + ); } search(params?: any): Observable { - return this.http.get(this.searchUrl + '/', { params: params }).pipe( - map(response => response.results), - tap(_ => this.log('fetched content types')), - catchError(this.handleError('Query', [] as Tag[])), - ); + return this.http.get(this.searchUrl + '/', {params: params}) + .pipe( + map(response => response.results), + tap(_ => this.log('fetched content types')), + catchError(this.handleError('Query', [] as Tag[])) + ); } private handleError(operation = '', result?: T) { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} repository error: ${error.message}`); - this.notificationService.httpError(`${operation} repository failed:`, { data: error }); + this.notificationService.httpError(`${operation} repository failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); diff --git a/galaxyui/src/app/resources/users/user.service.spec.ts b/galaxyui/src/app/resources/users/user.service.spec.ts index 941ef3c22..b26195c25 100644 --- a/galaxyui/src/app/resources/users/user.service.spec.ts +++ b/galaxyui/src/app/resources/users/user.service.spec.ts @@ -1,15 +1,15 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; import { UserService } from './user.service'; describe('UserService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [UserService], - }); + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [UserService] }); + }); - it('should be created', inject([UserService], (service: UserService) => { - expect(service).toBeTruthy(); - })); + it('should be created', inject([UserService], (service: UserService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/galaxyui/src/app/resources/users/user.service.ts b/galaxyui/src/app/resources/users/user.service.ts index 5ecafd6de..b68c9034e 100644 --- a/galaxyui/src/app/resources/users/user.service.ts +++ b/galaxyui/src/app/resources/users/user.service.ts @@ -1,17 +1,21 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Injectable } from '@angular/core'; import { catchError, map, tap } from 'rxjs/operators'; -import { PagedResponse } from '../paged-response'; -import { User } from './user'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { PagedResponse } from '../paged-response'; +import { User } from './user'; +import { of } from 'rxjs/observable/of'; + @Injectable() export class UserService { + private url = '/api/v1/users/'; - constructor(private http: HttpClient, private notificationService: NotificationService) {} + constructor(private http: HttpClient, + private notificationService: NotificationService) { + } query(params?: any): Observable { let userUrl = this.url; @@ -23,18 +27,19 @@ export class UserService { userParams = params; } } - return this.http.get(userUrl, { params: userParams }).pipe( - map(response => response.results as User[]), - tap(_ => this.log('fetched users')), - catchError(this.handleError('Query', [])), - ); + return this.http.get(userUrl, {'params': userParams}) + .pipe( + map(response => response.results as User[]), + tap(_ => this.log('fetched users')), + catchError(this.handleError('Query', [])) + ); } private handleError(operation = '', result?: T) { return (error: any): Observable => { console.error(`${operation} failed, error:`, error); this.log(`${operation} user error: ${error.message}`); - this.notificationService.httpError(`${operation} user failed:`, { data: error }); + this.notificationService.httpError(`${operation} user failed:`, {data: error}); // Let the app keep running by returning an empty result. return of(result as T); diff --git a/galaxyui/src/app/search/popular/popular.component.spec.ts b/galaxyui/src/app/search/popular/popular.component.spec.ts index be80238e0..43729199b 100644 --- a/galaxyui/src/app/search/popular/popular.component.spec.ts +++ b/galaxyui/src/app/search/popular/popular.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchComponent } from './search.component'; describe('SearchComponent', () => { - let component: SearchComponent; - let fixture: ComponentFixture; + let component: SearchComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SearchComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SearchComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(SearchComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(SearchComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/search/popular/popular.component.ts b/galaxyui/src/app/search/popular/popular.component.ts index 6062e4782..94fce2d2b 100644 --- a/galaxyui/src/app/search/popular/popular.component.ts +++ b/galaxyui/src/app/search/popular/popular.component.ts @@ -1,14 +1,27 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { + Component, + EventEmitter, + Input, + ViewChild, + OnInit, + Output +} from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { + ActivatedRoute, +} from '@angular/router'; -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; -import { Tag } from '../../resources/tags/tag'; +import { Tag } from '../../resources/tags/tag'; +import { TagsService } from '../../resources/tags/tags.service'; -import { Platform } from '../../resources/platforms/platform'; +import { PlatformService } from '../../resources/platforms/platform.service'; +import { Platform } from '../../resources/platforms/platform'; -import { CloudPlatform } from '../../resources/cloud-platforms/cloud-platform'; +import { CloudPlatformService } from '../../resources/cloud-platforms/cloud-platform.service'; +import { CloudPlatform } from '../../resources/cloud-platforms/cloud-platform'; class PopularData { tags: Tag[]; @@ -24,21 +37,24 @@ export class PopularEvent { @Component({ selector: 'popular-widget', templateUrl: './popular.component.html', - styleUrls: ['./popular.component.less'], + styleUrls: ['./popular.component.less'] }) export class PopularComponent implements OnInit { - @Input() - popularType: string; - @Input() - popularTitle: string; - @Output() - click = new EventEmitter(); + + @Input() popularType: string; + @Input() popularTitle: string; + @Output() click = new EventEmitter(); data: PopularData; listConfig: ListConfig; items: any; - constructor(private route: ActivatedRoute) {} + constructor( + private tagsService: TagsService, + private platformService: PlatformService, + private cloudPlatformService: CloudPlatformService, + private route: ActivatedRoute + ) {} handleClick($event) { // User clicked on an item diff --git a/galaxyui/src/app/search/search-routing.module.ts b/galaxyui/src/app/search/search-routing.module.ts index 960f481f4..5e43f9bcc 100644 --- a/galaxyui/src/app/search/search-routing.module.ts +++ b/galaxyui/src/app/search/search-routing.module.ts @@ -1,22 +1,25 @@ import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { + Routes, + RouterModule +} from '@angular/router'; import { SearchComponent } from './search.component'; import { - PopularCloudPlatformsResolver, - PopularPlatformsResolver, - PopularTagsResolver, SearchCloudPlatformResolver, SearchContentResolver, SearchContentTypeResolver, SearchPlatformResolver, -} from './search.resolver.service'; + PopularTagsResolver, + PopularPlatformsResolver, + PopularCloudPlatformsResolver +} from './search.resolver.service'; const routes: Routes = [ { - path: '', + path: 'search', component: SearchComponent, runGuardsAndResolvers: 'always', resolve: { @@ -26,22 +29,26 @@ const routes: Routes = [ platforms: SearchPlatformResolver, popularTags: PopularTagsResolver, popularCloudPlatforms: PopularCloudPlatformsResolver, - popularPlatforms: PopularPlatformsResolver, + popularPlatforms: PopularPlatformsResolver }, - }, + } ]; @NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], - providers: [ - SearchCloudPlatformResolver, + imports: [ + RouterModule.forChild(routes) + ], + exports: [ + RouterModule + ], + providers: [ + SearchCloudPlatformResolver, SearchContentResolver, SearchContentTypeResolver, SearchPlatformResolver, PopularTagsResolver, PopularPlatformsResolver, - PopularCloudPlatformsResolver, - ], + PopularCloudPlatformsResolver + ] }) -export class SearchRoutingModule {} +export class SearchRoutingModule { } diff --git a/galaxyui/src/app/search/search.component.spec.ts b/galaxyui/src/app/search/search.component.spec.ts index be80238e0..43729199b 100644 --- a/galaxyui/src/app/search/search.component.spec.ts +++ b/galaxyui/src/app/search/search.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchComponent } from './search.component'; describe('SearchComponent', () => { - let component: SearchComponent; - let fixture: ComponentFixture; + let component: SearchComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SearchComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SearchComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(SearchComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(SearchComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/search/search.component.ts b/galaxyui/src/app/search/search.component.ts index e69c9f748..590494f80 100644 --- a/galaxyui/src/app/search/search.component.ts +++ b/galaxyui/src/app/search/search.component.ts @@ -1,55 +1,75 @@ -import { AfterViewInit, Component, OnInit } from '@angular/core'; - -import { ActivatedRoute } from '@angular/router'; - -import { Location } from '@angular/common'; - -import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; -import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; - -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterEvent } from 'patternfly-ng/filter/filter-event'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterQuery } from 'patternfly-ng/filter/filter-query'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; - -import { SortConfig } from 'patternfly-ng/sort/sort-config'; -import { SortEvent } from 'patternfly-ng/sort/sort-event'; -import { SortField } from 'patternfly-ng/sort/sort-field'; - -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; - -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; -import { NotificationType } from 'patternfly-ng/notification/notification-type'; - -import { ContentTypes } from '../enums/content-types.enum'; -import { CloudPlatform } from '../resources/cloud-platforms/cloud-platform'; +import { + Component, + OnInit, + ViewChild, + AfterViewInit +} from '@angular/core'; + +import { + ActivatedRoute, + Router +} from '@angular/router'; + +import { + Location +} from '@angular/common'; + +import { ListConfig } from 'patternfly-ng/list/basic-list/list-config'; +import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; + +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { Filter } from 'patternfly-ng/filter/filter'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { FilterQuery } from 'patternfly-ng/filter/filter-query'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; + +import { SortConfig } from 'patternfly-ng/sort/sort-config'; +import { SortField } from 'patternfly-ng/sort/sort-field'; +import { SortEvent } from 'patternfly-ng/sort/sort-event'; + +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; + +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { NotificationType } from 'patternfly-ng/notification/notification-type'; + +import { ContentTypes } from '../enums/content-types.enum'; +import { CloudPlatform } from '../resources/cloud-platforms/cloud-platform'; import { ContentSearchService } from '../resources/content-search/content-search.service'; -import { ContentType } from '../resources/content-types/content-type'; -import { PFBodyService } from '../resources/pf-body/pf-body.service'; -import { Platform } from '../resources/platforms/platform'; +import { ContentType } from '../resources/content-types/content-type'; +import { PFBodyService } from '../resources/pf-body/pf-body.service'; +import { Platform } from '../resources/platforms/platform'; -import { ContentTypesIconClasses } from '../enums/content-types.enum'; +import { + ContentTypesIconClasses +} from '../enums/content-types.enum'; -import { RepoFormats } from '../enums/repo-types.enum'; +import { + RepoFormats +} from '../enums/repo-types.enum'; -import { ContributorTypes, ContributorTypesIconClasses } from '../enums/contributor-types.enum'; +import { + ContributorTypes, + ContributorTypesIconClasses +} from '../enums/contributor-types.enum'; -import { PopularEvent } from './popular/popular.component'; +import { PopularEvent } from './popular/popular.component'; -import { Content } from '../resources/content-search/content'; +import { + Content, +} from '../resources/content-search/content'; -import * as moment from 'moment'; +import * as moment from 'moment'; @Component({ selector: 'app-search', templateUrl: './search.component.html', - styleUrls: ['./search.component.less'], + styleUrls: ['./search.component.less'] }) export class SearchComponent implements OnInit, AfterViewInit { + pageTitle = 'Search'; pageIcon = 'fa fa-search'; toolbarConfig: ToolbarConfig; @@ -76,6 +96,7 @@ export class SearchComponent implements OnInit, AfterViewInit { constructor( private route: ActivatedRoute, + private router: Router, private contentSearch: ContentSearchService, private location: Location, private notificationService: NotificationService, @@ -90,132 +111,138 @@ export class SearchComponent implements OnInit, AfterViewInit { id: 'keywords', title: 'Keyword', placeholder: 'Keyword', - type: FilterType.TEXT, + type: FilterType.TEXT }, { id: 'cloud_platforms', title: 'Cloud Platform', placeholder: 'Cloud Platform', type: FilterType.TYPEAHEAD, - queries: [], + queries: [] }, { id: 'namespaces', title: 'Contributor', placeholder: 'Name', - type: FilterType.TEXT, + type: FilterType.TEXT }, { id: 'contributor_type', title: 'Contributor Type', placeholder: 'Contributur Type', type: FilterType.TYPEAHEAD, - queries: [ - { - id: ContributorTypes.community, - value: ContributorTypes.community, - iconStyleClass: ContributorTypesIconClasses.community, - }, - { - id: ContributorTypes.vendor, - value: ContributorTypes.vendor, - iconStyleClass: ContributorTypesIconClasses.vendor, - }, - ], + queries: [{ + id: ContributorTypes.community, + value: ContributorTypes.community, + iconStyleClass: ContributorTypesIconClasses.community + }, { + id: ContributorTypes.vendor, + value: ContributorTypes.vendor, + iconStyleClass: ContributorTypesIconClasses.vendor + }] }, { id: 'content_type', title: 'Content Type', placeholder: 'Content Type', type: FilterType.TYPEAHEAD, - queries: [], + queries: [] }, { id: 'platforms', title: 'Platform', placeholder: 'Platform', type: FilterType.TYPEAHEAD, - queries: [], + queries: [] }, { id: 'tags', title: 'Tag', placeholder: 'Tag', - type: FilterType.TEXT, - }, + type: FilterType.TEXT + } ] as FilterField[], resultsCount: 0, totalCount: 0, - appliedFilters: [], + appliedFilters: [] } as FilterConfig; this.sortConfig = { fields: [] as SortField[], - isAscending: true, + isAscending: true } as SortConfig; this.emptyStateConfig = { info: '', title: this.noResultsState, - iconStyleClass: 'pficon pficon-filter', + iconStyleClass: 'pficon pficon-filter' } as EmptyStateConfig; this.toolbarConfig = { filterConfig: this.filterConfig, - sortConfig: this.sortConfig, + sortConfig: this.sortConfig } as ToolbarConfig; this.listConfig = { - emptyStateConfig: this.emptyStateConfig, + emptyStateConfig: this.emptyStateConfig } as ListConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; this.route.queryParams.subscribe(params => { - this.route.data.subscribe(data => { - // This function is called each time the route updates, so - // the default values have to be reset - this.appliedFilters = []; - this.paginationConfig.pageNumber = 1; - this.pageNumber = 1; - this.sortParams = '&order_by=-relevance'; - this.setSortConfig(this.sortParams); - - this.preparePlatforms(data.platforms); - this.prepareContentTypes(data.contentTypes); - this.prepareCloudPlatforms(data.cloudPlatforms); - - // If there is an error on the search API, the content search services - // returns nothing, so we have to check if results actually exist. - if (data.content.results) { - if (!data.content.results.length && !Object.keys(params).length) { - // No vendors exists - const default_params = { vendor: false }; - this.setSortConfig(); - this.setAppliedFilters(default_params); - this.searchContent(); + this.route.data.subscribe( + (data) => { + // This function is called each time the route updates, so + // the default values have to be reset + this.appliedFilters = []; + this.paginationConfig.pageNumber = 1; + this.pageNumber = 1; + this.sortParams = '&order_by=-relevance'; + this.setSortConfig(this.sortParams); + + this.preparePlatforms(data.platforms); + this.prepareContentTypes(data.contentTypes); + this.prepareCloudPlatforms(data.cloudPlatforms); + + // If there is an error on the search API, the content search services + // returns nothing, so we have to check if results actually exist. + if (data.content.results) { + if (!data.content.results.length && !Object.keys(params).length) { + // No vendors exists + const default_params = {vendor: false}; + this.setSortConfig(); + this.setAppliedFilters(default_params); + this.searchContent(); + } else { + this.setSortConfig(params['order_by']); + this.setPageSize(params); + this.setAppliedFilters(params); + this.prepareContent(data.content.results, data.content.count); + this.setQuery(); + this.pageLoading = false; + } } else { + this.notificationService.message( + NotificationType.WARNING, + 'Error', + 'Invalid search query', + false, + null, + null, + ); + this.setSortConfig(params['order_by']); this.setPageSize(params); this.setAppliedFilters(params); - this.prepareContent(data.content.results, data.content.count); - this.setQuery(); + this.pageLoading = false; } - } else { - this.notificationService.message(NotificationType.WARNING, 'Error', 'Invalid search query', false, null, null); - this.setSortConfig(params['order_by']); - this.setPageSize(params); - this.setAppliedFilters(params); - - this.pageLoading = false; - } - }); + }); }); } @@ -311,7 +338,7 @@ export class SearchComponent implements OnInit, AfterViewInit { ffield = this.getFilterField('tags'); filter = { field: ffield, - value: $event.item['name'], + value: $event.item['name'] } as Filter; break; case 'cloudPlatforms': @@ -320,7 +347,7 @@ export class SearchComponent implements OnInit, AfterViewInit { filter = { field: ffield, query: query, - value: $event.item['name'], + value: $event.item['name'] } as Filter; break; case 'platforms': @@ -329,7 +356,7 @@ export class SearchComponent implements OnInit, AfterViewInit { filter = { field: ffield, query: query, - value: $event.item['name'], + value: $event.item['name'] } as Filter; break; } @@ -361,16 +388,16 @@ export class SearchComponent implements OnInit, AfterViewInit { this.paginationConfig.pageSize = pageSize; this.pageSize = pageSize; } - if (params['page']) { - let pageNumber = Number(params['page']); + if (params['page']) { + let pageNumber = Number(params['page']); - if (Number.isNaN(pageNumber)) { - pageNumber = 1; - } + if (Number.isNaN(pageNumber)) { + pageNumber = 1; + } - this.paginationConfig.pageNumber = pageNumber; - this.pageNumber = pageNumber; - } + this.paginationConfig.pageNumber = pageNumber; + this.pageNumber = pageNumber; + } } private setAppliedFilters(queryParams: any) { @@ -422,7 +449,7 @@ export class SearchComponent implements OnInit, AfterViewInit { const ffield: Filter = {} as Filter; ffield.field = field; if (field.type === FilterType.TEXT) { - ffield.value = v; + ffield.value = v; } else if (field.type === FilterType.TYPEAHEAD) { field.queries.forEach((query: FilterQuery) => { if (query.id === v) { @@ -467,7 +494,7 @@ export class SearchComponent implements OnInit, AfterViewInit { private addToFilter(filter: Filter) { let filterExists = false; - this.appliedFilters.forEach((item: Filter) => { + this.appliedFilters.forEach( (item: Filter) => { if (item.field.id === filter.field.id && item.value === filter.value) { filterExists = true; } @@ -482,18 +509,19 @@ export class SearchComponent implements OnInit, AfterViewInit { if (this.pageNumber > 1) { paging += `&page=${this.pageNumber}`; } - const query = (this.filterParams + this.sortParams + paging).replace(/^&/, ''); // remove leading & - this.location.replaceState(this.getBasePath(), query); // update browser URL + const query = (this.filterParams + this.sortParams + paging).replace(/^&/, ''); // remove leading & + this.location.replaceState(this.getBasePath(), query); // update browser URL return query; } private searchContent() { this.pageLoading = true; const query = this.setQuery(); - this.contentSearch.query(query).subscribe(result => { - this.prepareContent(result.results, result.count); - this.pageLoading = false; - }); + this.contentSearch.query(query) + .subscribe(result => { + this.prepareContent(result.results, result.count); + this.pageLoading = false; + }); } private prepareContent(data: Content[], count: number) { @@ -511,7 +539,7 @@ export class SearchComponent implements OnInit, AfterViewInit { item['namespace_name'] = item.summary_fields['namespace']['name']; } else { // for vendors, assume name is in logo - item['namespace_name'] = item.summary_fields['namespace']['avatar_url'] ? '' : item.summary_fields['namespace']['name']; + item['namespace_name'] = (item.summary_fields['namespace']['avatar_url']) ? '' : item.summary_fields['namespace']['name']; } item['displayNamespace'] = item.summary_fields['namespace']['name']; if (item.summary_fields['content_type']['name'].indexOf('plugin') > -1) { @@ -559,7 +587,7 @@ export class SearchComponent implements OnInit, AfterViewInit { if (platformMap.hasOwnProperty(key)) { this.toolbarConfig.filterConfig.fields[idx].queries.push({ id: key, - value: key, + value: key }); } } @@ -587,7 +615,7 @@ export class SearchComponent implements OnInit, AfterViewInit { if (contentTypeMap.hasOwnProperty(key)) { this.toolbarConfig.filterConfig.fields[idx].queries.push({ id: key, - value: contentTypeMap[key], + value: contentTypeMap[key] }); } } @@ -607,7 +635,7 @@ export class SearchComponent implements OnInit, AfterViewInit { if (cpMap.hasOwnProperty(key)) { this.toolbarConfig.filterConfig.fields[idx].queries.push({ id: key, - value: cpMap[key], + value: cpMap[key] }); } } @@ -619,33 +647,30 @@ export class SearchComponent implements OnInit, AfterViewInit { { id: 'relevance', title: 'Best Match', - sortType: 'numeric', - }, - { + sortType: 'numeric' + }, { id: 'namespace__name,name', title: 'Contributor Name', - sortType: 'alpha', - }, - { + sortType: 'alpha' + }, { id: 'repository__download_count', title: 'Download Count', - sortType: 'numeric', - }, - { + sortType: 'numeric' + + }, { id: 'repository__forks_count', title: 'Forks', - sortType: 'numeric', - }, - { + sortType: 'numeric' + } + , { id: 'repository__stargazers_count', title: 'Stars', - sortType: 'numeric', - }, - { + sortType: 'numeric' + }, { id: 'repository__watchers_count', title: 'Watchers', - sortType: 'numeric', - }, + sortType: 'numeric' + } ] as SortField[]; this.sortParams = '&order_by='; diff --git a/galaxyui/src/app/search/search.module.ts b/galaxyui/src/app/search/search.module.ts index 200b34b95..f70b6dcad 100644 --- a/galaxyui/src/app/search/search.module.ts +++ b/galaxyui/src/app/search/search.module.ts @@ -1,23 +1,23 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; -import { BsDropdownModule } from 'ngx-bootstrap'; +import { BsDropdownModule } from 'ngx-bootstrap'; -import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { ActionModule } from 'patternfly-ng/action/action.module'; -import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; -import { FilterModule } from 'patternfly-ng/filter/filter.module'; -import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; -import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; -import { SortModule } from 'patternfly-ng/sort/sort.module'; -import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { ActionModule } from 'patternfly-ng/action/action.module'; +import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; +import { FilterModule } from 'patternfly-ng/filter/filter.module'; +import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; +import { SortModule } from 'patternfly-ng/sort/sort.module'; +import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { PopularComponent } from './popular/popular.component'; import { SearchRoutingModule } from './search-routing.module'; -import { SearchComponent } from './search.component'; +import { SearchComponent } from './search.component'; +import { PopularComponent } from './popular/popular.component'; -import { PageHeaderModule } from '../page-header/page-header.module'; -import { PageLoadingModule } from '../page-loading/page-loading.module'; +import { PageHeaderModule } from '../page-header/page-header.module'; +import { PageLoadingModule } from '../page-loading/page-loading.module'; @NgModule({ imports: [ @@ -33,8 +33,11 @@ import { PageLoadingModule } from '../page-loading/page-loading.module'; PageHeaderModule, PageLoadingModule, PaginationModule, - BsDropdownModule.forRoot(), + BsDropdownModule.forRoot() ], - declarations: [SearchComponent, PopularComponent], + declarations: [ + SearchComponent, + PopularComponent + ] }) -export class SearchModule {} +export class SearchModule { } diff --git a/galaxyui/src/app/search/search.resolver.service.ts b/galaxyui/src/app/search/search.resolver.service.ts index 85e2ea9a7..45d87245e 100644 --- a/galaxyui/src/app/search/search.resolver.service.ts +++ b/galaxyui/src/app/search/search.resolver.service.ts @@ -1,28 +1,43 @@ -import { Injectable } from '@angular/core'; +import { + Injectable +} from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot +} from '@angular/router'; -import { Observable } from 'rxjs/Observable'; -import { ContentResponse } from '../resources/content-search/content'; -import { ContentSearchService } from '../resources/content-search/content-search.service'; +import { + Location +} from '@angular/common'; -import { Platform } from '../resources/platforms/platform'; -import { PlatformService } from '../resources/platforms/platform.service'; +import { Observable } from 'rxjs/Observable'; +import { ContentSearchService } from '../resources/content-search/content-search.service'; +import { ContentResponse } from '../resources/content-search/content'; -import { ContentType } from '../resources/content-types/content-type'; -import { ContentTypeService } from '../resources/content-types/content-type.service'; +import { PlatformService } from '../resources/platforms/platform.service'; +import { Platform } from '../resources/platforms/platform'; -import { CloudPlatform } from '../resources/cloud-platforms/cloud-platform'; -import { CloudPlatformService } from '../resources/cloud-platforms/cloud-platform.service'; +import { ContentTypeService } from '../resources/content-types/content-type.service'; +import { ContentType } from '../resources/content-types/content-type'; -import { Tag } from '../resources/tags/tag'; -import { TagsService } from '../resources/tags/tags.service'; +import { CloudPlatformService } from '../resources/cloud-platforms/cloud-platform.service'; +import { CloudPlatform } from '../resources/cloud-platforms/cloud-platform'; -import { ContributorTypes } from '../enums/contributor-types.enum'; +import { TagsService } from '../resources/tags/tags.service'; +import { Tag } from '../resources/tags/tag'; + +import { ContributorTypes } from '../enums/contributor-types.enum'; @Injectable() export class SearchContentResolver implements Resolve { - constructor(private contentService: ContentSearchService) {} + constructor( + private contentService: ContentSearchService, + private router: Router, + private location: Location + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { let params = ''; for (const key in route.queryParams) { @@ -60,41 +75,56 @@ export class SearchContentResolver implements Resolve { @Injectable() export class SearchPlatformResolver implements Resolve { - constructor(private platformService: PlatformService) {} + constructor( + private platformService: PlatformService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.platformService.query({ page_size: 1000 }); + return this.platformService.query({'page_size': 1000}); } } @Injectable() export class SearchContentTypeResolver implements Resolve { - constructor(private contentTypeService: ContentTypeService) {} + constructor( + private contentTypeService: ContentTypeService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.contentTypeService.query({ page_size: 1000, order: 'description' }); + return this.contentTypeService.query({'page_size': 1000, 'order': 'description'}); } } @Injectable() export class SearchCloudPlatformResolver implements Resolve { - constructor(private contentTypeService: CloudPlatformService) {} + constructor( + private contentTypeService: CloudPlatformService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.contentTypeService.query({ page_size: 1000 }); + return this.contentTypeService.query({'page_size': 1000}); } } @Injectable() export class PopularTagsResolver implements Resolve { - constructor(private tagsService: TagsService) {} + constructor( + private tagsService: TagsService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.tagsService.search({ order_by: '-roles_count,name' }); + return this.tagsService.search({'order_by': '-roles_count,name'}); } } @Injectable() export class PopularPlatformsResolver implements Resolve { - constructor(private platformService: PlatformService) {} + constructor( + private platformService: PlatformService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.platformService.search({ page_size: 1000, order_by: '-roles_count,name' }).map(result => { + return this.platformService.search({'page_size': 1000, 'order_by': '-roles_count,name'}).map(result => { // Sum roles_count per platforms, sans release const summary = {}; const platforms: Platform[] = []; @@ -108,7 +138,7 @@ export class PopularPlatformsResolver implements Resolve { if (summary.hasOwnProperty(key)) { platforms.push({ name: key, - roles_count: summary[key], + roles_count: summary[key] } as Platform); } } @@ -119,8 +149,11 @@ export class PopularPlatformsResolver implements Resolve { @Injectable() export class PopularCloudPlatformsResolver implements Resolve { - constructor(private cloudPlatformService: CloudPlatformService) {} + constructor( + private cloudPlatformService: CloudPlatformService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.cloudPlatformService.search({ order_by: '-roles_count,name' }); + return this.cloudPlatformService.search({'order_by': '-roles_count,name'}); } } diff --git a/galaxyui/src/app/user-notifications/user-notifications.component.spec.ts b/galaxyui/src/app/user-notifications/user-notifications.component.spec.ts index e8b467a41..7993daa6e 100644 --- a/galaxyui/src/app/user-notifications/user-notifications.component.spec.ts +++ b/galaxyui/src/app/user-notifications/user-notifications.component.spec.ts @@ -3,22 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { UserNotificationsComponent } from './user-notifications.component'; describe('UserNotificationsComponent', () => { - let component: UserNotificationsComponent; - let fixture: ComponentFixture; + let component: UserNotificationsComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [UserNotificationsComponent], - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UserNotificationsComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(UserNotificationsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(UserNotificationsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/galaxyui/src/app/user-notifications/user-notifications.component.ts b/galaxyui/src/app/user-notifications/user-notifications.component.ts index cacf5edd0..233b4890f 100644 --- a/galaxyui/src/app/user-notifications/user-notifications.component.ts +++ b/galaxyui/src/app/user-notifications/user-notifications.component.ts @@ -1,20 +1,26 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { + Component, + OnInit, + ViewEncapsulation +} from '@angular/core'; -import { NotificationEvent } from 'patternfly-ng'; -import { Notification } from 'patternfly-ng/notification/notification'; -import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { Notification } from 'patternfly-ng/notification/notification'; +import { NotificationType } from 'patternfly-ng/notification/notification-type'; +import { NotificationService } from 'patternfly-ng/notification/notification-service/notification.service'; +import { NotificationEvent } from 'patternfly-ng'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'user-notifications', templateUrl: './user-notifications.component.html', - styleUrls: ['./user-notifications.component.less'], + styleUrls: ['./user-notifications.component.less'] }) export class UserNotificationsComponent implements OnInit { showClose = true; notifications: Notification[]; - constructor(private notificationService: NotificationService) {} + constructor(private notificationService: NotificationService) { + } ngOnInit(): void { this.notifications = this.notificationService.getNotifications(); diff --git a/galaxyui/src/app/utilities/clipboard/clipboard.component.ts b/galaxyui/src/app/utilities/clipboard/clipboard.component.ts index 9781ba502..c8490831c 100644 --- a/galaxyui/src/app/utilities/clipboard/clipboard.component.ts +++ b/galaxyui/src/app/utilities/clipboard/clipboard.component.ts @@ -1,11 +1,17 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; + @Component({ selector: 'copy-to-clipboard', templateUrl: './clipboard.component.html', - styleUrls: ['./clipboard.component.less'], + styleUrls: ['./clipboard.component.less'] }) export class ClipboardComponent implements OnInit { + constructor() {} _copyText: string; @@ -25,12 +31,12 @@ export class ClipboardComponent implements OnInit { s4(): string { return Math.floor((1 + Math.random()) * 0x10000) - .toString(16) - .substring(1); + .toString(16) + .substring(1); } calcGuid(): string { - return this.s4() + this.s4() + '-' + this.s4() + '-' + this.s4() + '-' + this.s4() + '-' + this.s4() + this.s4() + this.s4(); + return this.s4() + this.s4() + '-' + this.s4() + '-' + this.s4() + '-' + this.s4() + '-' + this.s4() + this.s4() + this.s4(); } copyToClipboard() { diff --git a/galaxyui/src/app/utilities/utilities.module.ts b/galaxyui/src/app/utilities/utilities.module.ts index c5bbc7b51..6f0180619 100644 --- a/galaxyui/src/app/utilities/utilities.module.ts +++ b/galaxyui/src/app/utilities/utilities.module.ts @@ -1,13 +1,21 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; -import { TooltipModule } from 'ngx-bootstrap/tooltip'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; + +import { ClipboardComponent } from './clipboard/clipboard.component'; -import { ClipboardComponent } from './clipboard/clipboard.component'; @NgModule({ - imports: [CommonModule, TooltipModule], - declarations: [ClipboardComponent], - exports: [ClipboardComponent], + imports: [ + CommonModule, + TooltipModule + ], + declarations: [ + ClipboardComponent + ], + exports: [ + ClipboardComponent + ] }) -export class UtilitiesModule {} +export class UtilitiesModule { } diff --git a/galaxyui/src/app/vendors/card/vendor-card.component.ts b/galaxyui/src/app/vendors/card/vendor-card.component.ts index 42480d5e0..fafc7fc84 100644 --- a/galaxyui/src/app/vendors/card/vendor-card.component.ts +++ b/galaxyui/src/app/vendors/card/vendor-card.component.ts @@ -1,16 +1,32 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnInit +} from '@angular/core'; -import { Router } from '@angular/router'; +import { + ActivatedRoute, + Router +} from '@angular/router'; -import { Namespace } from '../../resources/namespaces/namespace'; +import { Namespace } from '../../resources/namespaces/namespace'; + +import { + ContentTypes, + ContentTypesPluralChoices, + ContentTypesIconClasses +} from '../../enums/content-types.enum'; @Component({ selector: 'vendor-card', templateUrl: './vendor-card.component.html', - styleUrls: ['./vendor-card.component.less'], + styleUrls: ['./vendor-card.component.less'] }) export class VendorCardComponent implements OnInit { - constructor(private router: Router) {} + + constructor( + private router: Router + ) {} _vendor: Namespace; diff --git a/galaxyui/src/app/vendors/vendors.component.ts b/galaxyui/src/app/vendors/vendors.component.ts index 5cccb5b33..b7782c187 100644 --- a/galaxyui/src/app/vendors/vendors.component.ts +++ b/galaxyui/src/app/vendors/vendors.component.ts @@ -1,32 +1,51 @@ -import { Component, OnInit } from '@angular/core'; - -import { ActivatedRoute, Router } from '@angular/router'; - -import { ActionConfig } from 'patternfly-ng/action/action-config'; -import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; -import { Filter } from 'patternfly-ng/filter/filter'; -import { FilterConfig } from 'patternfly-ng/filter/filter-config'; -import { FilterField } from 'patternfly-ng/filter/filter-field'; -import { FilterType } from 'patternfly-ng/filter/filter-type'; -import { ListEvent } from 'patternfly-ng/list/list-event'; -import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; -import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; -import { SortConfig } from 'patternfly-ng/sort/sort-config'; -import { SortEvent } from 'patternfly-ng/sort/sort-event'; -import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; - -import { Namespace } from '../resources/namespaces/namespace'; -import { NamespaceService } from '../resources/namespaces/namespace.service'; - -import { ContentTypes, ContentTypesIconClasses, ContentTypesPluralChoices } from '../enums/content-types.enum'; +import { + Component, + OnInit +} from '@angular/core'; + +import { + ActivatedRoute, + Router +} from '@angular/router'; + +import { Action } from 'patternfly-ng/action/action'; +import { ActionConfig } from 'patternfly-ng/action/action-config'; +import { ListEvent } from 'patternfly-ng/list/list-event'; +import { FilterConfig } from 'patternfly-ng/filter/filter-config'; +import { ToolbarConfig } from 'patternfly-ng/toolbar/toolbar-config'; +import { FilterType } from 'patternfly-ng/filter/filter-type'; +import { SortConfig } from 'patternfly-ng/sort/sort-config'; +import { FilterField } from 'patternfly-ng/filter/filter-field'; +import { SortField } from 'patternfly-ng/sort/sort-field'; +import { ToolbarView } from 'patternfly-ng/toolbar/toolbar-view'; +import { SortEvent } from 'patternfly-ng/sort/sort-event'; +import { Filter } from 'patternfly-ng/filter/filter'; +import { FilterEvent } from 'patternfly-ng/filter/filter-event'; +import { EmptyStateConfig } from 'patternfly-ng/empty-state/empty-state-config'; +import { PaginationConfig } from 'patternfly-ng/pagination/pagination-config'; +import { PaginationEvent } from 'patternfly-ng/pagination/pagination-event'; + +import { NamespaceService } from '../resources/namespaces/namespace.service'; +import { Namespace } from '../resources/namespaces/namespace'; + +import { + ContentTypes, + ContentTypesPluralChoices, + ContentTypesIconClasses +} from '../enums/content-types.enum'; @Component({ selector: 'app-vendors', templateUrl: './vendors.component.html', - styleUrls: ['./vendors.component.less'], + styleUrls: ['./vendors.component.less'] }) export class VendorsComponent implements OnInit { - constructor(private router: Router, private route: ActivatedRoute, private namespaceService: NamespaceService) {} + + constructor( + private router: Router, + private route: ActivatedRoute, + private namespaceService: NamespaceService + ) {} pageTitle = 'Partners'; headerIcon = 'fa fa-star'; @@ -41,7 +60,7 @@ export class VendorsComponent implements OnInit { paginationConfig: PaginationConfig; sortBy = 'name'; filterBy: any = { - is_vendor: 'true', + 'is_vendor': 'true' }; pageNumber = 1; pageSize = 10; @@ -50,7 +69,7 @@ export class VendorsComponent implements OnInit { this.emptyStateConfig = { info: '', title: 'No partners match your search', - iconStyleClass: 'pficon pficon-filter', + iconStyleClass: 'pficon pficon-filter' } as EmptyStateConfig; this.filterConfig = { @@ -59,17 +78,17 @@ export class VendorsComponent implements OnInit { id: 'name', title: 'Name', placeholder: 'Filter by Name...', - type: FilterType.TEXT, + type: FilterType.TEXT }, { id: 'description', title: 'Description', placeholder: 'Filter by Description...', - type: FilterType.TEXT, - }, + type: FilterType.TEXT + } ] as FilterField[], resultsCount: 0, - appliedFilters: [] as Filter[], + appliedFilters: [] as Filter[] } as FilterConfig; this.sortConfig = { @@ -77,36 +96,36 @@ export class VendorsComponent implements OnInit { { id: 'name', title: 'Name', - sortType: 'alpha', + sortType: 'alpha' }, { id: 'description', title: 'Description', - sortType: 'alpha', - }, + sortType: 'alpha' + } ], - isAscending: true, + isAscending: true } as SortConfig; this.toolbarActionConfig = { primaryActions: [], - moreActions: [], + moreActions: [] } as ActionConfig; this.toolbarConfig = { actionConfig: this.toolbarActionConfig, filterConfig: this.filterConfig, sortConfig: this.sortConfig, - views: [], + views: [] } as ToolbarConfig; this.paginationConfig = { pageSize: 10, pageNumber: 1, - totalItems: 0, + totalItems: 0 } as PaginationConfig; - this.route.data.subscribe(data => { + this.route.data.subscribe((data) => { this.items = data['vendors']['results']; this.paginationConfig.totalItems = data['vendors']['count']; this.prepareNamespaces(); @@ -128,7 +147,7 @@ export class VendorsComponent implements OnInit { }); } else { this.filterBy = { - is_vendor: 'true', + 'is_vendor': 'true' }; } this.pageNumber = 1; @@ -208,12 +227,13 @@ export class VendorsComponent implements OnInit { this.filterBy['page_size'] = this.pageSize; this.filterBy['page'] = this.pageNumber; this.filterBy['order'] = this.sortBy; - this.namespaceService.pagedQuery(this.filterBy).subscribe(result => { - this.items = result.results as Namespace[]; - this.prepareNamespaces(); - this.filterConfig.resultsCount = result.count; - this.paginationConfig.totalItems = result.count; - this.pageLoading = false; - }); + this.namespaceService.pagedQuery(this.filterBy) + .subscribe(result => { + this.items = result.results as Namespace[]; + this.prepareNamespaces(); + this.filterConfig.resultsCount = result.count; + this.paginationConfig.totalItems = result.count; + this.pageLoading = false; + }); } } diff --git a/galaxyui/src/app/vendors/vendors.module.ts b/galaxyui/src/app/vendors/vendors.module.ts index 3908ed9fe..e9190959b 100644 --- a/galaxyui/src/app/vendors/vendors.module.ts +++ b/galaxyui/src/app/vendors/vendors.module.ts @@ -1,19 +1,20 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; -import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { ActionModule } from 'patternfly-ng/action/action.module'; -import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; -import { FilterModule } from 'patternfly-ng/filter/filter.module'; -import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; -import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; -import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { ActionModule } from 'patternfly-ng/action/action.module'; +import { EmptyStateModule } from 'patternfly-ng/empty-state/empty-state.module'; +import { ListModule } from 'patternfly-ng/list/basic-list/list.module'; +import { PaginationModule } from 'patternfly-ng/pagination/pagination.module'; +import { FilterModule } from 'patternfly-ng/filter/filter.module'; +import { ToolbarModule } from 'patternfly-ng/toolbar/toolbar.module'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; + +import { VendorsRoutingModule } from './vendors.routing.module'; +import { VendorsComponent } from './vendors.component'; +import { VendorCardComponent } from './card/vendor-card.component'; +import { PageHeaderModule } from '../page-header/page-header.module'; +import { PageLoadingModule } from '../page-loading/page-loading.module'; -import { PageHeaderModule } from '../page-header/page-header.module'; -import { PageLoadingModule } from '../page-loading/page-loading.module'; -import { VendorCardComponent } from './card/vendor-card.component'; -import { VendorsComponent } from './vendors.component'; -import { VendorsRoutingModule } from './vendors.routing.module'; @NgModule({ imports: [ @@ -27,8 +28,11 @@ import { VendorsRoutingModule } from './vendors.routing.module'; VendorsRoutingModule, PageHeaderModule, PageLoadingModule, - ActionModule, + ActionModule ], - declarations: [VendorsComponent, VendorCardComponent], + declarations: [ + VendorsComponent, + VendorCardComponent + ] }) -export class VendorsModule {} +export class VendorsModule { } diff --git a/galaxyui/src/app/vendors/vendors.resolver.service.ts b/galaxyui/src/app/vendors/vendors.resolver.service.ts index 45bb6239f..f91f78c1b 100644 --- a/galaxyui/src/app/vendors/vendors.resolver.service.ts +++ b/galaxyui/src/app/vendors/vendors.resolver.service.ts @@ -1,16 +1,27 @@ -import { Injectable } from '@angular/core'; +import { + Injectable +} from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot +} from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs/Observable'; -import { NamespaceService } from '../resources/namespaces/namespace.service'; -import { PagedResponse } from '../resources/paged-response'; +import { NamespaceService } from '../resources/namespaces/namespace.service'; +import { Namespace } from '../resources/namespaces/namespace'; +import { PagedResponse } from '../resources/paged-response'; @Injectable() export class VendorListResolver implements Resolve { - constructor(private namespaceService: NamespaceService) {} + constructor( + private namespaceService: NamespaceService, + private router: Router + ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.namespaceService.pagedQuery({ is_vendor: 'true' }); + return this.namespaceService.pagedQuery({is_vendor: 'true'}); } } diff --git a/galaxyui/src/app/vendors/vendors.routing.module.ts b/galaxyui/src/app/vendors/vendors.routing.module.ts index 473e5ab23..f3aac386f 100644 --- a/galaxyui/src/app/vendors/vendors.routing.module.ts +++ b/galaxyui/src/app/vendors/vendors.routing.module.ts @@ -1,24 +1,37 @@ -import { NgModule } from '@angular/core'; +import { + NgModule -import { RouterModule, Routes } from '@angular/router'; +} from '@angular/core'; -import { VendorListResolver } from './vendors.resolver.service'; +import { + Routes, + RouterModule +} from '@angular/router'; -import { VendorsComponent } from './vendors.component'; +import { + VendorListResolver +} from './vendors.resolver.service'; -const routes: Routes = [ - { - path: 'partners', - component: VendorsComponent, - resolve: { - vendors: VendorListResolver, - }, - }, -]; +import { VendorsComponent } from './vendors.component'; + + +const routes: Routes = [{ + path: 'partners', + component: VendorsComponent, + resolve: { + vendors: VendorListResolver + } +}]; @NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], - providers: [VendorListResolver], + imports: [ + RouterModule.forChild(routes) + ], + exports: [ + RouterModule + ], + providers: [ + VendorListResolver + ] }) -export class VendorsRoutingModule {} +export class VendorsRoutingModule { } diff --git a/galaxyui/src/environments/environment.prod.ts b/galaxyui/src/environments/environment.prod.ts index da7c84f63..3612073bc 100644 --- a/galaxyui/src/environments/environment.prod.ts +++ b/galaxyui/src/environments/environment.prod.ts @@ -1,3 +1,3 @@ export const environment = { - production: true, + production: true }; diff --git a/galaxyui/src/environments/environment.ts b/galaxyui/src/environments/environment.ts index 39fc60129..b7f639aec 100644 --- a/galaxyui/src/environments/environment.ts +++ b/galaxyui/src/environments/environment.ts @@ -4,5 +4,5 @@ // The list of which env maps to which file can be found in `.angular-cli.json`. export const environment = { - production: false, + production: false }; diff --git a/galaxyui/src/main.ts b/galaxyui/src/main.ts index 673719c2d..91ec6da5f 100644 --- a/galaxyui/src/main.ts +++ b/galaxyui/src/main.ts @@ -5,9 +5,8 @@ import { AppModule } from './app/app.module'; import { environment } from './environments/environment'; if (environment.production) { - enableProdMode(); + enableProdMode(); } -platformBrowserDynamic() - .bootstrapModule(AppModule) - .catch(err => console.log(err)); +platformBrowserDynamic().bootstrapModule(AppModule) + .catch(err => console.log(err)); diff --git a/galaxyui/src/polyfills.ts b/galaxyui/src/polyfills.ts index 9e8a11f8b..3c2e2860e 100644 --- a/galaxyui/src/polyfills.ts +++ b/galaxyui/src/polyfills.ts @@ -40,20 +40,26 @@ /** IE10 and IE11 requires the following for the Reflect API. */ // import 'core-js/es6/reflect'; + /** Evergreen browsers require these. **/ // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. import 'core-js/es7/reflect'; + /** * Required to support Web Animations `@angular/platform-browser/animations`. * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation **/ // import 'web-animations-js'; // Run `npm install --save web-animations-js`. + + /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js/dist/zone'; // Included with Angular CLI. +import 'zone.js/dist/zone'; // Included with Angular CLI. + + /*************************************************************************************************** * APPLICATION IMPORTS diff --git a/galaxyui/src/test.ts b/galaxyui/src/test.ts index 4b3f47042..16317897b 100644 --- a/galaxyui/src/test.ts +++ b/galaxyui/src/test.ts @@ -1,13 +1,19 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files -import { getTestBed } from '@angular/core/testing'; -import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; import 'zone.js/dist/zone-testing'; +import { getTestBed } from '@angular/core/testing'; +import { + BrowserDynamicTestingModule, + platformBrowserDynamicTesting +} from '@angular/platform-browser-dynamic/testing'; declare const require: any; // First, initialize the Angular testing environment. -getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); // Then we find all the tests. const context = require.context('./', true, /\.spec\.ts$/); // And load the modules. diff --git a/galaxyui/src/typings.d.ts b/galaxyui/src/typings.d.ts index 403b22fee..ef5c7bd62 100644 --- a/galaxyui/src/typings.d.ts +++ b/galaxyui/src/typings.d.ts @@ -1,5 +1,5 @@ /* SystemJS module definition */ declare var module: NodeModule; interface NodeModule { - id: string; + id: string; } diff --git a/galaxyui/tslint.json b/galaxyui/tslint.json index f4f5ca3cc..eea350d05 100644 --- a/galaxyui/tslint.json +++ b/galaxyui/tslint.json @@ -1,29 +1,21 @@ { - "extends": [ - "tslint:recommended" - ], "rulesDirectory": [ "node_modules/codelyzer" ], "rules": { - "align": false, - "array-type": false, - "arrow-parens": false, - "ban-types": false, - "jsdoc-format": false, - "max-classes-per-file": false, - "object-literal-key-quotes": false, - "object-literal-shorthand": false, - "trailing-comma": false, + "arrow-return-shorthand": true, + "callable-types": true, "class-name": true, - "no-unused-variable": true, "comment-format": [ true, "check-space" ], + "curly": true, "deprecation": { "severity": "warn" }, + "eofline": true, + "forin": true, "import-blacklist": [ true, "rxjs/Rx" @@ -34,6 +26,8 @@ "spaces", 4 ], + "interface-over-type-literal": true, + "label-position": true, "max-line-length": [ true, 140 @@ -50,6 +44,8 @@ ] } ], + "no-arg": true, + "no-bitwise": true, "no-console": [ true, "debug", @@ -58,15 +54,27 @@ "timeEnd", "trace" ], + "no-construct": true, + "no-debugger": true, + "no-duplicate-super": true, "no-empty": false, + "no-empty-interface": true, + "no-eval": true, "no-inferrable-types": [ true, "ignore-params" ], + "no-misused-new": true, "no-non-null-assertion": true, + "no-shadowed-variable": true, "no-string-literal": false, + "no-string-throw": true, "no-switch-case-fall-through": true, + "no-trailing-whitespace": true, + "no-unnecessary-initializer": true, + "no-unused-expression": true, "no-use-before-declare": true, + "no-var-keyword": true, "object-literal-sort-keys": false, "one-line": [ true, @@ -75,10 +83,12 @@ "check-else", "check-whitespace" ], + "prefer-const": true, "quotemark": [ true, "single" ], + "radix": true, "semicolon": [ true, "always" @@ -97,6 +107,7 @@ "variable-declaration": "nospace" } ], + "unified-signatures": true, "variable-name": false, "whitespace": [ true, diff --git a/galaxyui/yarn.lock b/galaxyui/yarn.lock index cca716d21..179016be2 100644 --- a/galaxyui/yarn.lock +++ b/galaxyui/yarn.lock @@ -5766,10 +5766,6 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@1.14.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.0.tgz#847c235522035fd988100f1f43cf20a7d24f9372" - pretty-error@^2.0.2: version "2.1.1" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3" diff --git a/scripts/docker/dev/start-develop.sh b/scripts/docker/dev/start-develop.sh index 94c398c02..dc226d491 100755 --- a/scripts/docker/dev/start-develop.sh +++ b/scripts/docker/dev/start-develop.sh @@ -7,6 +7,7 @@ cd /galaxy make waitenv make build/yarn +make test/jslint make build/static cd /galaxy