adding minor updates to acceleration ui

Signed-off-by: Shenoy Pratik <[email protected]>
ps48 · Oct 4, 2023 · f5febda · f5febda
1 parent 9a5a20f
commit f5febda
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 35 deletions.
diff --git a/public/components/SQLPage/acceleration_index_flyout.tsx b/public/components/SQLPage/acceleration_index_flyout.tsx
@@ -70,29 +70,29 @@ export const AccelerationIndexFlyout = ({
           </div>
         </EuiFlyoutHeader>
         <EuiFlyoutBody>
-          <h3>Acceleration index Source</h3>
-          <EuiHorizontalRule />
+          <h2>Acceleration index Source</h2>
+          <EuiHorizontalRule margin="s" />
           <EuiFlexGroup>
-            <EuiFlexItem grow={false}>
+            <EuiFlexItem>
               <h3>Data Source</h3>
               <EuiSpacer />
               <p>{dataSource}</p>
             </EuiFlexItem>
-            <EuiFlexItem grow={false}>
+            <EuiFlexItem>
               <h3>Database</h3>
               <EuiSpacer />
               <p>{database}</p>
             </EuiFlexItem>
-            <EuiFlexItem grow={false}>
+            <EuiFlexItem>
               <h3>Table</h3>
               <EuiSpacer />
               <p>{dataTable}</p>
             </EuiFlexItem>
           </EuiFlexGroup>
           <h3>Acceleration index destination</h3>
-          <EuiHorizontalRule />
+          <EuiHorizontalRule margin="s" />
           <EuiFlexGroup>
-            <EuiFlexItem grow={false}>
+            <EuiFlexItem>
               <h3>OpenSearch Index</h3>
               <EuiSpacer />
               <p>
@@ -103,23 +103,35 @@ export const AccelerationIndexFlyout = ({
             </EuiFlexItem>
           </EuiFlexGroup>
           <h3>Acceleration index actions</h3>
-          <EuiHorizontalRule />
+          <EuiHorizontalRule margin="s" />
           <EuiFlexGroup>
-            <EuiFlexItem grow={false}>
-              <EuiButton iconSide="right" fill iconType="lensApp" onClick={updateDescribeQuery}>
+            <EuiFlexItem>
+              <EuiButton
+                iconSide="right"
+                fill
+                iconType="lensApp"
+                onClick={updateDescribeQuery}
+                size="s"
+              >
                 Describe Index
               </EuiButton>
             </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButton iconSide="right" iconType="trash" onClick={updateDropQuery} color="danger">
+            <EuiFlexItem>
+              <EuiButton
+                iconSide="right"
+                iconType="trash"
+                onClick={updateDropQuery}
+                color="danger"
+                size="s"
+              >
                 Drop Index
               </EuiButton>
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlyoutBody>
         <EuiFlyoutFooter>
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
+          <EuiFlexGroup>
+            <EuiFlexItem>
               <EuiButtonEmpty iconType="cross" onClick={resetFlyout} flush="left">
                 Close
               </EuiButtonEmpty>

diff --git a/public/components/acceleration/selectors/index_type_selector.tsx b/public/components/acceleration/selectors/index_type_selector.tsx
@@ -52,11 +52,15 @@ export const IndexTypeSelector = ({
       };
       getJobId(query, http, (id: string) => {
         pollQueryStatus(id, http, (data: any[]) => {
-          const dataTableFields: DataTableFieldsType[] = data.map((field, index) => ({
-            id: `${idPrefix}${index + 1}`,
-            fieldName: field.col_name,
-            dataType: field.data_type,
-          }));
+          console.log('data', data);
+          const dataTableFields: DataTableFieldsType[] = data
+            .filter((row) => !row[0].startsWith('#'))
+            .map((row, index) => ({
+              id: `${idPrefix}${index + 1}`,
+              fieldName: row[0],
+              dataType: row[1],
+            }));
+          console.log('dataTableFields', dataTableFields);
           setAccelerationFormData({
             ...accelerationFormData,
             dataTableFields: dataTableFields,

diff --git a/public/components/acceleration/visual_editors/query_builder.tsx b/public/components/acceleration/visual_editors/query_builder.tsx
@@ -58,8 +58,7 @@ const buildSkippingIndexColumns = (skippingIndexQueryData: SkippingIndexRowType[
  * Skipping Index create query example:
  *
  * CREATE SKIPPING INDEX
- * ON datasource.database.table
- * FOR COLUMNS (
+ * ON datasource.database.table (
  *    field1 VALUE_SET,
  *    field2 PARTITION,
  *    field3 MIN_MAX,
@@ -74,8 +73,7 @@ export const skippingIndexQueryBuilder = (accelerationformData: CreateAccelerati
   const { dataSource, database, dataTable, skippingIndexQueryData } = accelerationformData;
 
   const codeQuery = `CREATE SKIPPING INDEX
-ON ${dataSource}.${database}.${dataTable}
-  FOR COLUMNS (
+ON ${dataSource}.${database}.${dataTable} (
 ${buildSkippingIndexColumns(skippingIndexQueryData)}
   ) ${buildIndexOptions(accelerationformData)}`;
 
@@ -92,8 +90,7 @@ const buildCoveringIndexColumns = (coveringIndexQueryData: string[]) => {
  * Covering Index create query example:
  *
  * CREATE INDEX index_name
- * ON datasource.database.table
- * FOR COLUMNS (
+ * ON datasource.database.table (
  *    field1,
  *    field2,
  *    field3,
@@ -114,8 +111,7 @@ export const coveringIndexQueryBuilder = (accelerationformData: CreateAccelerati
   } = accelerationformData;
 
   const codeQuery = `CREATE INDEX ${accelerationIndexName}
-ON ${dataSource}.${database}.${dataTable}
-  FOR COLUMNS (
+ON ${dataSource}.${database}.${dataTable} (
 ${buildCoveringIndexColumns(coveringIndexQueryData)}
   ) ${buildIndexOptions(accelerationformData)}`;
 

diff --git a/test/mocks/accelerationMock.ts b/test/mocks/accelerationMock.ts
@@ -202,8 +202,7 @@ export const skippingIndexBuilderMock1: CreateAccelerationForm = {
 };
 
 export const skippingIndexBuilderMockResult1 = `CREATE SKIPPING INDEX
-ON datasource.database.table
-  FOR COLUMNS (
+ON datasource.database.table (
    field1 PARTITION, 
    field2 VALUE_SET, 
    field3 MIN_MAX
@@ -234,8 +233,7 @@ export const skippingIndexBuilderMock2: CreateAccelerationForm = {
 };
 
 export const skippingIndexBuilderMockResult2 = `CREATE SKIPPING INDEX
-ON datasource.database.table
-  FOR COLUMNS (
+ON datasource.database.table (
    field1 PARTITION
   ) WITH (
 index_settings = '{"number_of_shards":5,"number_of_replicas":3}',
@@ -261,8 +259,7 @@ export const coveringIndexBuilderMock1: CreateAccelerationForm = {
 };
 
 export const coveringIndexBuilderMockResult1 = `CREATE INDEX index_name
-ON datasource.database.table
-  FOR COLUMNS (
+ON datasource.database.table (
    field1, 
    field2, 
    field3
@@ -287,8 +284,7 @@ export const coveringIndexBuilderMock2: CreateAccelerationForm = {
 };
 
 export const coveringIndexBuilderMockResult2 = `CREATE INDEX index_name
-ON datasource.database.table
-  FOR COLUMNS (
+ON datasource.database.table (
    field1
   ) WITH (
 index_settings = '{"number_of_shards":5,"number_of_replicas":3}',