[BI-2630] - Improve Create Sub-Entity Pop-Up

src/components/modals/SubEntityDatasetModal.vue

@@ -45,7 +45,7 @@
       >
         <template v-slot="validations">
           <div class="message is-success">
-            <div class="message-body">
+            <div class="message-body has-text-dark">
               Prepare a dataset for repeated observations within {{ defaultObservationLevel }}.
             </div>
           </div>
@@ -69,7 +69,7 @@
                 v-model="newSubEntity.repeatedMeasures"
                 v-bind:validations="validations.repeatedMeasures"
                 v-bind:field-name="'Repeated Measures'"
-                v-bind:field-help="'Maximum expected'"
+                v-bind:field-help="'Maximum expected between 1-50'"
               />
             </div>
           </div>
@@ -116,6 +116,8 @@ export default class SubEntityDatasetModal extends Vue {
   experiment!: Trial;
   @Prop()
   defaultObservationLevel?: string;
+  @Prop()
+  existingDatasetNames!: string[];
 
   // Reactive, private (would not be reactive if declared without initial values).
   private newSubEntity: SubEntityDatasetNewRequest = new SubEntityDatasetNewRequest();
@@ -130,7 +132,7 @@ export default class SubEntityDatasetModal extends Vue {
     repeatedMeasures: {
       required,
       integer,
-      between: between(1, 50),  // Note: capped at 50 for performance considerations.
+      between: between(1, 50),  // Note: capped at 50 for performance considerations
     }
   }
 
@@ -142,6 +144,14 @@ export default class SubEntityDatasetModal extends Vue {
   }
 
   async invokeCreate(){
+    //Check if sub-entity name is already in experiment
+    let nameAlreadyInExp = this.existingDatasetNames.map(y => y.toLowerCase()).includes(this.newSubEntity.name.toLowerCase());
+    if (nameAlreadyInExp) {
+      this.$emit('show-error-notification', `A ${this.newSubEntity.name} dataset already exists in ${this.experiment.trialName}.`);
+      this.newSubEntityFormState.bus.$emit(DataFormEventBusHandler.SAVE_COMPLETE_EVENT);
+      return;
+    }
+
     try {
       // Invoke the create prop, which returns true if create succeeded.
       await this.create(this.newSubEntity)
@@ -155,4 +165,4 @@ export default class SubEntityDatasetModal extends Vue {
   }
 
 }
-</script>
+</script>

src/views/experiments-and-observations/ExperimentDetails.vue

@@ -52,6 +52,7 @@
         v-bind:trial-id="experimentUUID"
         v-bind:active="subEntityModalActive"
         v-bind:create="createSubEntityDataset"
+        v-bind:existing-dataset-names="experimentDatasetNames"
         v-on:show-error-notification="$emit('show-error-notification', $event)"
         v-on:deactivate="subEntityModalActive = false"
     />
@@ -183,6 +184,7 @@ import {SubEntityDatasetNewRequest} from "@/breeding-insight/model/SubEntityData
 import {DatasetModel} from "@/breeding-insight/model/DatasetModel";
 import ExperimentAddCollaboratorModal from "@/components/experiments/ExperimentAddCollaboratorModal.vue";
 import ExperimentCollaboratorRemovalModal from "@/components/experiments/ExperimentCollaboratorRemovalModal.vue";
+import {ProgramService} from "@/breeding-insight/service/ProgramService";
 
 @Component({
   components: {
@@ -217,6 +219,8 @@ export default class ExperimentDetails extends ProgramsBase {
   private hasObsUnits: boolean = false;
   private obsCount: number = 0;
   private collaborators: Collaborator[] = [];
+  private programDatasetNames: string[] = [];
+  private experimentDatasetNames: string[] = [];
 
   private actions: ActionMenuItem[] = [
       new ActionMenuItem('experiment-import-file', 'import-file', 'Import file', this.$ability.can('create', 'Import')),
@@ -229,6 +233,7 @@ export default class ExperimentDetails extends ProgramsBase {
   mounted() {
     this.getExperiment();
     this.getDatasetMetadata();
+    this.getProgramDatasetNames();
   }
 
   private importFile() {
@@ -325,12 +330,35 @@ export default class ExperimentDetails extends ProgramsBase {
   //   return this.experiment.additionalInfo.environmentsCount;
   // }
 
-  get datasetNameOptions(): String[] {
-    // TODO: [BI-2182] fetch and return all sub-entity names for experiments in this program, excluding the current experiment.
-    // TODO: [BI-2182] exclude top level dataset names.
-    return [];
+  //Get program entity names for sub-entity modal suggestions
+  @Watch('$route')
+  async getProgramDatasetNames() {
+    try {
+      const response = await ProgramService.getObservationLevels(this.activeProgram!.id!);
+      if (response) {
+        const [observationLevels, metadata] = response;
+        this.programDatasetNames = observationLevels.map(value => value.name!);
+        return;
+      }
+    } catch (error) {
+      this.$emit('show-error-notification', 'Unable to retrieve program entity names');
+    }
+    this.$emit('show-error-notification', 'Unable to retrieve program entity names');
+    return;
   }
 
+  //Retrieves entity names in experiment
+  @Watch('datasetMetadata')
+  async getExperimentDatasetNames() {
+    this.experimentDatasetNames = this.datasetMetadata.map(value => value.name!);
+    return;
+  }
+
+  //Retrieves program entity names minus any that already exist as entity names for the experiment
+  get datasetNameOptions(): String[] {
+    return this.programDatasetNames.filter((x) => !this.experimentDatasetNames.includes(x));
+}
+
   get experimentObservationUnit(): string | null {
     if (this.experiment && this.experiment.additionalInfo) {
       return this.experiment.additionalInfo.defaultObservationLevel;