Merge pull request #176 from dekart-xyz/167-fix-forking

Add dataset connection ID and dataset name to dataset insertion query
dekart-xyz · Apr 10, 2024 · 0a996d8 · 0a996d8
2 parents 1c678a3 + c1ffa8c
commit 0a996d8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/cypress/e2e/snowflake/fork.cy.js b/cypress/e2e/snowflake/fork.cy.js
@@ -29,27 +29,20 @@ describe('fork', () => {
     cy.get('textarea').type('select 0 as lat, 0 as lon', { force: true })
     cy.get(`button:contains("${copy.execute}")`).click()
     cy.get('div:contains("1 rows")', { timeout: 20000 }).should('be.visible')
-    cy.window().then(async (win) => {
-      if (!Cypress.env('CI')) {
-        originalColor = await getColorAtMapCenter(win)
-        expect(originalColor).to.be.a('string')
-      }
-    })
+
+    cy.get('span[title="Dataset setting"]').click()
+    cy.get('input#dekart-dataset-name-input').should('be.visible')
+    const randomDatasetName = `test-${Math.floor(Math.random() * 1000000)}`
+    cy.get('input#dekart-dataset-name-input').type(randomDatasetName)
+    cy.get('button#dekart-save-dataset-name-button').click()
+    cy.get(`span:contains("${randomDatasetName}")`).should('be.visible')
     cy.get('button#dekart-save-button').should('contain', 'Save')
     cy.get('button#dekart-save-button').click()
     cy.get('button#dekart-save-button').should('not.contain', 'Save*')
     cy.get('button#dekart-save-button').should('contain', 'Save')
     cy.get('button#dekart-fork-button').click()
-    cy.get('#dekart-query-status-message').should('be.empty')
-    cy.get(`button:contains("${copy.execute}")`).should('be.enabled')
-    cy.get(`button:contains("${copy.execute}")`).click()
+    cy.get('span:contains("Fork of Untitled")').should('be.visible')
     cy.get('div:contains("1 rows")', { timeout: 20000 }).should('be.visible')
-    cy.window().then(async (win) => {
-      if (!Cypress.env('CI')) {
-        const color = await getColorAtMapCenter(win)
-        expect(color).to.be.a('string')
-        expect(color).to.equal(originalColor)
-      }
-    })
+    cy.get(`span:contains("${randomDatasetName}")`).should('be.visible')
   })
 })
diff --git a/src/client/DatasetSettingsModal.js b/src/client/DatasetSettingsModal.js
@@ -15,6 +15,7 @@ function ModalFooter ({ saving, setSaving, name, datasetId }) {
     <div className={styles.modalFooter}>
       <Button
         disabled={saving}
+        id='dekart-save-dataset-name-button'
         onClick={() => {
           setSaving(true)
           dispatch(updateDatasetName(datasetId, name))
@@ -89,6 +90,7 @@ export default function DatasetSettingsModal () {
           value={name}
           onChange={(e) => setName(e.target.value)}
           disabled={saving}
+          id='dekart-dataset-name-input'
         />
       </div>
     </Modal>

diff --git a/src/server/dekart/report.go b/src/server/dekart/report.go
@@ -143,6 +143,10 @@ func (s Server) commitReportWithDatasets(ctx context.Context, report *proto.Repo
 	}
 	for i, dataset := range datasets {
 		datasetId := newDatasetIds[i]
+		var connectionId *string
+		if dataset.ConnectionId != "" {
+			connectionId = &dataset.ConnectionId
+		}
 		var queryId *string
 		var fileId *string
 		if dataset.QueryId != "" {
@@ -153,12 +157,24 @@ func (s Server) commitReportWithDatasets(ctx context.Context, report *proto.Repo
 						id,
 						query_text,
 						query_source,
-						query_source_id
+						query_source_id,
+						job_status,
+						job_result_id,
+						job_error,
+						total_rows,
+						bytes_processed,
+						result_size
 					) select
 						$1,
 						query_text,
 						query_source,
-						query_source_id
+						query_source_id,
+						job_status,
+						job_result_id,
+						job_error,
+						total_rows,
+						bytes_processed,
+						result_size
 					from queries where id=$2`,
 				newQueryID,
 				dataset.QueryId,
@@ -196,13 +212,14 @@ func (s Server) commitReportWithDatasets(ctx context.Context, report *proto.Repo
 			}
 		}
 		_, err = tx.ExecContext(ctx, `
-			INSERT INTO datasets (id, report_id, query_id, file_id, created_at)
-			VALUES($1, $2, $3, $4, $5)`,
+			INSERT INTO datasets (id, report_id, query_id, file_id, name, connection_id)
+			VALUES($1, $2, $3, $4, $5, $6)`,
 			datasetId,
 			report.Id,
 			queryId,
 			fileId,
-			time.Unix(dataset.CreatedAt, 0),
+			dataset.Name,
+			connectionId,
 		)
 		if err != nil {
 			log.Debug().Err(err).Send()