Skip to content

Commit

Permalink
Prepare for v2.12.0 Release (#2763)
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisknoll authored Oct 11, 2022
1 parent 774c4ba commit b13d793
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 6 deletions.
9 changes: 5 additions & 4 deletions js/components/conceptpicker/ConceptPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ define(['jquery','knockout', 'text!./ConceptPickerTemplate.html', './InputTypes/

ConceptPickerViewModel.prototype.search = function () {
var self = this;
return VocabularyProvider.search(this.searchText, {
domains: [this.SelectedDomain],
maxResults: this.MaxResults
})
searchParams = {
QUERY: this.searchText,
DOMAIN_ID: [this.SelectedDomain]
}
return VocabularyProvider.search(searchParams)
.then(function (searchResults) {
self.results(searchResults);
});
Expand Down
8 changes: 8 additions & 0 deletions js/const.js
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,14 @@ define([
title: "Spark",
dialect: "spark",
},
SNOWFLAKE: {
title: "Snowflake",
dialect: "snowflake",
},
SYNAPSE: {
title: "Azure Synapse",
dialect: "synapse",
},
};

const eventTypes = {
Expand Down
2 changes: 2 additions & 0 deletions js/pages/configuration/sources/source-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ define([
{ id: 'netezza', name: ko.i18n('configuration.viewEdit.dialect.options.netezza', 'IBM Netezza') },
{ id: 'hive', name: ko.i18n('configuration.viewEdit.dialect.options.hive', 'Hive LLAP')},
{ id: 'spark', name: ko.i18n('configuration.viewEdit.dialect.options.spark', 'Spark')},
{ id: 'snowflake', name: ko.i18n('configuration.viewEdit.dialect.options.snowflake', 'Snowflake')},
{ id: 'synapse', name: ko.i18n('configuration.viewEdit.dialect.options.synapse', 'Azure Synapse') },
];

this.sourceCaption = ko.computed(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,4 @@ define([
}

return commonUtils.build('report-treemap-drilldown', TreemapDrilldown, view);
});
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "atlas",
"version": "2.12.0-DEV",
"version": "2.12.0",
"description": "is an open source software tool for researchers to conduct scientific analyses on standardized observational data converted to the OMOP Common Data Model V5",
"main": "js/main.js",
"scripts": {
Expand Down

0 comments on commit b13d793

Please sign in to comment.