Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to New APIs for Front-End #3507

Merged
merged 4 commits into from
Mar 31, 2022
Merged

Switch to New APIs for Front-End #3507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f903a8
Add ability to override taskName via helper
rajadain Mar 25, 2022
8cf00f4
Refactor Modeling Task Models
rajadain Mar 25, 2022
aab3d8c
Update payload content, keys for new API
rajadain Mar 25, 2022
a0b41ee
Add new job response, deprecation notice to subbasin
rajadain Mar 25, 2022
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
6 changes: 6 additions & 0 deletions src/mmw/apps/geoprocessing_api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,13 @@ def start_modeling_subbasin_run(request, format=None):
return Response(
{
'job': task_chain.id,
'job_uuid': task_chain.id,
'status': JobStatus.STARTED,
# TODO Remove this message when `job` is deprecated
'messages': [
'The `job` field will be deprecated in an upcoming release. '
'Please switch to using `job_uuid` instead.'
],
},
headers={'Location': reverse('geoprocessing_api:get_job',
args=[task_chain.id])}
Expand Down
6 changes: 3 additions & 3 deletions src/mmw/js/src/core/models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,12 +621,12 @@ var TaskModel = Backbone.Model.extend({
logger('[' + this.get('name') + '] ' + message);
},

url: function(queryParams) {
url: function(taskName, queryParams) {
var encodedQueryParams = queryParams ? '?' + $.param(queryParams) : '';
if (this.get('job')) {
return '/' + this.get('taskType') + '/jobs/' + this.get('job') + '/';
} else {
return '/' + this.get('taskType') + '/' + this.get('taskName') + '/' + encodedQueryParams;
return '/' + this.get('taskType') + '/' + (taskName || this.get('taskName')) + '/' + encodedQueryParams;
}
},

Expand Down Expand Up @@ -666,7 +666,7 @@ var TaskModel = Backbone.Model.extend({
}
var self = this,
startDefer = self.fetch({
url: self.url(taskHelper.queryParams),
url: self.url(taskHelper.taskName, taskHelper.queryParams),
method: 'POST',
data: taskHelper.postData,
contentType: taskHelper.contentType,
Expand Down
75 changes: 26 additions & 49 deletions src/mmw/js/src/modeling/models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,45 +57,25 @@ var Tr55TaskModel = coreModels.TaskModel.extend({
)
});

var MapshedTaskModel = coreModels.TaskModel.extend({
defaults: _.extend(
{
taskName: utils.MAPSHED,
taskType: 'mmw/modeling'
},
coreModels.TaskModel.prototype.defaults
)
});
function makeModelingTaskModel(taskName) {
return coreModels.TaskModel.extend({
defaults: _.extend(
{
taskName: 'modeling/' + taskName,
taskType: 'api',
token: settings.get('api_token'),
},
coreModels.TaskModel.prototype.defaults),
});
}

var GwlfeTaskModel = coreModels.TaskModel.extend({
defaults: _.extend(
{
taskName: utils.GWLFE,
taskType: 'mmw/modeling'
},
coreModels.TaskModel.prototype.defaults
)
});
var MapshedTaskModel = makeModelingTaskModel('gwlf-e/prepare');

var SubbasinMapshedTaskModel = coreModels.TaskModel.extend({
defaults: _.extend(
{
taskName: utils.MAPSHED,
taskType: 'mmw/modeling'
},
coreModels.TaskModel.prototype.defaults
)
});
var GwlfeTaskModel = makeModelingTaskModel('gwlf-e/run');

var SubbasinGwlfeTaskModel = coreModels.TaskModel.extend({
defaults: _.extend(
{
taskName: utils.GWLFE,
taskType: 'mmw/modeling'
},
coreModels.TaskModel.prototype.defaults
)
});
var SubbasinMapshedTaskModel = makeModelingTaskModel('subbasin/prepare');

var SubbasinGwlfeTaskModel = makeModelingTaskModel('subbasin/run');

var ResultModel = Backbone.Model.extend({
defaults: {
Expand Down Expand Up @@ -572,20 +552,16 @@ var ProjectModel = Backbone.Model.extend({
aoi_param = utils.isWKAoIValid(wkaoi) ?
{ 'wkaoi': wkaoi } :
{ 'area_of_interest': aoi },
mapshedInput = JSON.stringify(
_.extend({
postData =_.extend({
layer_overrides: this.get('layer_overrides'),
}, aoi_param)),
queryParams = isSubbasinMode ? { subbasin: true } : null,
}, aoi_param),
taskModel = isSubbasinMode ?
createSubbasinTaskModel(utils.MAPSHED) :
createTaskModel(utils.MAPSHED),
taskHelper = {
postData: {
mapshed_input: mapshedInput
},
postData: JSON.stringify(postData),

queryParams: queryParams,
contentType: 'application/json',

onStart: function() {
console.log(isSubbasinMode ?
Expand Down Expand Up @@ -1459,11 +1435,12 @@ var ScenarioModel = Backbone.Model.extend({
results = this.get('results'),
taskModel = this.get('taskModel'),
gisData = this.getGisData(isSubbasinMode),
queryParams = isSubbasinMode ? { subbasin: true } : null,
taskHelper = {
postData: gisData,
postData: JSON.stringify(gisData),

contentType: 'application/json',

queryParams: queryParams,
taskName: isSubbasinMode ? 'modeling/subbasin/run' : null,

onStart: function() {
console.log(isSubbasinMode ?
Expand Down Expand Up @@ -1702,8 +1679,8 @@ var ScenarioModel = Backbone.Model.extend({

return {
inputmod_hash: self.get('inputmod_hash'),
modifications: JSON.stringify(modifications),
mapshed_job_uuid: isSubbasinMode ?
modifications: modifications,
job_uuid: isSubbasinMode ?
project.get('subbasin_mapshed_job_uuid') :
project.get('mapshed_job_uuid'),
layer_overrides: project.get('layer_overrides'),
Expand Down