Skip to content

Commit

Permalink
Use pprd.designsafe-ci.org (#291)
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanfranklin authored Dec 9, 2024
1 parent 3fb9d6e commit 734cc6d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions angular/src/app/services/env.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ export class EnvService {
return 'https://www.designsafe-ci.org';
} else if (backend === DesignSafeEnvironmentType.Next) {
return 'https://designsafeci-next.tacc.utexas.edu';
} else if (backend === DesignSafeEnvironmentType.Dev) {
return 'https://designsafeci-dev.tacc.utexas.edu';
} else if (backend === DesignSafeEnvironmentType.PPRD) {
return 'https://pprd.designsafe-ci.org';
} else {
throw new Error('Unsupported DS environment');
}
Expand Down Expand Up @@ -146,7 +146,7 @@ export class EnvService {
this._env = EnvironmentType.Staging;
this._apiUrl = this.getApiUrl(this.env);
this._taggitUrl = origin + '/taggit-staging';
this._designSafePortalUrl = this.getDesignSafePortalUrl(DesignSafeEnvironmentType.Dev);
this._designSafePortalUrl = this.getDesignSafePortalUrl(DesignSafeEnvironmentType.PPRD);
this._clientId = 'hazmapper.staging';
this._baseHref = '/staging/';
this._streetviewEnv.secrets = {
Expand All @@ -164,7 +164,7 @@ export class EnvService {
this._env = EnvironmentType.Dev;
this._apiUrl = this.getApiUrl(this.env);
this._taggitUrl = origin + '/taggit-dev';
this._designSafePortalUrl = this.getDesignSafePortalUrl(DesignSafeEnvironmentType.Dev);
this._designSafePortalUrl = this.getDesignSafePortalUrl(DesignSafeEnvironmentType.PPRD);
this._clientId = 'hazmapper.dev';
this._baseHref = '/dev/';
this._streetviewEnv.secrets = {
Expand Down
2 changes: 1 addition & 1 deletion angular/src/environments/environmentType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export enum EnvironmentType {

export enum DesignSafeEnvironmentType {
Production = 'production' /* https://www.designsafe-ci.org/ */,
Dev = 'dev' /* https://designsafeci-dev.tacc.utexas.edu/ */,
PPRD = 'pprd' /* https://pprd.designsafe-ci.org */,
Next = 'experimental' /* https://designsafeci-next.tacc.utexas.edu/ */,
Local = 'local' /* not supported but would be designsafe.dev */,
}
2 changes: 1 addition & 1 deletion react/src/hooks/environment/getLocalAppConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const getLocalAppConfiguration = (
basePath: basePath,
geoapiUrl: getGeoapiUrl(localDevelopmentConfiguration.geoapiBackend),
designsafePortalUrl: getDesignsafePortalUrl(
DesignSafePortalEnvironment.Dev
DesignSafePortalEnvironment.PPRD
),
tapisUrl: 'https://designsafe.tapis.io',
mapillary: mapillaryConfig,
Expand Down
4 changes: 2 additions & 2 deletions react/src/hooks/environment/useAppConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const useAppConfiguration = (): AppConfiguration => {
basePath: basePath,
geoapiUrl: getGeoapiUrl(GeoapiBackendEnvironment.Staging),
designsafePortalUrl: getDesignsafePortalUrl(
DesignSafePortalEnvironment.Dev
DesignSafePortalEnvironment.PPRD
),
tapisUrl: 'https://designsafe.tapis.io',
mapillary: mapillaryConfig,
Expand All @@ -69,7 +69,7 @@ export const useAppConfiguration = (): AppConfiguration => {
basePath: basePath,
geoapiUrl: getGeoapiUrl(GeoapiBackendEnvironment.Dev),
designsafePortalUrl: getDesignsafePortalUrl(
DesignSafePortalEnvironment.Dev
DesignSafePortalEnvironment.PPRD
),
tapisUrl: 'https://designsafe.tapis.io',
mapillary: mapillaryConfig,
Expand Down
4 changes: 2 additions & 2 deletions react/src/hooks/environment/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export function getDesignsafePortalUrl(
return 'https://www.designsafe-ci.org';
} else if (backend === DesignSafePortalEnvironment.Next) {
return 'https://designsafeci-next.tacc.utexas.edu';
} else if (backend === DesignSafePortalEnvironment.Dev) {
return 'https://designsafeci-dev.tacc.utexas.edu';
} else if (backend === DesignSafePortalEnvironment.PPRD) {
return 'https://pprd.designsafe-ci.org';
} else {
throw new Error('Unsupported DS environment');
}
Expand Down
2 changes: 1 addition & 1 deletion react/src/types/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export enum GeoapiBackendEnvironment {
*/
export enum DesignSafePortalEnvironment {
Production = 'production' /* https://www.designsafe-ci.org/ */,
Dev = 'dev' /* https://designsafeci-dev.tacc.utexas.edu/ This dev is comparable to Geoapi's staging */,
PPRD = 'PPRD' /* https://pprd.designsafe-ci.org; This is comparable to Geoapi's staging. */,
Next = 'experimental' /* https://designsafeci-next.tacc.utexas.edu/ */,
Local = 'local' /* not supported but would be designsafe.dev */,
}
Expand Down

0 comments on commit 734cc6d

Please sign in to comment.