Browse Source

HUE-3294 [oozie] First pass of integration of the workflow editor with the new layout

Enrico Berti 9 years ago
parent
commit
ee13345

+ 1 - 1
apps/metastore/src/metastore/views.py

@@ -84,7 +84,7 @@ def databases(request):
     'is_navigator_enabled': has_navigator(request.user),
     'optimizer_url': get_optimizer_url(),
     'navigator_url': get_navigator_url(),
-    'is_embeddable': request.REQUEST.get('is_embeddable', False),
+    'is_embeddable': request.GET.get('is_embeddable', False),
   })
 
 

+ 6 - 2
apps/oozie/src/oozie/templates/editor2/workflow_editor.mako

@@ -27,9 +27,11 @@ from oozie.conf import ENABLE_DOCUMENT_ACTION
 <%namespace name="workflow" file="common_workflow.mako" />
 <%namespace name="layout" file="../navigation-bar.mako" />
 
+% if not is_embeddable:
 ${ commonheader(_("Workflow Editor"), "Oozie", user, request, "40px") | n,unicode }
+% endif
 
-<div id="editor">
+<div id="wfEditor">
 
 <%def name="buttons()">
   <div class="pull-right" style="padding-right: 10px">
@@ -539,7 +541,7 @@ ${ dashboard.import_bindings() }
   ${ utils.slaGlobal() }
 
   var viewModel = new WorkflowEditorViewModel(${ layout_json | n,unicode }, ${ workflow_json | n,unicode }, ${ credentials_json | n,unicode }, ${ workflow_properties_json | n,unicode }, ${ subworkflows_json | n,unicode }, ${ can_edit_json | n,unicode }, ${ history_json | n,unicode });
-  ko.applyBindings(viewModel, $("#editor")[0]);
+  ko.applyBindings(viewModel, $("#wfEditor")[0]);
 
   var shareViewModel = initSharing("#documentShareModal");
   shareViewModel.setDocUuid('${ doc_uuid }');
@@ -797,4 +799,6 @@ ${ dashboard.import_bindings() }
 
 </script>
 
+% if not is_embeddable:
 ${ commonfooter(request, messages) | n,unicode }
+% endif

+ 1 - 0
apps/oozie/src/oozie/views/editor2.py

@@ -118,6 +118,7 @@ def _edit_workflow(request, doc, workflow):
       'doc_uuid': doc.uuid if doc else '',
       'subworkflows_json': json.dumps(_get_workflows(request.user), cls=JSONEncoderForHTML),
       'can_edit_json': json.dumps(can_edit_json),
+      'is_embeddable': request.GET.get('is_embeddable', False),
       'history_json': json.dumps([{
           'history': hist.data_dict.get('history', {}),
           'id': hist.id,

+ 5 - 0
desktop/core/src/desktop/static/desktop/css/responsive.css

@@ -972,3 +972,8 @@ h6 {
 #searchComponents .form-search .input-append .search-query {
   width: 50px;
 }
+
+/* oozie workflow */
+#wfEditor .card-toolbar {
+  position: static;
+}

+ 4 - 9
desktop/core/src/desktop/templates/responsive.mako

@@ -112,7 +112,7 @@ ${ hueIcons.symbols() }
             <li class="dropdown-submenu">
               <a title="${_('Schedule with Oozie')}" rel="navigator-tooltip" href="#"><img src="${ static('oozie/art/icon_oozie_editor_48.png') }" class="app-icon" /> ${ _('Workflows') }</a>
               <ul class="dropdown-menu">
-                <li><a href="${url('oozie:list_editor_workflows')}"><img src="${ static('oozie/art/icon_oozie_workflow_48.png') }" class="app-icon"/> ${_('Workflows')}</a></li>
+                <li><a href="#" data-bind="click: function(){ ko.dataFor($('.page-content')[0]).currentApp('oozie_wf') }"><img src="${ static('oozie/art/icon_oozie_workflow_48.png') }" class="app-icon"/> ${_('Workflows')}</a></li>
                 <li><a href="${url('oozie:list_editor_coordinators')}"><img src="${ static('oozie/art/icon_oozie_coordinator_48.png') }" class="app-icon" /> ${_('Coordinators')}</a></li>
                 <li><a href="${url('oozie:list_editor_bundles')}"><img src="${ static('oozie/art/icon_oozie_bundle_48.png') }" class="app-icon" /> ${_('Bundles')}</a></li>
               </ul>
@@ -219,13 +219,6 @@ ${ hueIcons.symbols() }
       </div>
     </div>
 
-##     <div style="position: fixed; bottom: 0; left: 0">
-##       Create Table<br/>
-##       Import File<br/>
-##       Import Queries<br/>
-##       [+]
-##     </div>
-
     <div class="left-panel" data-bind="css: { 'side-panel-closed': !leftAssistVisible() }">
       <a href="javascript:void(0);" style="z-index: 1000; display: none;" title="${_('Show Assist')}" class="pointer side-panel-toggle show-left-side-panel" data-bind="visible: ! leftAssistVisible(), toggle: leftAssistVisible"><i class="fa fa-chevron-right"></i></a>
       <a href="javascript:void(0);" style="display: none;" title="${_('Hide Assist')}" class="pointer side-panel-toggle hide-left-side-panel" data-bind="visible: leftAssistVisible, toggle: leftAssistVisible"><i class="fa fa-chevron-left"></i></a>
@@ -264,6 +257,7 @@ ${ hueIcons.symbols() }
       <div id="embeddable_editor" class="embeddable"></div>
       <div id="embeddable_metastore" class="embeddable"></div>
       <div id="embeddable_search" class="embeddable"></div>
+      <div id="embeddable_oozie_wf" class="embeddable"></div>
     </div>
 
     <div id="rightResizer" class="resizer" data-bind="visible: rightAssistVisible(), splitFlexDraggable : {
@@ -350,7 +344,8 @@ ${ assist.assistPanel() }
         self.EMBEDDABLE_PAGE_URLS = {
           editor: '/notebook/editor_embeddable',
           metastore: '/metastore/tables/?is_embeddable=true',
-          search: '/search/embeddable/new_search'
+          search: '/search/embeddable/new_search',
+          oozie_wf: '/oozie/editor/workflow/new/?is_embeddable=true'
         };
 
         self.embeddable_cache = {};