Merge pull request #1092 from equilobe/311-fix-the-ui-in-hippo

Fix the UI in hippo

src/Web/ClientApp/src/app/_services/session.service.ts

@@ -1,4 +1,4 @@
-import { AccountService, TokenInfo } from 'src/app/core/api/v1';
+import { AuthTokensService, TokenInfo } from 'src/app/core/api/v1';
 import { BehaviorSubject, Observable, map } from 'rxjs';
 import { Injectable } from '@angular/core';
 
@@ -9,7 +9,7 @@ export class SessionService {
     tokenSubject$: BehaviorSubject<TokenInfo>;
     token$: Observable<TokenInfo>;
 
-    constructor(private readonly accountService: AccountService) {
+    constructor(private readonly authTokensService: AuthTokensService) {
         this.tokenSubject$ = new BehaviorSubject<TokenInfo>(
             JSON.parse(localStorage.getItem('token') || '{}')
         );
@@ -18,8 +18,8 @@ export class SessionService {
 
     // log into the system with the provided credentials
     login(username: string, password: string) {
-        return this.accountService
-            .apiAccountCreatetokenPost({ userName: username, password })
+        return this.authTokensService
+            .apiAuthTokensPost({ userName: username, password })
             .pipe(
                 map((tokenInfo) => {
                     localStorage.setItem('token', JSON.stringify(tokenInfo));

src/Web/ClientApp/src/app/components/account/register/register.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { faLock, faUser } from '@fortawesome/free-solid-svg-icons';
 
-import { AccountService } from 'src/app/core/api/v1';
+import { AccountsService } from 'src/app/core/api/v1';
 import { MustMatch } from 'src/app/_helpers/must-match.validator';
 import { Router } from '@angular/router';
 
@@ -20,7 +20,7 @@ export class RegisterComponent implements OnInit {
     faLock = faLock;
 
     constructor(
-        private readonly accountService: AccountService,
+        private readonly accountsService: AccountsService,
         private readonly router: Router
     ) {}
 
@@ -53,8 +53,8 @@ export class RegisterComponent implements OnInit {
         }
 
         this.loading = true;
-        this.accountService
-            .apiAccountPost({
+        this.accountsService
+            .apiAccountsPost({
                 userName: this.f['username'].value,
                 password: this.f['password'].value,
             })

src/Web/ClientApp/src/app/components/application/list/list.component.ts

@@ -1,10 +1,10 @@
 import {
     AppChannelListItem,
     AppItem,
-    AppService,
+    AppsService,
     ChannelJobStatusItem,
+    ChannelStatusesService,
     JobStatus,
-    JobStatusService,
 } from 'src/app/core/api/v1';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { faCircle, faPlus } from '@fortawesome/free-solid-svg-icons';
@@ -27,8 +27,8 @@ export class ListComponent implements OnInit, OnDestroy {
     timeInterval = 5000;
 
     constructor(
-        private readonly appService: AppService,
-        private readonly jobStatusService: JobStatusService
+        private readonly appsService: AppsService,
+        private readonly channelStatusesService: ChannelStatusesService
     ) {}
 
     ngOnInit(): void {
@@ -41,8 +41,8 @@ export class ListComponent implements OnInit, OnDestroy {
     }
 
     getJobStatus(): void {
-        this.jobStatusService
-            .apiJobstatusGet()
+        this.channelStatusesService
+            .apiChannelStatusesGet()
             .subscribe((res) => (this.statuses = res.items));
     }
 
@@ -84,7 +84,7 @@ export class ListComponent implements OnInit, OnDestroy {
     }
 
     refreshData() {
-        this.appService.apiAppGet().subscribe({
+        this.appsService.apiAppsGet().subscribe({
             next: (vm) => (this.apps = vm.items),
             error: (error) => {
                 console.log(error);

src/Web/ClientApp/src/app/components/application/new/new.component.ts

@@ -1,9 +1,9 @@
 import { ActivatedRoute, Router } from '@angular/router';
 import {
-    AppService,
+    AppsService,
     ChannelRevisionSelectionStrategy,
-    ChannelService,
-    StorageService,
+    ChannelsService,
+    StoragesService,
 } from 'src/app/core/api/v1';
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
@@ -38,9 +38,9 @@ export class NewComponent implements OnInit {
     storageQueryChanged = new Subject<string>();
 
     constructor(
-        private readonly appService: AppService,
-        private readonly channelService: ChannelService,
-        private readonly storageService: StorageService,
+        private readonly appsService: AppsService,
+        private readonly channelsService: ChannelsService,
+        private readonly storagesService: StoragesService,
         private route: ActivatedRoute,
         private readonly router: Router
     ) {}
@@ -84,7 +84,7 @@ export class NewComponent implements OnInit {
     }
 
     queryStorages(newQuery: string) {
-        return this.storageService.apiStorageGet(newQuery, 0, 5);
+        return this.storagesService.apiStoragesGet(newQuery, 0, 5);
     }
 
     selectStorage(storage: string) {
@@ -106,15 +106,15 @@ export class NewComponent implements OnInit {
         }
 
         this.loading = true;
-        this.appService
-            .apiAppPost({
+        this.appsService
+            .apiAppsPost({
                 name: this.f['name'].value,
                 storageId: this.f['storageId'].value,
             })
             .subscribe({
                 next: (appId) => {
-                    this.channelService
-                        .apiChannelPost({
+                    this.channelsService
+                        .apiChannelsPost({
                             appId: appId,
                             name: 'Production',
                             revisionSelectionStrategy:

src/Web/ClientApp/src/app/components/application/settings/settings.component.ts

@@ -1,4 +1,4 @@
-import { AppService, ChannelService } from 'src/app/core/api/v1';
+import { AppsService, ChannelsService } from 'src/app/core/api/v1';
 import { Component, Input, OnInit } from '@angular/core';
 import { faEdit, faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
 
@@ -28,16 +28,16 @@ export class SettingsComponent implements OnInit {
 
     constructor(
         private router: Router,
-        private readonly appService: AppService,
-        private readonly channelService: ChannelService
+        private readonly appsService: AppsService,
+        private readonly channelsService: ChannelsService
     ) {}
 
     ngOnInit(): void {
         this.editAppName = this.channel.appSummary.name;
     }
 
     deleteApp(id: string) {
-        this.appService.apiAppIdDelete(id).subscribe({
+        this.appsService.apiAppsIdDelete(id).subscribe({
             next: () => this.router.navigate(['/']),
             error: (error) => {
                 console.log(error);
@@ -47,8 +47,8 @@ export class SettingsComponent implements OnInit {
 
     editAppInfo() {
         if (this.editAppName !== this.channel.appSummary.name) {
-            this.appService
-                .apiAppIdPut(this.channel.appSummary.id, {
+            this.appsService
+                .apiAppsIdPut(this.channel.appSummary.id, {
                     id: this.channel.appSummary.id,
                     name: this.editAppName,
                 })
@@ -81,7 +81,7 @@ export class SettingsComponent implements OnInit {
 
     deleteChannel(channelId: string) {
         if (this.channel.appSummary.channels.length > 1) {
-            this.channelService.apiChannelIdDelete(channelId).subscribe({
+            this.channelsService.apiChannelsIdDelete(channelId).subscribe({
                 next: () => {
                     this.channel.appSummary.channels =
                         this.channel.appSummary.channels.filter(
@@ -112,17 +112,18 @@ export class SettingsComponent implements OnInit {
 
     editChannelInfo(channel: any) {
         if (this.editChannelName !== this.channel.name) {
-            this.channelService.apiChannelIdGet(channel.id).subscribe({
-                next: (channelDetails) => {
-                    this.channelService
-                        .apiChannelIdPut(channel.id, {
-                            id: channelDetails.id,
+            this.channelsService.apiChannelsIdGet(channel.id).subscribe({
+                next: (channelsDetails) => {
+                    this.channelsService
+                        .apiChannelsIdPut(channel.id, {
+                            id: channelsDetails.id,
                             name: this.editChannelName,
                             revisionSelectionStrategy:
-                                channelDetails.revisionSelectionStrategy,
-                            rangeRule: channelDetails.rangeRule,
-                            domain: channelDetails.domain,
-                            activeRevisionId: channelDetails.activeRevision?.id,
+                                channelsDetails.revisionSelectionStrategy,
+                            rangeRule: channelsDetails.rangeRule,
+                            domain: channelsDetails.domain,
+                            activeRevisionId:
+                                channelsDetails.activeRevision?.id,
                         })
                         .subscribe({
                             next: () => {

src/Web/ClientApp/src/app/components/channel/channel.component.ts

@@ -2,7 +2,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import {
     AppChannelListItem,
     ChannelItem,
-    ChannelService,
+    ChannelsService,
 } from 'src/app/core/api/v1';
 import { ApplicationTabs, ComponentTypes } from 'src/app/_helpers/constants';
 import { Component, OnInit } from '@angular/core';
@@ -33,7 +33,7 @@ export class ChannelComponent implements OnInit {
     constructor(
         private route: ActivatedRoute,
         private router: Router,
-        private readonly channelService: ChannelService
+        private readonly channelsService: ChannelsService
     ) {}
 
     ngOnInit(): void {
@@ -52,8 +52,8 @@ export class ChannelComponent implements OnInit {
     }
 
     refreshData() {
-        this.channelService
-            .apiChannelIdGet(this.channelId)
+        this.channelsService
+            .apiChannelsIdGet(this.channelId)
             .subscribe((channel) => {
                 !channel
                     ? this.router.navigate(['/404'])

src/Web/ClientApp/src/app/components/channel/logs/logs.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnChanges } from '@angular/core';
-import { ChannelService } from 'src/app/core/api/v1';
+import { ChannelsService } from 'src/app/core/api/v1';
 
 @Component({
     selector: 'app-logs',
@@ -13,7 +13,7 @@ export class LogsComponent implements OnChanges {
     logs: Array<string> = [];
     loading = false;
 
-    constructor(private readonly channelService: ChannelService) {}
+    constructor(private readonly channelsService: ChannelsService) {}
 
     ngOnChanges(): void {
         this.refreshData();
@@ -22,7 +22,7 @@ export class LogsComponent implements OnChanges {
     refreshData(): void {
         this.loading = true;
 
-        this.channelService.apiChannelLogsIdGet(this.channelId).subscribe({
+        this.channelsService.apiChannelsIdLogsGet(this.channelId).subscribe({
             next: (vm) => {
                 this.logs = vm.logs;
                 this.loading = false;

src/Web/ClientApp/src/app/components/channel/new/new.component.ts

@@ -1,7 +1,7 @@
 import { ActivatedRoute, Router } from '@angular/router';
 import {
     ChannelRevisionSelectionStrategy,
-    ChannelService,
+    ChannelsService,
 } from 'src/app/core/api/v1';
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
@@ -26,7 +26,7 @@ export class NewComponent implements OnInit {
     created: EventEmitter<object> = new EventEmitter<object>();
 
     constructor(
-        private readonly channelService: ChannelService,
+        private readonly channelsService: ChannelsService,
         private route: ActivatedRoute,
         private readonly router: Router
     ) {}
@@ -60,8 +60,8 @@ export class NewComponent implements OnInit {
         }
 
         this.loading = true;
-        this.channelService
-            .apiChannelPost({
+        this.channelsService
+            .apiChannelsPost({
                 appId: this.appId,
                 name: this.f['name'].value,
                 revisionSelectionStrategy:

src/Web/ClientApp/src/app/components/channel/overview/overview.component.ts

@@ -1,8 +1,8 @@
 import {
     ChannelItem,
-    ChannelService,
+    ChannelStatusesService,
+    ChannelsService,
     JobStatus,
-    JobStatusService,
     RevisionItem,
 } from 'src/app/core/api/v1';
 import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
@@ -38,8 +38,8 @@ export class OverviewComponent implements OnChanges, OnInit, OnDestroy {
     timeInterval = 5000;
 
     constructor(
-        private readonly channelService: ChannelService,
-        private readonly jobStatusService: JobStatusService,
+        private readonly channelsService: ChannelsService,
+        private readonly channelStatusesService: ChannelStatusesService,
         private router: Router
     ) {
         TimeAgo.addDefaultLocale(en);
@@ -63,9 +63,9 @@ export class OverviewComponent implements OnChanges, OnInit, OnDestroy {
     }
 
     getJobStatus(): void {
-        this.jobStatusService
-            .apiJobstatusChannelIdGet(this.channelId)
-            .subscribe((res) => (this.channelStatus = res.status));
+        this.channelStatusesService
+            .apiChannelStatusesGet(undefined, undefined, this.channelId)
+            .subscribe((res) => (this.channelStatus = res.items[0].status));
     }
 
     getStatusColor(status: JobStatus | undefined) {
@@ -85,7 +85,7 @@ export class OverviewComponent implements OnChanges, OnInit, OnDestroy {
 
     refreshData() {
         this.loading = true;
-        this.channelService.apiChannelIdGet(this.channelId).subscribe({
+        this.channelsService.apiChannelsIdGet(this.channelId).subscribe({
             next: (channel) => {
                 !channel
                     ? this.router.navigate(['/404'])

src/Web/ClientApp/src/app/components/environment-variable/list/list.component.ts

@@ -1,4 +1,4 @@
-import { ChannelService, EnvironmentVariableItem } from 'src/app/core/api/v1';
+import { ChannelsService, EnvironmentVariableItem } from 'src/app/core/api/v1';
 import {
     Component,
     EventEmitter,
@@ -35,7 +35,7 @@ export class ListComponent implements OnChanges {
     faTrash = faTrash;
     faSave = faSave;
 
-    constructor(private readonly channelService: ChannelService) {}
+    constructor(private readonly channelsService: ChannelsService) {}
 
     ngOnChanges(changes: { [propName: string]: SimpleChange }): void {
         if (
@@ -90,8 +90,8 @@ export class ListComponent implements OnChanges {
             return;
         }
         console.log(this.envvars);
-        this.channelService
-            .apiChannelIdPatch(this.channelId, {
+        this.channelsService
+            .apiChannelsIdPatch(this.channelId, {
                 environmentVariables: this.envvars,
             })
             .subscribe({