Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(project metadata page): enable error handler (DSP-1396) #411

Merged
merged 2 commits into from Mar 20, 2021
Merged

refactor(project metadata page): enable error handler (DSP-1396) #411

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
826dfab
refactor(project metadata page): enable error handler
Mar 18, 2021
9ff920b
Merge branch 'main' into wip/DSP-1396-enable-error-handler-in-metadata
Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/app/project/board/board.component.ts
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ import {
ReadProject,
SingleProject
} from '@dasch-swiss/dsp-js';
import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
import { DspApiConnectionToken, NotificationService, Session, SessionService } from '@dasch-swiss/dsp-ui';
import { DialogComponent } from 'src/app/main/dialog/dialog.component';
import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
import { CacheService } from '../../main/cache/cache.service';
Expand Down Expand Up @@ -72,7 +72,8 @@ export class BoardComponent implements OnInit {
private _dialog: MatDialog,
private _route: ActivatedRoute,
private _titleService: Title,
private _snackBar: MatSnackBar
private _snackBar: MatSnackBar,
private _notification: NotificationService,
) {
// get the shortcode of the current project
this._route.parent.paramMap.subscribe((params: Params) => {
Expand All @@ -92,7 +93,6 @@ export class BoardComponent implements OnInit {
this.session = this._session.getSession();
// is the logged-in user system admin?
this.sysAdmin = this.session.user.sysAdmin;

}

// get project info from backend
Expand Down Expand Up @@ -164,12 +164,18 @@ export class BoardComponent implements OnInit {
this.getProjectForDataset();
},
(error: ApiResponseError) => {
// --> TODO: enable the error handler as soon as DSP-1391 is solved
// this._errorHandler.showMessage(error);
if (error.status === 404) {
// the DSP-API returns a 404 with generic message if metadata is not defined
// for the selected project. Below we update the error message.
this._notification.openSnackBar('Metadata is not defined for the selected project');
} else {
// use default error behavior
this._errorHandler.showMessage(error);
}

this.metadataLoading = false;
}
);

this.metadataLoading = false;
}

getProjectForDataset() {
Expand Down