added optional resource name for workflows

tethysext/workflows/controllers/workflows/map_workflows/spatial_condor_job_mwv.py

@@ -118,6 +118,11 @@ def render_condor_jobs_table(self, request, session, workflow, current_step, pre
         # Get the current app
         step_url_name = self.get_step_url_name(request, workflow)
 
+        if workflow.resource_name:
+            nav_title = f'{workflow.resource_name}: {workflow.name}'
+        else:
+            nav_title = workflow.name
+
         context = {
             'workflow': workflow,
             'steps': steps,
@@ -129,7 +134,7 @@ def render_condor_jobs_table(self, request, session, workflow, current_step, pre
             'finish_title': self.finish_title,
             'previous_title': self.previous_title,
             'back_url': self.back_url,
-            'nav_title': workflow.name,
+            'nav_title': nav_title,
             'nav_subtitle': workflow.DISPLAY_TYPE_SINGULAR,
             'jobs_table': jobs_table,
             'base_template': self.base_template

tethysext/workflows/controllers/workflows/workflow_view.py

@@ -88,14 +88,20 @@ def get_context(self, request, session, context, workflow_id, step_id, *args, **
         # Get the current app
         step_url_name = self.get_step_url_name(request, workflow)
 
+
+        if workflow.resource_name:
+            nav_title = f'{workflow.resource_name}: {workflow.name}'
+        else:
+            nav_title = workflow.name
+
         context.update({
             'workflow': workflow,
             'steps': steps,
             'current_step': current_step,
             'previous_step': previous_step,
             'next_step': next_step,
             'step_url_name': step_url_name,
-            'nav_title': 'Replacement Resource Name: replacement workflow name',
+            'nav_title': nav_title,
             'nav_subtitle': workflow.DISPLAY_TYPE_SINGULAR,
             'previous_title': self.previous_title,
             'next_title': self.next_title,

tethysext/workflows/models/workflow.py

@@ -77,6 +77,7 @@ class TethysWorkflow(WorkflowsBase, AttributesMixin, ResultsMixin):
     name = Column(String)
     date_created = Column(DateTime, default=dt.datetime.utcnow)
     _attributes = Column(String)
+    resource_name = Column(String, nullable=True)
 
     steps = relationship('Step', order_by='Step.order', backref='workflow',
                          cascade='all,delete')

tethysext/workflows/templates/gizmos/new_workflow_modal.html

@@ -25,6 +25,10 @@ <h4 class="modal-title" id="new-workflow-modal-label">New Workflow</h4>
               {% endfor %}
             </select>
           </div>
+          <div class="form-group">
+            <label for="new-workflow-resource-input">Resource Name (Optional)</label>
+            <input type="text" class="form-control" id="new-workflow-resource-input" name="resource-name">
+          </div>
         </form>
       </div>
       <div class="modal-footer">

tethysext/workflows/views/layouts/workflow_layout.py

@@ -159,6 +159,7 @@ def post(self, request, *args, **kwargs):
         if 'new-workflow' in params:
             workflow_name = params.get('workflow-name')
             workflow_type = params.get('workflow-type')
+            resource_name = params.get('resource-name', None)
 
             if not workflow_name:
                 messages.error(request, 'Unable to create new workflow: no name given.')
@@ -173,6 +174,7 @@ def post(self, request, *args, **kwargs):
                 workflow = workflow_model.new(
                     app=self.app,
                     name=workflow_name,
+                    resource_name=resource_name,
                     creator_id = request.user.id,
                     creator_name = request.user.username,
                     geoserver_name = self.app.GEOSERVER_NAME,