Unverified Commit 8aceb264 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14088 from mvdbeek/refresh_history 

Clear history refresh timeout for snappier operations in new history
parents c99c1ac7 0a95fb6f

client/src/components/History/adapters/HistoryPanelProxy.js

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ export class HistoryPanelProxy { 
        watchHistory();

    }

    refreshContents() {

        // to be removed after disabling legacy history

        // to be removed after disabling legacy history, present to provide uniform interface

        // with History Panel Backbone View.

    }

    loadCurrentHistory() {

        store.dispatch("history/loadCurrentHistory");

client/src/components/RuleCollectionBuilder.vue

+3 −7
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ import { getAppRoot } from "onload/loadConfig"; 
import { getGalaxyInstance } from "app";

import axios from "axios";

import _l from "utils/localization";

import { refreshContentsWrapper } from "utils/data";

import HotTable from "@handsontable/vue";

import UploadUtils from "mvc/upload/upload-utils";

import JobStatesModel from "mvc/history/job-states-model";
@@ -1313,10 +1314,7 @@ export default { 
            this.mapping.splice(index, 1);

        },

        refreshAndWait(response) {

            const Galaxy = getGalaxyInstance();

            if (Galaxy && Galaxy.currHistoryPanel) {

                Galaxy.currHistoryPanel.refreshContents();

            }

            refreshContentsWrapper();

            this.waitOnJob(response);

        },

        waitOnJob(response) {
@@ -1332,9 +1330,7 @@ export default { 
                        "Unknown error encountered while running your upload job, this could be a server issue or a problem with the upload definition.";

                    this.doFullJobCheck(jobId);

                } else {

                    const Galaxy = getGalaxyInstance();

                    const history = Galaxy && Galaxy.currHistoryPanel && Galaxy.currHistoryPanel.model;

                    history.refresh && history.refresh();

                    refreshContentsWrapper();

                    this.oncreate();

                }

            };

client/src/components/Tool/ToolForm.vue

+2 −4
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
import { getGalaxyInstance } from "app";

import { getToolFormData, updateToolFormData, submitJob } from "./services";

import { allowCachedJobs } from "./utilities";

import { refreshContentsWrapper } from "utils/data";

import ToolCard from "./ToolCard";

import ButtonSpinner from "components/Common/ButtonSpinner";

import CurrentUser from "components/providers/CurrentUser";
@@ -274,7 +275,6 @@ export default { 
                return;

            }

            this.showExecuting = true;

            const Galaxy = getGalaxyInstance();

            const jobDef = {

                history_id: historyId,

                tool_id: this.formConfig.id,
@@ -296,9 +296,7 @@ export default { 
            submitJob(jobDef).then(

                (jobResponse) => {

                    this.showExecuting = false;

                    if (Galaxy.currHistoryPanel) {

                        Galaxy.currHistoryPanel.refreshContents();

                    }

                    refreshContentsWrapper();

                    if (jobResponse.produces_entry_points) {

                        this.showEntryPoints = true;

                        this.entryPoints = jobResponse.jobs;

client/src/components/Upload/Collection.vue

+2 −2
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
import _l from "utils/localization";

import _ from "underscore";

import { getGalaxyInstance } from "app";

import { refreshContentsWrapper } from "utils/data";

import UploadRow from "mvc/upload/collection/collection-row";

import UploadBoxMixin from "./UploadBoxMixin";

import { uploadModelsToPayload } from "./helpers";
@@ -250,8 +251,7 @@ export default { 
            const outputs = incoming.outputs || incoming.data.outputs || {};

            it.set({ percentage: 100, status: "success", outputs });

            this._updateStateForSuccess(it);

            const Galaxy = getGalaxyInstance();

            Galaxy.currHistoryPanel.refreshContents();

            refreshContentsWrapper();

        },



        _eventBuild: function () {

client/src/components/Upload/Composite.vue

+2 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
<script>

import _l from "utils/localization";

import _ from "underscore";

import { getGalaxyInstance } from "app";

import { refreshContentsWrapper } from "utils/data";

import UploadRow from "mvc/upload/composite/composite-row";

import UploadBoxMixin from "./UploadBoxMixin";

import { uploadModelsToPayload } from "./helpers";
@@ -193,11 +193,10 @@ export default { 


        /** Refresh success state */

        _eventSuccess: function (message) {

            const Galaxy = getGalaxyInstance();

            this.collection.each((it) => {

                it.set("status", "success");

            });

            Galaxy.currHistoryPanel.refreshContents();

            refreshContentsWrapper();

        },



        /** Refresh error state */