forked from galaxyproject/galaxy
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from galaxyproject/dev
update galaxy dev.
- Loading branch information
Showing
188 changed files
with
3,886 additions
and
2,677 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| * text=auto | ||
| lib/galaxy/datatypes/test/dosimzml eol=crlf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
client/galaxy/scripts/components/JobStates/CollectionJobStates.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <template> | ||
| <div v-if="!jobSourceType || jobSourceType == 'Job' || isTerminal"> | ||
| {{ simpleDescription }} | ||
| </div> | ||
| <div v-else-if="!jobStatesSummary || !jobStatesSummary.hasDetails()"> | ||
| <progress-bar :note="loadingNote" :loading="true" :infoProgress="1" /> | ||
| </div> | ||
| <div v-else-if="isNew"> | ||
| <progress-bar note="Creating jobs" :loading="true" :infoProgress="1" /> | ||
| </div> | ||
| <div v-else-if="isErrored"> | ||
| {{ errorDescription }} | ||
| </div> | ||
| <div v-else> | ||
| <progress-bar | ||
| :note="generatingNote" | ||
| :okProgress="okPercent" | ||
| :runningProgress="runningPercent" | ||
| :newProgress="otherPercent" | ||
| /> | ||
| </div> | ||
| </template> | ||
| <script> | ||
| import DC_VIEW from "mvc/collection/collection-view"; | ||
| import mixin from "./mixin"; | ||
| import ProgressBar from "components/ProgressBar"; | ||
| export default { | ||
| props: { | ||
| collection: { type: Object, required: true }, // backbone model | ||
| jobStatesSummary: { required: true } | ||
| }, | ||
| components: { | ||
| ProgressBar | ||
| }, | ||
| mixins: [mixin], | ||
| computed: { | ||
| loadingNote() { | ||
| return `Loading job data for ${this.collectionTypeDescription}}`; | ||
| }, | ||
| generatingNote() { | ||
| return `${this.jobsStr} generating a ${this.collectionTypeDescription}`; | ||
| }, | ||
| jobSourceType() { | ||
| return this.collection.get("job_source_type"); | ||
| }, | ||
| collectionTypeDescription() { | ||
| return DC_VIEW.collectionTypeDescription(this.collection); | ||
| }, | ||
| simpleDescription() { | ||
| return DC_VIEW.collectionDescription(this.collection); | ||
| }, | ||
| errorDescription() { | ||
| var jobCount = this.jobCount; | ||
| var errorCount = this.jobStatesSummary.numInError(); | ||
| return `a ${this.collectionTypeDescription} with ${errorCount} / ${jobCount} jobs in error`; | ||
| } | ||
| } | ||
| }; | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| import CollectionJobStates from "./CollectionJobStates"; | ||
| import { mountVueComponent } from "utils/mountVueComponent"; | ||
|
|
||
| export const mountCollectionJobStates = mountVueComponent(CollectionJobStates); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* VueJS mixin with computed properties from a base jobStatesSummary property for summarizing job states */ | ||
| export default { | ||
| computed: { | ||
| isNew() { | ||
| return !this.jobStatesSummary || this.jobStatesSummary.new(); | ||
| }, | ||
| isErrored() { | ||
| return this.jobStatesSummary && this.jobStatesSummary.errored(); | ||
| }, | ||
| isTerminal() { | ||
| return this.jobStatesSummary && this.jobStatesSummary.terminal(); | ||
| }, | ||
| jobCount() { | ||
| return !this.jobStatesSummary ? null : this.jobStatesSummary.jobCount(); | ||
| }, | ||
| jobsStr() { | ||
| const jobCount = this.jobCount; | ||
| return jobCount && jobCount > 1 ? `${jobCount} jobs` : `a job`; | ||
| }, | ||
| runningCount() { | ||
| return this.countStates(["running"]); | ||
| }, | ||
| okCount() { | ||
| return this.countStates(["ok"]); | ||
| }, | ||
| errorCount() { | ||
| return this.countStates(["error"]); | ||
| }, | ||
| runningPercent() { | ||
| return this.runningCount / (this.jobCount * 1.0); | ||
| }, | ||
| okPercent() { | ||
| return this.okCount / (this.jobCount * 1.0); | ||
| }, | ||
| errorPercent() { | ||
| return this.errorCount / (this.jobCount * 1.0); | ||
| }, | ||
| otherPercent() { | ||
| return 1.0 - this.okPercent - this.runningPercent - this.errorPercent; | ||
| } | ||
| }, | ||
| methods: { | ||
| countStates(states) { | ||
| let count = 0; | ||
| if (this.jobStatesSummary && this.jobStatesSummary.hasDetails()) { | ||
| for (const state of states) { | ||
| count += this.jobStatesSummary.states()[state] || 0; | ||
| } | ||
| } | ||
| return count; | ||
| } | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <template> | ||
| <div class="progress state-progress"> | ||
| <span class="note" v-if="note"> | ||
| {{ note }}<span v-if="loading">.<span class="blinking">..</span> </span> | ||
| </span> | ||
| <div class="progress-bar info" v-bind:style="styleFromProgress(infoProgress)" :title="infoMessage"></div> | ||
| <div class="progress-bar ok" v-bind:style="styleFromProgress(okProgress)" :title="okMessage"></div> | ||
| <div | ||
| class="progress-bar running" | ||
| v-bind:style="styleFromProgress(runningProgress)" | ||
| :title="runningMessage" | ||
| ></div> | ||
| <div class="progress-bar new" v-bind:style="styleFromProgress(newProgress)" :title="newMessage"></div> | ||
| <div class="progress-bar error" v-bind:style="styleFromProgress(errorProgress)" :title="errorMessage"></div> | ||
| </div> | ||
| </template> | ||
| <script> | ||
| // Not really a very generic ProgressBar - consider renaming to StateProgressBar. | ||
| export default { | ||
| props: { | ||
| note: { type: String, default: null }, | ||
| loading: { type: Boolean, default: false }, | ||
| infoProgress: { type: Number, default: 0.0 }, | ||
| infoMessage: { type: String, default: null }, | ||
| okProgress: { type: Number, default: 0.0 }, | ||
| okMessage: { type: String, default: null }, | ||
| runningProgress: { type: Number, default: 0.0 }, | ||
| runningMessage: { type: String, default: null }, | ||
| newProgress: { type: Number, default: 0.0 }, | ||
| newMessage: { type: String, default: null }, | ||
| errorProgress: { type: Number, default: 0.0 }, | ||
| errorMessage: { type: String, default: null } | ||
| }, | ||
| methods: { | ||
| styleFromProgress: function(progress) { | ||
| return { width: `${progress * 100}%` }; | ||
| } | ||
| } | ||
| }; | ||
| </script> |
Oops, something went wrong.