Commit 08f65323 authored by Joel Collins's avatar Joel Collins
Browse files

Fixed onError propagation

parent 213dec3e

openflexure_microscope/api/static/src/components/genericComponents/taskSubmitter.vue

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ export default { 
            if (!error) {

              error = Error("Unknown error");

            }



            this.$emit("error", error);

            this.$emit("finished");

          })

openflexure_microscope/api/static/src/components/tabContentComponents/captureComponents/paneCapture.vue

+1 −8
Original line number Diff line number Diff line
@@ -248,9 +248,8 @@ 
        :submit-data="scanPayload"

        :submit-label="'Start Scan'"

        :button-primary="true"

        @submit="onScanSubmit"

        @response="onScanResponse"

        @error="onScanError"

        @error="modalError"

      >

      </taskSubmitter>

    </div>
@@ -433,14 +432,8 @@ export default { 
        });

    },



    onScanSubmit: function() {},



    onScanResponse: function() {

      this.modalNotify("Finished scan.");

    },



    onScanError: function(error) {

      this.modalError(error);

    }

  }

};

openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/scanCard.vue

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ export default { 


    deleteAll: function() {

      axios.all(this.allURLs.map(l => axios.delete(l))).then(() => {

        console.log("Delete finished")

        // Emit signal to update capture list

        this.$root.$emit("globalUpdateCaptures");

      });

openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/zipDownloader.vue

+1 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        :submit-label="'Create ZIP'"

        :submit-data="captureIds"

        @response="onResponse"

        @error="onError"

        @error="modalError"

      >

      </taskSubmitter>

    </div>
@@ -163,10 +163,6 @@ export default { 
      this.lastSessionId = response.output.id;

      this.downloadUrl = `${this.zipGetterUri}/${this.lastSessionId}`;

      this.downloadReady = true;

    },



    onError: function(error) {

      this.modalError(error); // Let mixin handle error

    }

  }

};

openflexure_microscope/api/static/src/components/tabContentComponents/navigateComponents/paneNavigate.vue

+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
                  :submit-on-event="'globalFastAutofocusEvent'"

                  @taskStarted="isAutofocusing = 1"

                  @finished="isAutofocusing = 0"

                  @error="modalError"

                ></taskSubmitter>

              </div>
@@ -160,6 +161,7 @@ 
                  :button-primary="false"

                  @taskStarted="isAutofocusing = 2"

                  @finished="isAutofocusing = 0"

                  @error="modalError"

                ></taskSubmitter>

              </div>
@@ -172,6 +174,7 @@ 
                  :button-primary="false"

                  @taskStarted="isAutofocusing = 3"

                  @finished="isAutofocusing = 0"

                  @error="modalError"

                ></taskSubmitter>

              </div>

            </div>