From 16aab1879504243c418eadd5f90d6ae326a1d8da Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 30 Aug 2022 16:06:19 +0530
Subject: [PATCH] test: CY fix for attachment cell handling

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui-v2/composables/useColumn.ts   |  3 +-
 .../integration/common/6f_attachments.js      | 79 ++++++-------------
 .../support/page_objects/mainPage.js          |  3 +-
 3 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useColumn.ts b/packages/nc-gui-v2/composables/useColumn.ts
index 217b836592..524072702a 100644
--- a/packages/nc-gui-v2/composables/useColumn.ts
+++ b/packages/nc-gui-v2/composables/useColumn.ts
@@ -8,7 +8,8 @@ export function useColumn(column: Ref<ColumnType>) {
 
   const uiDatatype: ComputedRef<UITypes> = computed(() => column?.value?.uidt as UITypes)
   const abstractType = computed(() =>
-    isVirtualCol(column?.value)
+    // kludge: CY test hack; column.value is being received NULL during attach cell delete operation
+    isVirtualCol(column?.value) || !column?.value
       ? null
       : SqlUiFactory.create(project.value?.bases?.[0]?.config || { client: 'mysql2' }).getAbstractType(column?.value),
   )
diff --git a/scripts/cypress-v2/integration/common/6f_attachments.js b/scripts/cypress-v2/integration/common/6f_attachments.js
index d050d0ffd9..c019c22e80 100644
--- a/scripts/cypress-v2/integration/common/6f_attachments.js
+++ b/scripts/cypress-v2/integration/common/6f_attachments.js
@@ -21,28 +21,29 @@ export const genTest = (apiType, dbType) => {
         });
 
         after(() => {
-            // cy.restoreLocalStorage();
-            // cy.wait(1000);
-
-            // mainPage.deleteColumn("testAttach");
-            //
-            // // clean up newly added rows into Country table operations
-            // // this auto verifies successfull addition of rows to table as well
-            // mainPage.getPagination(5).click();
-            // // kludge: flicker on load
-            // cy.wait(3000)
-            //
-            // // wait for page rendering to complete
-            // cy.get(".nc-grid-row").should("have.length", 10);
-            // // mainPage
-            // //     .getRow(10)
-            // //     .find(".mdi-checkbox-blank-outline")
-            // //     .click({ force: true });
-            //
-            // mainPage.getCell("Country", 10).rightclick();
-            // cy.getActiveMenu().contains("Delete Row").click();
-            //
-            // cy.closeTableTab("Country");
+            cy.restoreLocalStorage();
+            cy.wait(1000);
+
+            // clean up
+            mainPage.deleteColumn("testAttach");
+
+            // clean up newly added rows into Country table operations
+            // this auto verifies successfull addition of rows to table as well
+            mainPage.getPagination(5).click();
+            // kludge: flicker on load
+            cy.wait(3000)
+
+            // wait for page rendering to complete
+            cy.get(".nc-grid-row").should("have.length", 10);
+            // mainPage
+            //     .getRow(10)
+            //     .find(".mdi-checkbox-blank-outline")
+            //     .click({ force: true });
+
+            mainPage.getCell("Country", 10).rightclick();
+            cy.getActiveMenu().contains("Delete Row").click();
+
+            cy.closeTableTab("Country");
         });
 
         it(`Add column of type attachments`, () => {
@@ -83,6 +84,7 @@ export const genTest = (apiType, dbType) => {
                 .then(($obj) => {
                     let linkText = $obj.text().trim();
                     cy.log(linkText);
+
                     cy.visit(linkText, {
                         baseUrl: null,
                     });
@@ -102,23 +104,13 @@ export const genTest = (apiType, dbType) => {
 
                     cy.get('.nc-attachment-cell')
                       .attachFile(`sampleFiles/1.json`, { subjectType: 'drag-n-drop' });
-                    // cy.get(".nc-field-editables")
-                    //   .last()
-                    //   .find('input[type="file"]')
-                    //   .attachFile(`sampleFiles/1.json`);
 
-                    // submit button & validate
                     cy.get(".nc-form").find("button").contains("Submit").click();
 
                     cy.get(".ant-alert-message")
                       .contains("Successfully submitted form data")
                       .should("exist");
 
-                    // // submit button & validate
-                    // cy.get(".nc-form")
-                    //     .find("button")
-                    //     .contains("Submit")
-                    //     .click();
                     cy.toastWait("Saved successfully");
                 });
         });
@@ -158,29 +150,6 @@ export const genTest = (apiType, dbType) => {
             mainPage.downloadAndVerifyCsv(`Country_exported_1.csv`, verifyCsv);
             mainPage.unhideField("LastUpdate");
             mainPage.filterReset();
-
-
-            // clean up
-            mainPage.deleteColumn("testAttach");
-
-            // clean up newly added rows into Country table operations
-            // this auto verifies successfull addition of rows to table as well
-            mainPage.getPagination(5).click();
-            // kludge: flicker on load
-            cy.wait(3000)
-
-            // wait for page rendering to complete
-            cy.get(".nc-grid-row").should("have.length", 10);
-            // mainPage
-            //     .getRow(10)
-            //     .find(".mdi-checkbox-blank-outline")
-            //     .click({ force: true });
-
-            mainPage.getCell("Country", 10).rightclick();
-            cy.getActiveMenu().contains("Delete Row").click();
-
-            cy.closeTableTab("Country");
-
         });
     });
 };
diff --git a/scripts/cypress-v2/support/page_objects/mainPage.js b/scripts/cypress-v2/support/page_objects/mainPage.js
index 56e0d0ee28..81872ff808 100644
--- a/scripts/cypress-v2/support/page_objects/mainPage.js
+++ b/scripts/cypress-v2/support/page_objects/mainPage.js
@@ -226,8 +226,7 @@ export class _mainPage {
         cy.get(".ant-btn-dangerous:visible").contains("Delete").click();
         cy.wait(500)
 
-        // fix me!
-        // cy.get(`th:contains(${colName})`).should("not.exist");
+        cy.get(`th:contains(${colName})`).should("not.exist");
     };
 
     getAuthToken = () => {