Просмотр исходного кода

[assist] Only allow opening tables from the assist in the metastore

It now shows the stats icon elsewhere
Johan Ahlen 10 лет назад
Родитель
Сommit
712f271

+ 12 - 9
apps/beeswax/src/beeswax/templates/create_database.mako

@@ -65,16 +65,19 @@ ${ assist.assistPanel() }
           <div class="assist" data-bind="component: {
               name: 'assist-panel',
               params: {
-                sourceTypes: [{
-                  name: 'hive',
-                  type: 'hive'
-                }],
                 user: '${user.username}',
-                navigationSettings: {
-                  openItem: true,
-                  showPreview: true,
-                  showStats: false
-                }
+                sql : {
+                  sourceTypes: [{
+                    name: 'hive',
+                    type: 'hive'
+                  }],
+                  navigationSettings: {
+                    openItem: false,
+                    showPreview: true,
+                    showStats: true
+                  }
+                },
+                visibleAssistPanels: ['sql']
               }
             }"></div>
         </div>

+ 12 - 9
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -65,16 +65,19 @@ ${ assist.assistPanel() }
           <div class="assist" data-bind="component: {
               name: 'assist-panel',
               params: {
-                sourceTypes: [{
-                  name: 'hive',
-                  type: 'hive'
-                }],
                 user: '${user.username}',
-                navigationSettings: {
-                  openItem: true,
-                  showPreview: true,
-                  showStats: false
-                }
+                sql: {
+                  sourceTypes: [{
+                    name: 'hive',
+                    type: 'hive'
+                  }],
+                  navigationSettings: {
+                    openItem: false,
+                    showPreview: true,
+                    showStats: true
+                  }
+                },
+                visibleAssistPanels: ['sql']
               }
             }"></div>
         </div>

+ 10 - 7
apps/beeswax/src/beeswax/templates/execute.mako

@@ -50,13 +50,16 @@ ${ layout.menubar(section='query') }
               params: {
                 user: HIVE_AUTOCOMPLETE_USER,
                 onlySql: true,
-                sourceTypes: editorViewModel.sqlSourceTypes,
-                activeSourceType: snippetType,
-                navigationSettings: {
-                  openItem: false,
-                  showPreview: true,
-                  showStats: true
-                }
+                sql: {
+                  sourceTypes: editorViewModel.sqlSourceTypes,
+                  activeSourceType: snippetType,
+                  navigationSettings: {
+                    openItem: false,
+                    showPreview: true,
+                    showStats: true
+                  }
+                },
+                visibleAssistPanels: ['sql']
               }
             }"></div>
           </div>

+ 12 - 9
apps/beeswax/src/beeswax/templates/import_wizard_choose_delimiter.mako

@@ -69,16 +69,19 @@ ${ assist.assistPanel() }
           <div class="assist" data-bind="component: {
               name: 'assist-panel',
               params: {
-                sourceTypes: [{
-                  name: 'hive',
-                  type: 'hive'
-                }],
                 user: '${user.username}',
-                navigationSettings: {
-                  openItem: true,
-                  showPreview: true,
-                  showStats: false
-                }
+                sql: {
+                  sourceTypes: [{
+                    name: 'hive',
+                    type: 'hive'
+                  }],
+                  navigationSettings: {
+                    openItem: false,
+                    showPreview: true,
+                    showStats: true
+                  }
+                },
+                visibleAssistPanels: ['sql']
               }
             }"></div>
         </div>

+ 12 - 9
apps/beeswax/src/beeswax/templates/import_wizard_choose_file.mako

@@ -68,16 +68,19 @@ ${ assist.assistPanel() }
           <div class="assist" data-bind="component: {
               name: 'assist-panel',
               params: {
-                sourceTypes: [{
-                  name: 'hive',
-                  type: 'hive'
-                }],
                 user: '${user.username}',
-                navigationSettings: {
-                  openItem: true,
-                  showPreview: true,
-                  showStats: false
-                }
+                sql: {
+                  sourceTypes: [{
+                    name: 'hive',
+                    type: 'hive'
+                  }],
+                  navigationSettings: {
+                    openItem: false,
+                    showPreview: true,
+                    showStats: true
+                  }
+                },
+                visibleAssistPanels: ['sql']
               }
             }"></div>
         </div>

+ 12 - 9
apps/beeswax/src/beeswax/templates/import_wizard_define_columns.mako

@@ -68,16 +68,19 @@ ${ assist.assistPanel() }
           <div class="assist" data-bind="component: {
               name: 'assist-panel',
               params: {
-                sourceTypes: [{
-                  name: 'hive',
-                  type: 'hive'
-                }],
                 user: '${user.username}',
-                navigationSettings: {
-                  openItem: true,
-                  showPreview: true,
-                  showStats: false
-                }
+                sql: {
+                  sourceTypes: [{
+                    name: 'hive',
+                    type: 'hive'
+                  }],
+                  navigationSettings: {
+                    openItem: false,
+                    showPreview: true,
+                    showStats: true
+                  }
+                },
+                visibleAssistPanels: ['sql']
               }
             }"></div>
         </div>

+ 13 - 10
apps/metastore/src/metastore/templates/describe_partitions.mako

@@ -66,16 +66,19 @@ ${ assist.assistPanel() }
           <div class="assist" data-bind="component: {
               name: 'assist-panel',
               params: {
-                sourceTypes: [{
-                  name: 'hive',
-                  type: 'hive'
-                }],
-                user: '${user.username}',
-                navigationSettings: {
-                  openItem: true,
-                  showPreview: true,
-                  showStats: false
-                }
+                sql: {
+                  sourceTypes: [{
+                    name: 'hive',
+                    type: 'hive'
+                  }],
+                  user: '${user.username}',
+                  navigationSettings: {
+                    openItem: false,
+                    showPreview: true,
+                    showStats: true
+                  }
+                },
+                visibleAssistPanels: ['sql']
               }
             }"></div>
         </div>

+ 10 - 8
apps/metastore/src/metastore/templates/metastore.mako

@@ -678,15 +678,17 @@ ${ assist.assistPanel() }
         <div class="assist" data-bind="component: {
             name: 'assist-panel',
             params: {
-              sourceTypes: [{
-                name: 'hive',
-                type: 'hive'
-              }],
               user: '${user.username}',
-              navigationSettings: {
-                openItem: true,
-                showPreview: true,
-                showStats: false
+              sql: {
+                sourceTypes: [{
+                  name: 'hive',
+                  type: 'hive'
+                }],
+                navigationSettings: {
+                  openItem: true,
+                  showPreview: true,
+                  showStats: false
+                }
               },
               visibleAssistPanels: ['sql']
             }

+ 13 - 14
desktop/core/src/desktop/templates/assist.mako

@@ -855,17 +855,18 @@ from desktop.views import _ko
 
       /**
        * @param {Object} params
-       * @param {Object[]} params.sourceTypes - All the available SQL source types
+       * @param {string} params.user
        * @param {boolean} params.onlySql - For the old query editors
        * @param {string[]} params.visibleAssistPanels - Panels that will initially be shown regardless of total storage
-       * @param {string} params.sourceTypes[].name - Example: Hive SQL
-       * @param {string} params.sourceTypes[].type - Example: hive
-       * @param {string} [params.activeSourceType] - Example: hive
-       * @param {string} params.user
-       * @param {Object} params.navigationSettings - enable/disable the links
-       * @param {boolean} params.navigationSettings.openItem - Example: true
-       * @param {boolean} params.navigationSettings.showPreview - Example: true
-       * @param {boolean} params.navigationSettings.showStats - Example: true
+       * @param {Object} params.sql
+       * @param {Object[]} params.sql.sourceTypes - All the available SQL source types
+       * @param {string} params.sql.sourceTypes[].name - Example: Hive SQL
+       * @param {string} params.sql.sourceTypes[].type - Example: hive
+       * @param {string} [params.sql.activeSourceType] - Example: hive
+       * @param {Object} params.sql.navigationSettings - enable/disable the links
+       * @param {boolean} params.sql.navigationSettings.openItem - Example: true
+       * @param {boolean} params.sql.navigationSettings.showPreview - Example: true
+       * @param {boolean} params.sql.navigationSettings.showStats - Example: true
        * @constructor
        */
       function AssistPanel (params) {
@@ -889,12 +890,10 @@ from desktop.views import _ko
 
         self.availablePanels = [
           new AssistInnerPanel({
-            panelData: new AssistDbPanel({
+            panelData: new AssistDbPanel($.extend({
               assistHelper: self.assistHelper,
-              i18n: i18n,
-              navigationSettings: params.navigationSettings,
-              sourceTypes: params.sourceTypes
-            }),
+              i18n: i18n
+            }, params.sql)),
             assistHelper: self.assistHelper,
             name: '${ _("SQL") }',
             type: 'db',

+ 11 - 9
desktop/core/src/desktop/templates/home2.mako

@@ -181,17 +181,19 @@ ${ fileBrowser.fileBrowser() }
         <div class="assist" data-bind="component: {
           name: 'assist-panel',
           params: {
-            sourceTypes: [{
-              name: 'hive',
-              type: 'hive'
-            }],
             user: '${user.username}',
-            navigationSettings: {
-              openItem: true,
-              showPreview: true,
-              showStats: false
+            sql: {
+              sourceTypes: [{
+                name: 'hive',
+                type: 'hive'
+              }],
+              navigationSettings: {
+                openItem: false,
+                showPreview: true,
+                showStats: true
+              },
             },
-            visibleAssistPanels: ['sql']
+            visibleAssistPanels: ['documents']
           }
         }"></div>
       </div>

+ 8 - 6
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -319,12 +319,14 @@ ${ require.config() }
         name: 'assist-panel',
         params: {
           user: $root.user,
-          sourceTypes: $root.sqlSourceTypes,
-          activeSourceType: $root.activeSqlSourceType,
-          navigationSettings: {
-            openItem: false,
-            showPreview: true,
-            showStats: true
+          sql: {
+            sourceTypes: $root.sqlSourceTypes,
+            activeSourceType: $root.activeSqlSourceType,
+            navigationSettings: {
+              openItem: false,
+              showPreview: true,
+              showStats: true
+            },
           },
           visibleAssistPanels: $root.editorMode ? ['sql'] : []
         }