diff --git a/src/app/service/service.component.html b/src/app/service/service.component.html
index fa1748939315629ca5566848bb1736ee9a1911c8..9859b46f935988770bca50d7b112f9a96717747e 100644
--- a/src/app/service/service.component.html
+++ b/src/app/service/service.component.html
@@ -1,32 +1,34 @@
-
- {{ service.name }}
-
-
- Access requested
-
-
-
+
+ {{ service.name }}
+
+
+ Access requested
+
+
+
-
-
-
-
-
- Site
- Service
- State
-
-
-
-
-
-
-
- Your credentials were never deployed to the service {{ service.name }}
-
-
-
+
+
+
+ Site
+ Service
+ State
+ Contact
+
+
+
+
+
+
+
+ Your credentials were never deployed to the service {{ service.name }}
+
+
+
diff --git a/src/app/state/state.component.css b/src/app/state/state.component.css
index 6c58f48b647e26e4e567b5bd7185b9d11c959489..765d5c8c0f4e07059f07839b3e3bc60db2fd7d21 100644
--- a/src/app/state/state.component.css
+++ b/src/app/state/state.component.css
@@ -2,3 +2,30 @@
.my-tooltip {
white-space: pre-line;
}
+
+h4 {
+ margin-bottom: 5px;
+}
+
+td {
+ vertical-align: top;
+}
+
+.mat-icon {
+ font-size: 15px;
+ height: 15px;
+ width: 15px;
+ vertical-align: initial;
+}
+
+small {
+ font-size: small;
+}
+
+.width-limit {
+ max-width: 250px;
+}
+
+.bold {
+ font-weight: bold;
+}
diff --git a/src/app/state/state.component.html b/src/app/state/state.component.html
index 5e02101316084abf5927a9dcd13c738f9dce95a6..36cc0ff35c4a3d346c07b0a8c130b606d276725a 100644
--- a/src/app/state/state.component.html
+++ b/src/app/state/state.component.html
@@ -1,72 +1,75 @@
+
-
- {{ service.site.name }}
- help
-
+ {{ service.site.name }}
+ {{ service.site.description }}
+
-
- {{ service.name }}
- help
-
+ {{ service.name }}
+ {{ service.description }}
-
+
+
call_made
warning
- call_received
- error
- error
- call_received
+ call_received
+ error
+ error
+ call_received
- {{ lang.printState(state.state) }}
+ {{ lang.printState(state.state) }}
+ {{ stateDescription }}
-
-
-
- Credentials
-
-
-
-
- Questionnaire
-
-
-
-
- Failure
-
-
-
-
- Rejected
-
-
-
-
-
-
-
-
- edit
-
+
+
+
+
+ {{ button.text }}
+
+
+
+
+
+
+
+
+ edit
+
+
+
- call_received
+ call_received
- {{ lang.printState('not_deployed') }}
+ {{ lang.printState('not_deployed') }}
+ Access to this service was never requested.
+
+
+
+
+
+
+
+ {{ service.contact_description }}
+
+
diff --git a/src/app/state/state.component.ts b/src/app/state/state.component.ts
index 83b086af51314a6bf5b334a9702f69a7c2c300d4..20b4d57b4832ff38aa515c71e16b02b4beeebf0c 100644
--- a/src/app/state/state.component.ts
+++ b/src/app/state/state.component.ts
@@ -5,7 +5,13 @@ import { Observable } from 'rxjs';
import { UserService } from '../user.service';
import { LanguageService } from '../language.service';
import { DialogService } from '../dialogues/dialog.service';
-import { Site, Service, DeploymentState } from '../types/types.module';
+import { Site, Service, DeploymentState, StateID } from '../types/types.module';
+
+interface Button {
+ text: string;
+ tooltip: string;
+ color: string;
+}
@Component({
selector: '[deployment-state-tr]',
@@ -16,9 +22,41 @@ export class StateComponent implements OnInit {
@Input() service: Service;
+ buttons: Record
= {
+ 'not_deployed' : undefined,
+ 'deployment_pending': undefined,
+ 'removal_pending': undefined,
+ 'deployed': {
+ color: 'primary',
+ text: 'View Credentials',
+ tooltip: 'View detailed information about the deployed credentials'
+ },
+ 'questionnaire': {
+ color: 'warn',
+ text: 'Submit Data',
+ tooltip: 'Submit missing data',
+ },
+ 'failed': {
+ color: 'warn',
+ text: 'Show Error',
+ tooltip: 'Show more details on the error',
+ },
+ 'rejected': {
+ color: 'warn',
+ text: 'Show Message',
+ tooltip: 'Show Message',
+ },
+ };
+
+ stateDescriptions: Record;
+
+
+ // set in subscribe
+ public button: Button | undefined = undefined;
+ public stateDescription = '';
+
public state$: Observable;
- public stateTooltip: string;
constructor(
public userService: UserService,
@@ -27,29 +65,53 @@ export class StateComponent implements OnInit {
) { }
ngOnInit() {
+ this.stateDescriptions = {
+ 'not_deployed': `Your credentials are not deployed for ${ this.service.name }.`,
+ 'deployment_pending': `Waiting for the deployment of your credentials to ${ this.service.site.name }.`,
+ 'removal_pending': `Waiting for the removal of your credentials from ${ this.service.site.name }.`,
+ 'deployed': `
+ The credentials are deployed for this service ${ this.service.name }.
+ Click "${ this.buttons['deployed'].text }" see details on your deployed ssh keys and credentials.
+ `,
+ 'questionnaire': `
+ More data is needed to deploy your credentials.
+ Please click "${ this.buttons['questionnaire'].text }" to submit the missing data.
+ `,
+ 'failed': `
+ The deployment of your credentials failed, but will be tried again.
+ Please click "${ this.buttons['failed'].text }" for more details concerning this error.
+ `,
+ 'rejected': `
+ The deployment of your credentials was rejected.
+ Please click "${ this.buttons['rejected'].text }" to show more details.
+ `,
+ };
+
this.state$ = this.userService.subscribeStateFor(this.service);
- this.stateTooltip = 'foo';
+ this.state$.subscribe(
+ (state: DeploymentState | undefined) => {
+ if (state !== undefined) {
+ this.button = this.buttons[state.state];
+ this.stateDescription = this.stateDescriptions[state.state];
+ }
+ }
+ );
}
- public tooltip(state: DeploymentState): string {
+ public buttonAction(state: DeploymentState): void {
switch (state.state) {
- case 'not_deployed':
- return `The credentials are not deployed for the service ${ this.service.name }.`;
case 'deployed':
- return `The credentials are deployed for the service ${ this.service.name }. Click to see details.`;
- case 'deployment_pending':
- return `Waiting for the deployment of the credentials to the site ${ this.service.site.name }`;
- case 'removal_pending':
- return `Waiting for the removal of the credentials from the site ${ this.service.site.name }`;
+ return this.dialog.openCredentials(this.state$);
case 'questionnaire':
- return `Site ${ this.service.site.name } needs more data to deploy the keys. Please click to submit the data.`;
+ return this.dialog.openQuestionnaire(this.state$);
case 'failed':
- return `Site ${ this.service.site.name } failed to deploy the credentials. The deployment will be retried. Click for details.`;
+ return this.dialog.openMessage(state);
case 'rejected':
- return `Site ${ this.service.site.name } rejected the deployment of the credentials. Click for details.`;
- default:
- return 'Access to this service was never requested.';
+ return this.dialog.openMessage(state);
}
}
+ public contactSupport() {
+ window.location.href = `mailto:${ this.service.contact_email }?subject=%5BFEUDAL%5D%20Help%20request%0A`;
+ }
}
diff --git a/src/app/types/types.module.ts b/src/app/types/types.module.ts
index 6cecda3adf676b1a755cb77c5f606642c4cd1904..9fa180812ae103f62125f467bb376c32c002c980 100644
--- a/src/app/types/types.module.ts
+++ b/src/app/types/types.module.ts
@@ -2,6 +2,26 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
+// STATE ENUMS
+const states = [
+ 'deployment_pending',
+ 'removal_pending',
+ 'deployed',
+ 'not_deployed',
+ 'questionnaire',
+ 'failed',
+ 'rejected',
+] as const;
+
+export type StateID = typeof states[number];
+
+const stateTargets = [
+ 'deployed',
+ 'not_deployed',
+] as const;
+
+export type StateTargetID = typeof stateTargets[number];
+
// auth stuff
export interface IdP {
id: number;
@@ -57,6 +77,8 @@ export interface Service {
site: Site;
description: string;
vos: VO[];
+ contact_email: string;
+ contact_description: string;
}
export interface JSONObject {
@@ -66,8 +88,8 @@ export interface JSONObject {
export interface CredentialState {
credential: SSHKeyRef;
is_pending: boolean;
- state: string;
- state_target: string;
+ state: StateID;
+ state_target: StateTargetID;
}
export interface DeploymentState {
@@ -81,16 +103,16 @@ export interface DeploymentState {
questionnaire: JSONObject | undefined;
service: Service;
site: Site;
- state: string;
- state_target: string;
+ state: StateID;
+ state_target: StateTargetID;
}
export interface Deployment {
id: number;
service?: Service; // only for ServiceDeployment
services?: Service[]; // only for VODeployment
- state: string;
- state_target: string;
+ state: StateID;
+ state_target: StateTargetID;
states: DeploymentState[];
vo?: VO; // only for VODeployment
}
diff --git a/src/app/user.service.ts b/src/app/user.service.ts
index e77c9e14c02e3ee1c29751ae6f9c6024d753de78..3fc86fc7f827fa2f3ffdd96fa20f3fc45197e2de 100644
--- a/src/app/user.service.ts
+++ b/src/app/user.service.ts
@@ -221,7 +221,7 @@ export class UserService {
}
private fetch(): void {
- this.http.get('/backend/api/state').subscribe(
+ this.http.get('/webpage/state').subscribe(
(state: State) => this.updateState(state),
this.handleError(false, 'Error fetching state. Try again later'),
);
@@ -270,7 +270,7 @@ export class UserService {
}
private fetchIdPInfo(): void {
- this.http.get('/backend/auth/v1/info').subscribe(
+ this.http.get('/auth/info').subscribe(
idpInfo => {
this.idpInfo.next(idpInfo);
this.idpInfo.complete();
@@ -304,27 +304,31 @@ export class UserService {
public login(idp?: IdP): void {
const redirect = (arg: IdP) => {
- window.location.href = '/?idphint=' + encodeURIComponent(arg.issuer_uri);
+ window.location.href = '/?idp=' + encodeURIComponent(arg.issuer_uri);
};
+ // was there an argument?
if (idp !== undefined) {
this.prefs.setPreferredIdP(idp);
redirect(idp);
- } else {
- this.prefs.connect().subscribe(
- prefs => {
- if (prefs.preferredIdP !== undefined) {
- redirect(prefs.preferredIdP);
- }
- }
- );
+ return;
}
+ // is the a preference?
+ this.prefs.connect().subscribe(
+ prefs => {
+ if (prefs.preferredIdP !== undefined) {
+ redirect(prefs.preferredIdP);
+ return;
+ }
+ }
+ );
+
console.log('Unable to login: No IdP');
}
public logout(): void {
- this.http.post('/backend/auth/v1/logout', undefined).subscribe(
+ this.http.post('/auth/logout', undefined).subscribe(
(state: State) => this.updateState(state),
(err: HttpErrorResponse) => {
this.updateState(undefined);
@@ -333,7 +337,7 @@ export class UserService {
}
public deleteUser() {
- return this.http.delete('/rest/user').pipe(
+ return this.http.delete('/user/user').pipe(
catchError(this.handleError(true, 'Error deleting user')),
).subscribe(
_ => {
@@ -346,7 +350,7 @@ export class UserService {
public uploadSshKey(name: string, key: string | ArrayBuffer): void {
this.http.post(
- '/rest/ssh-keys',
+ '/user/ssh-keys',
{'name': name, 'key': key},
).pipe(
catchError(this.handleError(true, 'Error changing deployment')),
@@ -362,7 +366,7 @@ export class UserService {
public removeSshKey(key: SSHKey) {
console.log('Deleting key:', key);
return this.http.delete(
- `/rest/ssh-key/${ key.id.toString() }`,
+ `/user/ssh-key/${ key.id.toString() }`,
).pipe(
catchError(this.handleError(true, 'Error changing deployment')),
).subscribe(
@@ -376,7 +380,7 @@ export class UserService {
public patchDeployment(depType: string, stateTarget: string, id: number): void {
this.http.patch(
- `/rest/deployment/${ depType }/${ id.toString() }`,
+ `/user/deployment/${ depType }/${ id.toString() }`,
{'state_target': stateTarget},
).pipe(
catchError(this.handleError(true, 'Error changing deployment')),
@@ -387,7 +391,7 @@ export class UserService {
public sentQuestionnaire(stateItemID: number, answers: JSONObject) {
return this.http.patch(
- `/rest/state/${ stateItemID }`,
+ `/user/state/${ stateItemID }`,
{'answers': answers},
).pipe(
catchError(this.handleError(true, 'Error submitting answers')),
@@ -442,7 +446,7 @@ export class UserService {
);
}
- public subscribeStateFor(service: Service): Observable {
+ public subscribeStateFor(service: Service): Observable {
return this.deploymentStates$.asObservable().pipe(
map((states: DeploymentState[]) => states.find(
(dsi: DeploymentState) => dsi.service.id === service.id,
diff --git a/src/app/vo-data/vo-data.component.html b/src/app/vo-data/vo-data.component.html
index 0cf4889625d4da3df6e1c08e8dbaef6dab03c2ca..cfa7801b4a80bba8ba77f9150b85b199da30f5a3 100644
--- a/src/app/vo-data/vo-data.component.html
+++ b/src/app/vo-data/vo-data.component.html
@@ -28,6 +28,8 @@
Site
Service
State
+ Contact
diff --git a/src/static/privacy_policy.html b/src/static/privacy_policy.html
index b1919997f73bbf6a0e8b53e4464290cadff54d16..2769c75833caa48b496461ac2375b4409ef6b55d 100644
--- a/src/static/privacy_policy.html
+++ b/src/static/privacy_policy.html
@@ -748,8 +748,8 @@
Records of your use of FEUDAL, collected for reasons of security (described in 4 above) will be deleted, at latest, 24 months after your last use of the service.
Other personal data can be deleted immediately or on request as described above.
- Service managers: hdf-admin@lists.kit.edu
- Data controller: hdf-admin@lists.kit.edu
+ Service managers: m-ops@lists.kit.edu
+ Data controller: m-privacy@lists.kit.edu
Supervisory authorities (DPAs):