Skip to content

Commit

Permalink
Add preliminary sharing vue component, redirect routes
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Apr 25, 2018
1 parent f3455f5 commit 7f5206a
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 16 deletions.
9 changes: 9 additions & 0 deletions client/galaxy/scripts/apps/analysis.js
Expand Up @@ -8,6 +8,7 @@ import HistoryPanel from "./panels/history-panel";
import Page from "layout/page";
import ToolForm from "mvc/tool/tool-form";
import FormWrapper from "mvc/form/form-wrapper";
import Sharing from "components/Sharing.vue";
import UserPreferences from "mvc/user/user-preferences";
import CustomBuilds from "mvc/user/user-custom-builds";
import Tours from "mvc/tours";
Expand Down Expand Up @@ -68,6 +69,7 @@ window.app = function app(options, bootstrapped) {
"(/)workflows/create(/)": "show_workflows_create",
"(/)histories(/)citations(/)": "show_history_citations",
"(/)histories(/)rename(/)": "show_histories_rename",
"(/)histories(/)sharing(/)": "show_histories_sharing",
"(/)histories(/)import(/)": "show_histories_import",
"(/)histories(/)permissions(/)": "show_histories_permissions",
"(/)histories/view": "show_history_view",
Expand Down Expand Up @@ -169,6 +171,13 @@ window.app = function app(options, bootstrapped) {
);
},

show_histories_sharing: function() {
var sharingInstance = Vue.extend(Sharing);
var vm = document.createElement("div");
this.page.display(vm);
new sharingInstance().$mount(vm);
},

show_histories_import: function() {
var historyImportInstance = Vue.extend(HistoryImport);
var vm = document.createElement("div");
Expand Down
28 changes: 13 additions & 15 deletions client/yarn.lock
Expand Up @@ -19,6 +19,10 @@
normalize-path "^2.0.1"
through2 "^2.0.3"

"@handsontable/vue@^2.0.0-beta1":
version "2.0.0-beta1"
resolved "https://registry.yarnpkg.com/@handsontable/vue/-/vue-2.0.0-beta1.tgz#81bb727dbbe29a8f24181632864a21b26d22965a"

abbrev@1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
Expand Down Expand Up @@ -1039,6 +1043,10 @@ babel-plugin-transform-flow-strip-types@^6.22.0:
babel-plugin-syntax-flow "^6.18.0"
babel-runtime "^6.22.0"

babel-plugin-transform-inline-environment-variables@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-environment-variables/-/babel-plugin-transform-inline-environment-variables-0.4.0.tgz#365a38c1f6547801398d23a6f56d2f464ab4062c"

babel-plugin-transform-object-rest-spread@^6.22.0, babel-plugin-transform-object-rest-spread@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
Expand Down Expand Up @@ -4611,11 +4619,11 @@ handlebars@~3.0.0:
optionalDependencies:
uglify-js "~2.3"

handsontable@^0.33.0:
version "0.33.0"
resolved "https://registry.yarnpkg.com/handsontable/-/handsontable-0.33.0.tgz#3df41804fd00a878b3904a478bf7ef54f2bc6d95"
handsontable@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/handsontable/-/handsontable-2.0.0.tgz#b22fbd61d3193eb63b9c798e73843f55856ef022"
dependencies:
moment "2.18.1"
moment "2.20.1"
numbro "1.11.0"
pikaday "1.5.1"

Expand Down Expand Up @@ -6645,11 +6653,7 @@ mocha@^5.0.5:
mkdirp "0.5.1"
supports-color "4.4.0"

moment@2.18.1:
version "2.18.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"

moment@2.x:
moment@2.20.1, moment@2.x:
version "2.20.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"

Expand Down Expand Up @@ -10595,12 +10599,6 @@ vue-functional-data-merge@^2.0.5:
version "2.0.6"
resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-2.0.6.tgz#f08055adfb92458debcf2ad10c3aa712277f7fc2"

vue-handsontable-official@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/vue-handsontable-official/-/vue-handsontable-official-1.0.0.tgz#d943c192a3a7725153186c682d6aef9e2955bff2"
dependencies:
handsontable "^0.33.0"

vue-hot-reload-api@^2.2.0:
version "2.2.3"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.3.tgz#43c8e5506d65a271d2571936d77253019fd3eb17"
Expand Down
1 change: 1 addition & 0 deletions lib/galaxy/webapps/galaxy/buildapp.py
Expand Up @@ -128,6 +128,7 @@ def app_factory(global_conf, load_app_kwds={}, **kwargs):
webapp.add_client_route('/histories/list_published')
webapp.add_client_route('/histories/list_shared')
webapp.add_client_route('/histories/rename')
webapp.add_client_route('/histories/sharing')
webapp.add_client_route('/histories/permissions')
webapp.add_client_route('/histories/view')
webapp.add_client_route('/histories/show_structure')
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/webapps/galaxy/controllers/history.py
Expand Up @@ -103,7 +103,7 @@ def build_initial_query(self, trans, **kwargs):
operations = [
grids.GridOperation("Switch", allow_multiple=False, condition=(lambda item: not item.deleted), async_compatible=True),
grids.GridOperation("View", allow_multiple=False, url_args=dict(controller="", action="histories/view")),
grids.GridOperation("Share or Publish", allow_multiple=False, condition=(lambda item: not item.deleted), url_args=dict(action='sharing')),
grids.GridOperation("Share or Publish", allow_multiple=False, condition=(lambda item: not item.deleted), url_args=dict(controller="", action="histories/sharing")),
grids.GridOperation("Change Permissions", allow_multiple=False, condition=(lambda item: not item.deleted), url_args=dict(controller="", action="histories/permissions")),
grids.GridOperation("Copy", allow_multiple=False, condition=(lambda item: not item.deleted), async_compatible=False),
grids.GridOperation("Rename", condition=(lambda item: not item.deleted), url_args=dict(controller="", action="histories/rename"), target="top"),
Expand Down

0 comments on commit 7f5206a

Please sign in to comment.