Merge pull request #5975 from deNBI/fix/wiki_links

Fix/wiki links

src/app/virtualmachines/vmdetail/vmdetail.component.html

@@ -39,7 +39,7 @@
 							If necessary, do not forget to back up important data. Please save the data on a suitable medium. At best,
 							save the data offline. You can use volumes, but these are subject to the usual risk of cloud services. You
 							can learn more about the use of volumes
-							<a href="{{ WIKI_VOLUMES_LINK }}/" rel="noopener noreferrer" target="_blank">here</a>.
+							<a href="{{ WIKI_VOLUME_OVERVIEW }}/" rel="noopener noreferrer" target="_blank">here</a>.
 							<br />
 							<strong>We are not liable for the loss of data due to faulty machines or volumes.</strong>
 						</p>

src/app/virtualmachines/vmdetail/vmdetail.component.ts

@@ -30,7 +30,6 @@ import {
 	WIKI_PERSISTENT_TERMINAL_LINK,
 	WIKI_RSTUDIO_LINK,
 	WIKI_VOLUME_OVERVIEW,
-	WIKI_VOLUMES_LINK,
 } from '../../../links/links';
 import { Volume } from '../volumes/volume';
 import { VolumeStates } from '../volumes/volume_states';
@@ -90,7 +89,6 @@ export class VmDetailComponent extends AbstractBaseClass implements OnInit {
 	WIKI_RSTUDIO_LINK: string = WIKI_RSTUDIO_LINK;
 	WIKI_GUACAMOLE_LINK: string = WIKI_GUACAMOLE_LINK;
 	WIKI_VOLUME_OVERVIEW: string = WIKI_VOLUME_OVERVIEW;
-	WIKI_VOLUMES_LINK: string = WIKI_VOLUMES_LINK;
 	WIKI_CREATE_SNAPSHOT_LINK: string = WIKI_CREATE_SNAPSHOT_LINK;
 	WIKI_PERSISTENT_TERMINAL_LINK: string = WIKI_PERSISTENT_TERMINAL_LINK;
 	SNAPSHOT_MAX_RAM: number = SnapshotModel.MAX_RAM;

src/app/virtualmachines/workshop/workshop-overview/workshop-overview.component.html

@@ -321,9 +321,6 @@
 						timeframes are displayed using the "Central European Time". The date you enter is
 						<strong> dependent on the timezone of your browser </strong>. Please enter the time slots day by day, to be
 						more precise!
-						<br />
-						See more on timeframes
-						<a [href]="WIKI_WORKSHOP_TIMEFRAMES" target="_blank" rel="noopener noreferrer">here</a>.
 					</div>
 					<h6 class="card-title">Existing timeframes</h6>
 					<table class="table" *ngIf="workshopTimeFrames.length > 0">
@@ -340,8 +337,8 @@ <h6 class="card-title">Existing timeframes</h6>
 						<tbody>
 							<tr *ngFor="let wstimeframe of this.workshopTimeFrames; let i = index">
 								<th scope="row">{{ i + 1 }}</th>
-								<td>{{ wstimeframe.start_time | date : 'dd/MM/yy HH:mm' : 'de' }}</td>
-								<td>{{ wstimeframe.end_time | date : 'dd/MM/yy HH:mm' : 'de' }}</td>
+								<td>{{ wstimeframe.start_time | date: 'dd/MM/yy HH:mm' : 'de' }}</td>
+								<td>{{ wstimeframe.end_time | date: 'dd/MM/yy HH:mm' : 'de' }}</td>
 								<td>{{ wstimeframe.workshop?.longname }}</td>
 								<td>{{ wstimeframe.description }}</td>
 								<td>
@@ -722,13 +719,13 @@ <h4 class="modal-title">Confirm interfering timeslot</h4>
 						<tbody>
 							<tr>
 								<th scope="row"></th>
-								<td>{{ newWorkShopTimeFrame.start_time | date : 'dd/MM/yy HH:mm' : 'de' }}</td>
-								<td>{{ newWorkShopTimeFrame.end_time | date : 'dd/MM/yy HH:mm' : 'de' }}</td>
+								<td>{{ newWorkShopTimeFrame.start_time | date: 'dd/MM/yy HH:mm' : 'de' }}</td>
+								<td>{{ newWorkShopTimeFrame.end_time | date: 'dd/MM/yy HH:mm' : 'de' }}</td>
 								<td>{{ newWorkShopTimeFrame.workshop?.longname }}</td>
 								<td>
 									{{
 										newWorkShopTimeFrame.description.length > 12
-											? (newWorkShopTimeFrame.description | slice : 0 : 12) + '...'
+											? (newWorkShopTimeFrame.description | slice: 0 : 12) + '...'
 											: newWorkShopTimeFrame.description
 									}}
 								</td>
@@ -747,13 +744,13 @@ <h4 class="modal-title">Confirm interfering timeslot</h4>
 						<tbody>
 							<tr *ngFor="let wstimeframe of this.workshopTimeFrames; let i = index">
 								<th scope="row">{{ i + 1 }}</th>
-								<td>{{ wstimeframe.start_time | date : 'dd/MM/yy HH:mm' : 'de' }}</td>
-								<td>{{ wstimeframe.end_time | date : 'dd/MM/yy HH:mm' : 'de' }}</td>
+								<td>{{ wstimeframe.start_time | date: 'dd/MM/yy HH:mm' : 'de' }}</td>
+								<td>{{ wstimeframe.end_time | date: 'dd/MM/yy HH:mm' : 'de' }}</td>
 								<td>{{ wstimeframe.workshop?.longname }}</td>
 								<td>
 									{{
 										wstimeframe.description.length > 12
-											? (wstimeframe.description | slice : 0 : 12) + '...'
+											? (wstimeframe.description | slice: 0 : 12) + '...'
 											: wstimeframe.description
 									}}
 								</td>

src/app/virtualmachines/workshop/workshop-overview/workshop-overview.component.ts

@@ -8,12 +8,7 @@ import { UrlData } from '../workshop-urlinfo.model';
 import { WorkshopService } from '../../../api-connector/workshop.service';
 import { ProjectMember } from '../../../projectmanagement/project_member.model';
 import { WorkshopVM } from '../workshop-vm.model';
-import {
-	WIKI_WORKSHOPS,
-	CLOUD_PORTAL_SUPPORT_MAIL,
-	LIFESCIENCE_HOSTEL_SIGNUP,
-	WIKI_WORKSHOP_TIMEFRAMES,
-} from '../../../../links/links';
+import { WIKI_WORKSHOPS, CLOUD_PORTAL_SUPPORT_MAIL, LIFESCIENCE_HOSTEL_SIGNUP } from '../../../../links/links';
 import { WorkshopTimeFrame } from '../workshopTimeFrame.model';
 
 interface MemberVm {
@@ -35,7 +30,6 @@ export class WorkshopOverviewComponent implements OnInit, OnDestroy {
 	WIKI_WORKSHOPS: string = WIKI_WORKSHOPS;
 	LIFESCIENCE_HOSTEL_SIGNUP: string = LIFESCIENCE_HOSTEL_SIGNUP;
 	CLOUD_PORTAL_SUPPORT_MAIL: string = CLOUD_PORTAL_SUPPORT_MAIL;
-	WIKI_WORKSHOP_TIMEFRAMES: string = WIKI_WORKSHOP_TIMEFRAMES;
 	subscription: Subscription = new Subscription();
 	resend_info: boolean = false;
 	sending_mails = false;
@@ -69,7 +63,10 @@ export class WorkshopOverviewComponent implements OnInit, OnDestroy {
 
 	@ViewChild('creationStatusModal') creationStatusModal: any;
 
-	constructor(private workshopService: WorkshopService, private groupService: GroupService) {
+	constructor(
+		private workshopService: WorkshopService,
+		private groupService: GroupService,
+	) {
 		// eslint-disable-next-line no-empty-function
 	}
 

src/environments/environment.custom.ts

@@ -4,6 +4,8 @@ const NEW_SIMPLE_VM: string = window['env']['NEW_SIMPLE_VM'] || 'https://simplev
 
 export const environment: any = {
 	WIKI_PRE: `https://${API_HOST}/wiki/`,
+	SIMPLEVM_WIKI_PRE: `https://${NEW_SIMPLE_VM}/wiki/`,
+	NEW_SVM_PORTAL_LINK: `${NEW_SIMPLE_VM}/portal/webapp/`,
 	vo: window['env']['VO'] || 3335,
 	voName: VO_NAME,
 	production: window['env']['PRODUCTION'] === 'true' || false,
@@ -16,6 +18,5 @@ export const environment: any = {
 	voRegistrationLink: `https://signup.aai.lifescience-ri.eu/fed/registrar/?vo=elixir&targetnew=https://signup.aai.lifescience-ri.eu/fed/registrar/?vo=${VO_NAME}`,
 	login: `https://${API_HOST}/portal/api/v0/loggedUser/`,
 	webapp: `https://${API_HOST}/portal/webapp/`,
-	NEW_SVM_PORTAL_LINK: `${NEW_SIMPLE_VM}/portal/webapp/`,
 	matomoServer: '//cloud.denbi.de/matomo/',
 };

src/environments/environment.ts

@@ -4,9 +4,11 @@
 // The list of which env maps to which file can be found in `angular-cli.json`.
 
 const VO_NAME: string = window['env']['VO_NAME'] || 'denbi-dev';
+const NEW_SIMPLE_VM: string = window['env']['NEW_SIMPLE_VM'] || 'https://simplevm.denbi.de';
 
 export const environment: any = {
 	WIKI_PRE: 'https://portal-dev.denbi.de/wiki/',
+	SIMPLEVM_WIKI_PRE: `https://${NEW_SIMPLE_VM}/wiki/`,
 	NEW_SVM_PORTAL_LINK: 'http://localhost:4200/#/',
 	production: false,
 	vo: 3334,

src/links/links.ts

@@ -1,19 +1,19 @@
 import { environment } from '../environments/environment';
 
-export const WIKI_SNAPSHOTS: string = `${environment.WIKI_PRE}simple_vm/snapshots/`;
+export const WIKI_SNAPSHOTS: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/snapshots/`;
 export const WIKI: string = `${environment.WIKI_PRE}`;
 export const WIKI_GENERATE_KEYS: string = `${environment.WIKI_PRE}quickstart/#generate-ssh-keys`;
 export const WIKI_NEWS_MANAGEMENT: string = `${environment.WIKI_PRE}cloud_admin/#news-management`;
-export const WIKI_SIMPLEVM_CUSTOMISATION: string = `${environment.WIKI_PRE}simple_vm/customization/`;
-export const WIKI_EXTEND_VOLUME: string = `${environment.WIKI_PRE}simple_vm/volumes/#extend-a-volume`;
-export const WIKI_VOLUME_OVERVIEW: string = `${environment.WIKI_PRE}simple_vm/volumes/`;
-export const WIKI_RESENV_LINK: string = `${environment.WIKI_PRE}simple_vm/customization/#research-environments`;
-export const WIKI_RSTUDIO_LINK: string = `${environment.WIKI_PRE}simple_vm/customization/#rstudio`;
-export const WIKI_JUPYTERLAB_LINK: string = `${environment.WIKI_PRE}simple_vm/customization/#jupyterlab`;
-export const WIKI_GUACAMOLE_LINK: string = `${environment.WIKI_PRE}simple_vm/customization/#apache-guacamole`;
-export const WIKI_NEW_INSTANCE_LINK: string = `${environment.WIKI_PRE}simple_vm/new_instance/`;
-export const WIKI_INSTANCE_OVERVIEW_LINK: string = `${environment.WIKI_PRE}simple_vm/instance_overview/`;
-export const WIKI_INSTANCE_DETAIL_LINK: string = `${environment.WIKI_PRE}simple_vm/instance_detail/`;
+export const WIKI_SIMPLEVM_CUSTOMISATION: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/customization/`;
+export const WIKI_EXTEND_VOLUME: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/volumes/#extend-a-volume`;
+export const WIKI_VOLUME_OVERVIEW: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/volumes/`;
+export const WIKI_RESENV_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/customization/#research-environments`;
+export const WIKI_RSTUDIO_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/customization/#rstudio`;
+export const WIKI_JUPYTERLAB_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/customization/#jupyterlab`;
+export const WIKI_GUACAMOLE_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/customization/#apache-guacamole`;
+export const WIKI_NEW_INSTANCE_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/create_instance/`;
+export const WIKI_INSTANCE_OVERVIEW_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/instance_overview/`;
+export const WIKI_INSTANCE_DETAIL_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/instance_detail/`;
 export const WIKI_LINK_ACCOUNTS: string = `${environment.WIKI_PRE}portal/user_information/#link-accounts-to-elixir`;
 export const WIKI_CLOUD_TERMS_LINK: string = `${environment.WIKI_PRE}portal/allocation/#terms`;
 export const LIFESCIENCE_LINKING_ACCOUNTS: string = 'https://profile.aai.lifescience-ri.eu/profile/identities';
@@ -24,16 +24,13 @@ export const WIKI_PUBLICATIONS: string = `${environment.WIKI_PRE}citation_and_pu
 export const WIKI_MEMBER_MANAGEMENT: string = `${environment.WIKI_PRE}portal/project_overview/#member-management`;
 export const WIKI_FAQ: string = `${environment.WIKI_PRE}FAQ/`;
 export const WIKI_MOTD: string = `${environment.WIKI_PRE}cloud_admin/news_management/#message-of-the-day`;
-export const WIKI_WORKSHOPS: string = `${environment.WIKI_PRE}simple_vm/workshop/`;
-export const WIKI_CREATE_SNAPSHOT_LINK: string = `${environment.WIKI_PRE}simple_vm/snapshots/#create-snapshot`;
+export const WIKI_WORKSHOPS: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/workshop/`;
+export const WIKI_CREATE_SNAPSHOT_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/snapshots/#create-a-snapshot`;
 export const SCALE_SCRIPT_LINK: string =	'https://raw.githubusercontent.com/deNBI/user_scripts/master/bibigrid/scaling.py';
-export const WIKI_MOUNT_VOLUME: string = `${environment.WIKI_PRE}simple_vm/volumes/#mount-a-volume`;
-export const WIKI_VOLUMES_LINK: string = `${environment.WIKI_PRE}simple_vm/volumes/`;
+export const WIKI_MOUNT_VOLUME: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/volumes/#mount-a-volume`;
 export const WIKI_MOSH_LINK: string = `${environment.WIKI_PRE}Tutorials/Mosh/`;
-export const WIKI_WORKSHOP_TIMEFRAMES: string = `${environment.WIKI_PRE}simple_vm/workshop/#workshop-timeframes`;
-export const WIKI_EPHEMERAL_LINK: string = `${environment.WIKI_PRE}simple_vm/new_instance/#information-for-ephemeral-flavors`;
-export const WIKI_GROUP_INVITATIONS: string = `${environment.WIKI_PRE}simple_vm/project_overview/#inviting-members`;
-export const SCALING_UP_WIKI: string = `${environment.WIKI_PRE}simple_vm/Cluster/cluster_overview/#3-scale-up`;
+export const WIKI_EPHEMERAL_LINK: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/create_instance/#about-ephemeral-flavors`;
+export const SCALING_UP_WIKI: string = `${environment.SIMPLEVM_WIKI_PRE}simple_vm/Cluster/cluster_overview/#scale-up-your-cluster`;
 export const CREDITS_WIKI: string = `${environment.WIKI_PRE}portal/credits/`;
 export const WIKI_PERSONAL_DATA: string = `${environment.WIKI_PRE}portal/personal_data`;
 export const SURVEY_LINK: string = 'https://cloud.denbi.de/survey/index.php/252136?lang=en';
@@ -81,12 +78,10 @@ export const WIKI_LINKS: string[] = [
 	WIKI_FAQ,
 	WIKI_MOTD,
 	WIKI_CREATE_SNAPSHOT_LINK,
-	WIKI_VOLUMES_LINK,
 	WIKI_EPHEMERAL_LINK,
 	WIKI_MOSH_LINK,
 	WIKI_PERSONAL_DATA,
 	WIKI_SVM_MIGRATION_LINK,
-	WIKI_WORKSHOP_TIMEFRAMES,
 ];
 
 export const LANDING_PAGE_LINKS: string[] = [