Skip to content

Commit

Permalink
Use deisgnsafe tenant again (#217)
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanfranklin authored Feb 29, 2024
1 parent ec83ca6 commit 05e3304
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class FileBrowserComponent implements OnInit {
// wait on the currentUser, systems and projects to resolve
combineLatest([this.authService.currentUser, this.agaveSystemsService.systems, this.agaveSystemsService.projects]).subscribe(
([user, systems, projects]) => {
this.myDataSystem = systems.find((sys) => sys.id === 'frontera'); // TODO_TAPISV3 use designsafe.storage.default.
this.myDataSystem = systems.find((sys) => sys.id === 'designsafe.storage.default');
this.communityDataSystem = systems.find((sys) => sys.id === 'designsafe.storage.community');
this.publishedDataSystem = systems.find((sys) => sys.id === 'designsafe.storage.published');
this.projects = projects;
Expand All @@ -65,8 +65,7 @@ export class FileBrowserComponent implements OnInit {
const init = <RemoteFile>{
system: this.myDataSystem.id,
type: 'dir',
// path: this.currentUser.username, // TODO_TAPISV3
path: `/home1/05724/nathanf/`,
path: this.currentUser.username,
};

// TODO_TAPISV3 is this being called 3 times??
Expand Down
6 changes: 3 additions & 3 deletions angular/src/app/services/env.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class EnvService {
}

get tapisUrl(): string {
return 'https://portals.tapis.io/'; // TODO_TAPISV3 'https://designsafe.tapis.io/`
return 'https://designsafe.tapis.io/';
}

private getPortalUrl(backend: EnvironmentType): string {
Expand Down Expand Up @@ -138,8 +138,8 @@ export class EnvService {
// local devevelopers can use localhost or hazmapper.local but
// hazmapper.local is preferred as TAPIS supports it as a frame ancestor
// (i.e. it allows for point cloud iframe preview)
// TODO_TAPISV3: use hazmapper.localhost2 on designsafe tenant
this._clientId = /^localhost/.test(hostname) ? 'hazmapper.localhost' : 'TODO_FOR_hazmapper.local';
// TODO_TAPISV3: update hazmapper.local client id
this._clientId = /^localhost/.test(hostname) ? 'hazmapper.localhost2' : 'TODO_FOR_hazmapper.local';
} else if (/^hazmapper.tacc.utexas.edu/.test(hostname) && pathname.startsWith('/staging')) {
this._env = EnvironmentType.Staging;
this._apiUrl = this.getApiUrl(this.env);
Expand Down

0 comments on commit 05e3304

Please sign in to comment.