Browse Source

HUE-8208 [importer] Split warning in two warning about invalid table name

Romain Rigaux 7 years ago
parent
commit
64befcc23a
1 changed files with 10 additions and 2 deletions
  1. 10 2
      desktop/libs/indexer/src/indexer/templates/importer.mako

+ 10 - 2
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -361,6 +361,8 @@ ${ assist.assistPanel() }
                     <input type="text" class="input-small" data-bind="value: createWizard.source.kafkaFieldDelimiter">
                     <input type="text" class="input-small" data-bind="value: createWizard.source.kafkaFieldDelimiter">
                   </label>
                   </label>
 
 
+                  <br/>
+
                   <label class="control-label"><div>${ _('Field names') }</div>
                   <label class="control-label"><div>${ _('Field names') }</div>
                     <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.kafkaFieldNames" placeholder="${ _('The list of fields to consume, e.g. orders,returns') }">
                     <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.kafkaFieldNames" placeholder="${ _('The list of fields to consume, e.g. orders,returns') }">
                   </label>
                   </label>
@@ -509,8 +511,14 @@ ${ assist.assistPanel() }
             <span class="help-inline muted" data-bind="visible: !isTargetExisting() && isTargetChecking()">
             <span class="help-inline muted" data-bind="visible: !isTargetExisting() && isTargetChecking()">
               <i class="fa fa-spinner fa-spin"></i>
               <i class="fa fa-spinner fa-spin"></i>
             </span>
             </span>
-            <span class="help-inline muted" data-bind="visible: ! $parent.createWizard.isValidDestination()">
-              <i class="fa fa-warning" style="color: #c09853"></i> ${ _('Empty name or invalid characters') }
+            <span class="help-inline muted" data-bind="visible: !$parent.createWizard.isValidDestination()">
+              <i class="fa fa-warning" style="color: #c09853"></i>
+              <!-- ko if: name() -->
+                ${ _('Invalid characters') }
+              <!-- /ko -->
+              <!-- ko if: !name() -->
+                ${ _('Empty name') }
+              <!-- /ko -->
             </span>
             </span>
             <span class="help-inline muted" data-bind="visible: isTargetExisting()">
             <span class="help-inline muted" data-bind="visible: isTargetExisting()">
               <i class="fa fa-warning" style="color: #c09853"></i> ${ _('Already existing') } <span data-bind="text: outputFormat"></span>
               <i class="fa fa-warning" style="color: #c09853"></i> ${ _('Already existing') } <span data-bind="text: outputFormat"></span>