Skip to content

Instantly share code, notes, and snippets.

View dannon's full-sized avatar

Dannon dannon

View GitHub Profile
diff --git a/client/src/components/History/Content/ContentItem.test.js b/client/src/components/History/Content/ContentItem.test.js
index 8526789a84..01d4dffbae 100644
--- a/client/src/components/History/Content/ContentItem.test.js
+++ b/client/src/components/History/Content/ContentItem.test.js
@@ -46,12 +46,12 @@ describe("ContentItem", () => {
DatasetDetails: true,
vueTagsInput: false,
},
- provide: {
- store: {
diff --git a/lib/galaxy/files/sources/galaxy.py b/lib/galaxy/files/sources/galaxy.py
index ebbf9d303e..e1a02a30ab 100644
--- a/lib/galaxy/files/sources/galaxy.py
+++ b/lib/galaxy/files/sources/galaxy.py
@@ -12,6 +12,26 @@ from .posix import (
PosixFilesSourceProperties,
)
+class UserHomeFilesSource(PosixFilesSource):
+ plugin_type = "gxuserhome"
diff --git a/lib/galaxy/files/sources/galaxy.py b/lib/galaxy/files/sources/galaxy.py
index ebbf9d303e..62efed21f0 100644
--- a/lib/galaxy/files/sources/galaxy.py
+++ b/lib/galaxy/files/sources/galaxy.py
@@ -12,6 +12,26 @@ from .posix import (
PosixFilesSourceProperties,
)
+class UserHomeFilesSource(PosixFilesSource):
+ plugin_type = "gxuserhome"
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
index e38445528e..45427cee35 100644
--- a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
+++ b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
@@ -237,12 +237,15 @@ export default {
async getSelected() {
if (this.isAllSelectedMode) {
this.$emit("setBusy", true);
+ console.debug("Get selected!")
+ console.debug('first', this.selected);
diff --git a/client/src/components/Workflow/Editor/WorkflowGraph.vue b/client/src/components/Workflow/Editor/WorkflowGraph.vue
index 3dc2aa26b1..d3c0dfab5f 100644
--- a/client/src/components/Workflow/Editor/WorkflowGraph.vue
+++ b/client/src/components/Workflow/Editor/WorkflowGraph.vue
@@ -68,7 +68,7 @@ const canvas: Ref<HTMLElement | null> = ref(null);
const elementBounding = useElementBounding(canvas, { windowResize: false, windowScroll: false });
const scroll = useScroll(canvas);
-const { transform, panBy, setZoom, moveTo } = useD3Zoom(1, minZoom, maxZoom, canvas, scroll);
+const { transform, panBy, setZoom, moveTo } = useD3Zoom(1, minZoom, maxZoom, canvas, scroll, { x: 10, y: 10 });
diff --git a/client/src/mvc/visualization/chart/chart-client.js b/client/src/mvc/visualization/chart/chart-client.js
index 4a030f5c10..4891596ef2 100644
--- a/client/src/mvc/visualization/chart/chart-client.js
+++ b/client/src/mvc/visualization/chart/chart-client.js
@@ -46,6 +46,7 @@ export default Backbone.View.extend({
})
.done((dataset) => {
this.dataset = dataset;
+ console.debug("LOADING CHART WITH THIS", this);
this.chart.load();
diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py
index 63a8d66698..3e51a7d830 100644
--- a/lib/galaxy/webapps/galaxy/controllers/workflow.py
+++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py
@@ -538,16 +538,13 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
]

# identify item tags
- item_tags = [tag for tag in stored.tags if tag.user == trans.user]
- item_tag_names = []
diff --git a/client/src/components/History/Content/ContentItem.vue b/client/src/components/History/Content/ContentItem.vue
index cea253c0df..ef11920be1 100644
--- a/client/src/components/History/Content/ContentItem.vue
+++ b/client/src/components/History/Content/ContentItem.vue
@@ -219,7 +219,7 @@ export default {
this.$router.push(this.itemUrls.edit);
},
onShowCollectionInfo() {
- backboneRoute(this.itemUrls.showDetails);
+ this.$router.push(this.itemUrls.showDetails);
diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue
index 271d759e73..77ea4c07fa 100644
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue
@@ -12,7 +12,6 @@
<section class="dataset-collection-panel d-flex flex-column">
<section>
<CollectionNavigation
- ref="collectionNav"
:history="history"
diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/f6fb225c05ab_add_notification_table.py b/lib/galaxy/model/migrations/alembic/versions_gxy/f6fb225c05ab_add_notification_table.py
index 6a45bd9211..a141d8217d 100644
--- a/lib/galaxy/model/migrations/alembic/versions_gxy/f6fb225c05ab_add_notification_table.py
+++ b/lib/galaxy/model/migrations/alembic/versions_gxy/f6fb225c05ab_add_notification_table.py
@@ -37,5 +37,6 @@ def upgrade():
def downgrade():
+ op.drop_constraint('user_notification_association_notification_id_fkey', 'user_notification_association')
op.drop_table("notification_push")