Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Spark analysis mode and collection type #153

Open
jeffbaumes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Spark analysis mode and collection type #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/templates/index.jadehtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ html(lang="en")
| R
option(value="python")
| Python
option(value="spark.python")
| Spark Python
button.btn.btn-default#save
span.glyphicon.glyphicon-save
| Save
Expand Down
2 changes: 2 additions & 0 deletions app/src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
phy: {type: 'tree', format: 'newick'},
nex: {type: 'tree', format: 'nexus'},
'nested-json': {type: 'tree', format: 'nested.json'},
'collection-json': {type: 'collection', format: 'json'},
csv: {type: 'table', format: 'csv'},
tsv: {type: 'table', format: 'tsv'},
png: {type: 'image', format: 'png'},
Expand All @@ -23,6 +24,7 @@
webFormat: {
table: 'rows',
tree: 'nested',
collection: 'json',
string: 'text',
number: 'number',
image: 'png.base64',
Expand Down
4 changes: 3 additions & 1 deletion app/src/views/AnalysisManagementView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
'change #mode': function () {
if (this.analysis) {
this.analysis.get('meta').analysis.mode = $("#mode").val();
this.editor.getSession().setMode("ace/mode/" + this.analysis.get('meta').analysis.mode);
var language = this.analysis.get('meta').analysis.mode.split('.');
language = language[language.length - 1];
this.editor.getSession().setMode("ace/mode/" + language);
}
},

Expand Down
2 changes: 2 additions & 0 deletions app/src/views/DatasetManagementView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
flow.DatasetManagementView = Backbone.View.extend({
saveFormats: {
table: ['csv', 'tsv', 'rows.json', 'objectlist.json', 'vtktable.serialized', 'jsonlines'],
collection: ['json'],
tree: ['nested.json', 'nexus', 'newick', 'vtktree.serialized'],
image: ['png'],
r: ['serialized'],
Expand All @@ -19,6 +20,7 @@
"table:objectlist.json": "objectlist-json",
"table:jsonlines": "jsonlines",
"table:vtktable.serialized": "vtk",
"collection:json": "collection-json",
"tree:nested.json": "nested-json",
"tree:nexus": "nex",
"tree:newick": "phy",
Expand Down
1 change: 1 addition & 0 deletions app/src/views/InputView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
table: {inputMode: "dataset"},
tree: {inputMode: "dataset"},
image: {inputMode: "dataset"},
collection: {inputMode: "dataset"},
r: {inputMode: "dataset"},
string: {inputMode: "line"},
number: {inputMode: "line"},
Expand Down
2 changes: 1 addition & 1 deletion app/src/views/InputsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
dataset,
id = input.get('id') || input.get('name');

if (input.get('type') === 'table' || input.get('type') === 'tree' || input.get('type') === 'image' || input.get('type') === 'r') {
if (input.get('type') === 'table' || input.get('type') === 'tree' || input.get('type') === 'image' || input.get('type') === 'r' || input.get('type') === 'collection') {
dataset = this.datasets.get(value);
result[id] = _.extend(dataset.toJSON(), flow.girderItemInput(dataset.get('_id')));
} else if (input.get('type') === 'string') {
Expand Down
4 changes: 4 additions & 0 deletions app/src/views/VariableEditView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
'number:number',
'image:png.base64',
'r:object',
'collection:json',
'collection:spark.rdd',
'geometry:vtkpolydata'
]},
description: {name: "Description", id: "description", type: "string", format: "text"},
Expand Down Expand Up @@ -67,6 +69,8 @@
columnNamesInput = values.columnNamesInput;
if (columnNamesInput && columnNamesInput.data !== '') {
model.domain = {format: 'column.names', input: columnNamesInput.data};
} else {
model.domain = undefined;
}
this.model.set(model);
this.$el.modal('hide');
Expand Down