v0.30

Author: snuids

src/components/ConfigDetails.vue

@@ -789,7 +789,7 @@
           label="Query-Filter"
           key="queryfilter"
           name="queryfilter"
-          v-if="((curConfig.type === 'kibana')||(curConfig.type === 'generic-table')) && (curConfig.queryFilterChecked)"
+          v-if="((curConfig.type === 'kibana')||(curConfig.type === 'generic-table')) && (curConfig.queryFilterChecked) && (!curConfig.config.useShortUrl)"
         >
           <el-card>
             <div>

src/components/Kibana.vue

@@ -7,32 +7,7 @@
 
     <el-row v-if="config.queryBarChecked">
       <QueryBar @querychanged="queryBarChanged" @downloadasked="downloadAsked" :config="config"></QueryBar>
-      <!--el-col :span="2" style="text-align:left">
-        <span class="input-label">{{$t("generic.query")}}:</span>
-      </el-col>
-      <el-col :span="20">        
-        <el-input size="mini" :placeholder="this.$t('generic.pleaseinput')" v-model="queryField"></el-input>
-      </el-col>
-      <el-col :span="2" v-if="config.downloadChecked" style="text-alight:right">
-        <el-dropdown @command="handleCommand">
-          <el-button circle size="mini" type="primary" icon="el-icon-download"></el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="csv">
-              <v-icon class="menuicon" name="file-csv" scale="1" />
-              &nbsp;&nbsp;{{ $t("generic.downloadascsv") }}
-            </el-dropdown-item>
-            <el-dropdown-item command="xlsx">
-              <v-icon class="menuicon" name="file-excel" scale="1" />
-              &nbsp;&nbsp;{{ $t("generic.downloadasxls") }}
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </el-col-->
     </el-row>
-    <!-- <h1
-      class="kibanatitle"
-      v-show="config.config.kibanaTitle !=undefined && config.config.kibanaTitle!=''"
-    >{{config.config.kibanaTitle}}</h1> -->
 
     <div v-if="urlTooLong()">
 

src/components/appConfigEditor/KibanaEditor.vue

@@ -12,13 +12,13 @@
 
           <el-col :span="8">
             <el-form-item label="Hidden Query" :label-width="formLabelWidth">
-              <el-input size="mini" v-model="currentConfig.config.hiddenQuery" autocomplete="off"></el-input>
+              <el-input :disabled="currentConfig.config.useShortUrl" size="mini" v-model="currentConfig.config.hiddenQuery" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="Filter Column" :label-width="formLabelWidth">
-              <el-input size="mini" v-model="currentConfig.config.filtercolumn" autocomplete="off"></el-input>
+              <el-input :disabled="currentConfig.config.useShortUrl" size="mini" v-model="currentConfig.config.filtercolumn" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -74,18 +74,18 @@
         <el-form>
         <el-row>&nbsp;</el-row>
 
-        <el-row :gutter="24" style="text-align:left">
+        <el-row :gutter="24" style="text-align:left" >
           <el-col :span="8">
-            <el-form-item label :label-width="formLabelWidth">
+            <el-form-item label :label-width="formLabelWidth" >
               <el-row>
-                <el-switch
+                <el-switch :disabled="currentConfig.config.useShortUrl"
                   v-model="currentConfig.queryBarChecked"
                   active-text="Query Bar"
                   @change="query_bar_changed"
                 ></el-switch>
               </el-row>
               <el-row>
-                <el-switch v-model="currentConfig.downloadChecked" active-text="Download"></el-switch>
+                <el-switch :disabled="currentConfig.config.useShortUrl" v-model="currentConfig.downloadChecked" active-text="Download"></el-switch>
               </el-row>
               <el-row>
 
@@ -96,6 +96,7 @@
             <el-form-item label :label-width="formLabelWidth">
               <el-row>
                 <el-switch
+                  :disabled="currentConfig.config.useShortUrl"
                   v-model="currentConfig.queryFilterChecked"
                   active-text="Query Filter"
                   @change="query_filter_changed"
@@ -126,7 +127,7 @@
           <el-col :span="8">
             <el-form-item label :label-width="formLabelWidth">
             <el-row>
-              <el-switch v-model="currentConfig.hideFilter" active-text="Hide Filter"></el-switch>
+              <el-switch :disabled="currentConfig.config.useShortUrl" v-model="currentConfig.hideFilter" active-text="Hide Filter"></el-switch>
             </el-row>
             <el-row>
               <el-switch