Skip to content

[BI-2806] Route Experiments using trialDbId, use trialDbId to get metadata #466

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

Open
jloux-brapi wants to merge 1 commit into
base: epic/BI-2862
Choose a base branch
from
+7 −10
Open

[BI-2806] Route Experiments using trialDbId, use trialDbId to get metadata #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/breeding-insight/service/ExperimentService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,13 @@ export class ExperimentService {
if (!trial) {
return ResultGenerator.err(new Error('Missing or invalid trial'));
}
if (!trial.externalReferences) {
return ResultGenerator.err(new Error('Trial is missing external references'));
}
// Try to get the /trials external reference.
let externalReferenceId = BrAPIUtils.getBreedingInsightId(trial.externalReferences, '/trials');
// Throw if trial is missing ExternalReferenceId.
if (!externalReferenceId) {
return ResultGenerator.err(new Error("Trial is missing external reference."));

let trialDbId = trial.trialDbId;
// Throw if trial is missing trialDbId.
if (!trialDbId) {
return ResultGenerator.err(new Error("Trial is missing a brapi dbId."));
}
return await ExperimentDAO.getDatasetMetadata(programId, externalReferenceId);
return await ExperimentDAO.getDatasetMetadata(programId, trialDbId);
}

static async getUnassignedCollaboratorsByExperiment(programId: string | undefined, experimentId: string): Promise<Result<Error, Collaborator[]>> {
Expand Down
2 changes: 1 addition & 1 deletion src/components/experiments/ExperimentsObservationsTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
v-on:search="initSearch"
>
<b-table-column label="Title" field="name" cell-class="fixed-width-wrapped" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" searchable>
<router-link v-bind:to="{name: 'experiment_dataset', params: {datasetId: getDefaultDataset(props.row.data).id, programId: activeProgram.id, experimentId: BrAPIUtils.getBreedingInsightId(props.row.data.externalReferences,'/trials')}}">
<router-link v-bind:to="{name: 'experiment_dataset', params: {datasetId: getDefaultDataset(props.row.data).id, programId: activeProgram.id, experimentId: props.row.data.trialDbId}}">
{{ props.row.data.trialName }}
</router-link>

Expand Down
Loading