Merge branch 'master' into linter

getredash · Jul 18, 2024 · 2e3f77e · 2e3f77e
2 parents 08ed96a + 4114227
commit 2e3f77e
Show file tree

Hide file tree

Showing 22 changed files with 222 additions and 83 deletions.
diff --git a/client/app/pages/alert/AlertView.jsx b/client/app/pages/alert/AlertView.jsx
@@ -68,13 +68,23 @@ export default class AlertView extends React.Component {
       <>
         <Title name={name} alert={alert}>
           <DynamicComponent name="AlertView.HeaderExtra" alert={alert} />
-          <Tooltip title={canEdit ? "" : "You do not have sufficient permissions to edit this alert"}>
-            <Button type="default" onClick={canEdit ? onEdit : null} className={cx({ disabled: !canEdit })}>
-              <i className="fa fa-edit m-r-5" aria-hidden="true" />
-              Edit
-            </Button>
-            {menuButton}
-          </Tooltip>
+          {canEdit ? (
+            <>
+              <Button type="default" onClick={canEdit ? onEdit : null} className={cx({ disabled: !canEdit })}>
+                <i className="fa fa-edit m-r-5" aria-hidden="true" />
+                Edit
+              </Button>
+              {menuButton}
+            </>
+          ) : (
+            <Tooltip title="You do not have sufficient permissions to edit this alert">
+              <Button type="default" onClick={canEdit ? onEdit : null} className={cx({ disabled: !canEdit })}>
+                <i className="fa fa-edit m-r-5" aria-hidden="true" />
+                Edit
+              </Button>
+              {menuButton}
+            </Tooltip>
+          )}
         </Title>
         <div className="bg-white tiled p-20">
           <Grid.Row type="flex" gutter={16}>

diff --git a/client/app/services/parameters/DateParameter.js b/client/app/services/parameters/DateParameter.js
@@ -61,7 +61,7 @@ class DateParameter extends Parameter {
       return value;
     }
 
-    const normalizedValue = moment(value);
+    const normalizedValue = moment(value, moment.ISO_8601, true);
     return normalizedValue.isValid() ? normalizedValue : null;
   }
 

diff --git a/client/app/services/query-result.js b/client/app/services/query-result.js
@@ -114,7 +114,7 @@ export function fetchDataFromJob(jobId, interval = 1000) {
 }
 
 export function isDateTime(v) {
-  return isString(v) && moment(v).isValid() && /^\d{4}-\d{2}-\d{2}T/.test(v);
+  return isString(v) && moment(v, moment.ISO_8601, true).isValid() && /^\d{4}-\d{2}-\d{2}T/.test(v);
 }
 
 class QueryResult {

diff --git a/client/cypress/integration/visualizations/table/.mocks/wide-dataset.js b/client/cypress/integration/visualizations/table/.mocks/wide-dataset.js
@@ -0,0 +1,33 @@
+const loremIpsum =
+"Lorem ipsum dolor sit amet consectetur adipiscing elit" +
+"sed do eiusmod tempor incididunt ut labore et dolore magna aliqua";
+
+export const query = `
+    SELECT '${loremIpsum}' AS a, '${loremIpsum}' AS b, '${loremIpsum}' AS c, '${loremIpsum}' AS d, '${loremIpsum}' as e
+`;
+
+export const config = {
+    itemsPerPage: 10,
+    columns: [
+        {
+            name: "a",
+            displayAs: "string",
+          },
+          {
+            name: "b",
+            displayAs: "string",
+          },
+          {
+            name: "c",
+            displayAs: "string",
+          },
+          {
+            name: "d",
+            displayAs: "string",
+          },
+          {
+            name: "e",
+            displayAs: "string",
+          }
+    ]
+}
diff --git a/client/cypress/integration/visualizations/table/table_spec.js b/client/cypress/integration/visualizations/table/table_spec.js
@@ -8,6 +8,7 @@ import * as AllCellTypes from "./.mocks/all-cell-types";
 import * as MultiColumnSort from "./.mocks/multi-column-sort";
 import * as SearchInData from "./.mocks/search-in-data";
 import * as LargeDataset from "./.mocks/large-dataset";
+import * as WideDataSet from "./.mocks/wide-dataset";
 
 function prepareVisualization(query, type, name, options) {
   return cy
@@ -98,6 +99,50 @@ describe("Table", () => {
     });
   });
 
+  describe("Fixing columns", () => {
+    it("fixes the correct number of columns", () => {
+      const { query, config } = WideDataSet;
+      prepareVisualization(query, "TABLE", "All cell types", config);
+      cy.getByTestId("EditVisualization").click();
+      cy.contains("span", "Grid").click();
+      cy.getByTestId("FixedColumns").click();
+      cy.contains(".ant-select-item-option-content", "1").click();
+      cy.contains("Save").click();
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(500); //add some waiting to make sure table visualization is saved
+
+      cy.get(".ant-table-thead")
+        .find("th.ant-table-cell-fix-left")
+        .then(fixedCols => {
+          expect(fixedCols.length).to.equal(1);
+        });
+
+      cy.get(".ant-table-content").scrollTo("right", { duration: 1000 });
+      cy.get(".ant-table-content").scrollTo("left", { duration: 1000 });
+    });
+
+    it("doesn't let user fix too many columns", () => {
+      const { query, config } = MultiColumnSort;
+      prepareVisualization(query, "TABLE", "Test data", config);
+      cy.getByTestId("EditVisualization").click();
+      cy.contains("span", "Grid").click();
+      cy.getByTestId("FixedColumns").click();
+      cy.get(".ant-select-item-option-content");
+      cy.contains(".ant-select-item-option-content", "3").should("not.exist");
+      cy.contains(".ant-select-item-option-content", "4").should("not.exist");
+    });
+
+    it("doesn't cause issues when freezing column off of page", () => {
+      const { query, config } = WideDataSet;
+      prepareVisualization(query, "TABLE", "Test data", config);
+      cy.getByTestId("EditVisualization").click();
+      cy.contains("span", "Grid").click();
+      cy.getByTestId("FixedColumns").click();
+      cy.contains(".ant-select-item-option-content", "4").click();
+      cy.contains("Save").click();
+    });
+  });
+
   it("searches in multiple columns", () => {
     const { query, config } = SearchInData;
     prepareVisualization(query, "TABLE", "Search", config).then(({ visualizationId }) => {

diff --git a/client/cypress/support/visualizations/table.js b/client/cypress/support/visualizations/table.js
@@ -1,12 +1,12 @@
 export function expectTableToHaveLength(length) {
   cy.getByTestId("TableVisualization")
-    .find("tbody tr")
+    .find("tbody tr.ant-table-row")
     .should("have.length", length);
 }
 
 export function expectFirstColumnToHaveMembers(values) {
   cy.getByTestId("TableVisualization")
-    .find("tbody tr td:first-child")
+    .find("tbody tr.ant-table-row td:first-child")
     .then($cell => Cypress.$.map($cell, item => Cypress.$(item).text()))
     .then(firstColumnCells => expect(firstColumnCells).to.have.members(values));
 }
diff --git a/migrations/versions/7205816877ec_change_type_of_json_fields_from_varchar_.py b/migrations/versions/7205816877ec_change_type_of_json_fields_from_varchar_.py
@@ -24,56 +24,56 @@ def upgrade():
         type_=JSONB(astext_type=sa.Text()),
         nullable=True,
         postgresql_using='options::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('queries', 'schedule',
         existing_type=sa.Text(),
         type_=JSONB(astext_type=sa.Text()),
         nullable=True,
         postgresql_using='schedule::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('events', 'additional_properties',
         existing_type=sa.Text(),
         type_=JSONB(astext_type=sa.Text()),
         nullable=True,
         postgresql_using='additional_properties::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('organizations', 'settings',
         existing_type=sa.Text(),
         type_=JSONB(astext_type=sa.Text()),
         nullable=True,
         postgresql_using='settings::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('alerts', 'options',
         existing_type=JSON(astext_type=sa.Text()),
         type_=JSONB(astext_type=sa.Text()),
         nullable=True,
         postgresql_using='options::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('dashboards', 'options',
         existing_type=JSON(astext_type=sa.Text()),
         type_=JSONB(astext_type=sa.Text()),
         postgresql_using='options::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('dashboards', 'layout',
         existing_type=sa.Text(),
         type_=JSONB(astext_type=sa.Text()),
         postgresql_using='layout::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('changes', 'change',
         existing_type=JSON(astext_type=sa.Text()),
         type_=JSONB(astext_type=sa.Text()),
         postgresql_using='change::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('visualizations', 'options',
         existing_type=sa.Text(),
         type_=JSONB(astext_type=sa.Text()),
         postgresql_using='options::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
     op.alter_column('widgets', 'options',
         existing_type=sa.Text(),
         type_=JSONB(astext_type=sa.Text()),
         postgresql_using='options::jsonb',
-        server_default=sa.text("'{}'::jsonb"))
+        )
 
 
 def downgrade():
@@ -83,53 +83,53 @@ def downgrade():
         type_=sa.Text(),
         postgresql_using='options::text',
         existing_nullable=True,
-        server_default=sa.text("'{}'::text"))
+        )
     op.alter_column('queries', 'schedule',
         existing_type=JSONB(astext_type=sa.Text()),
         type_=sa.Text(),
         postgresql_using='schedule::text',
         existing_nullable=True,
-        server_default=sa.text("'{}'::text"))
+        )
     op.alter_column('events', 'additional_properties',
         existing_type=JSONB(astext_type=sa.Text()),
         type_=sa.Text(),
         postgresql_using='additional_properties::text',
         existing_nullable=True,
-        server_default=sa.text("'{}'::text"))
+        )
     op.alter_column('organizations', 'settings',
         existing_type=JSONB(astext_type=sa.Text()),
         type_=sa.Text(),
         postgresql_using='settings::text',
         existing_nullable=True,
-        server_default=sa.text("'{}'::text"))
+        )
     op.alter_column('alerts', 'options',
         existing_type=JSONB(astext_type=sa.Text()),
         type_=JSON(astext_type=sa.Text()),
         postgresql_using='options::json',
         existing_nullable=True,
-        server_default=sa.text("'{}'::json"))
+        )
     op.alter_column('dashboards', 'options',
         existing_type=JSONB(astext_type=sa.Text()),
         type_=JSON(astext_type=sa.Text()),
         postgresql_using='options::json',
-        server_default=sa.text("'{}'::json"))
+        )
     op.alter_column('dashboards', 'layout',
         existing_type=JSONB(astext_type=sa.Text()),
         type_=sa.Text(),
         postgresql_using='layout::text',
-        server_default=sa.text("'{}'::text"))
+        )
     op.alter_column('changes', 'change',
         existing_type=JSONB(astext_type=sa.Text()),
         type_=JSON(astext_type=sa.Text()),
         postgresql_using='change::json',
-        server_default=sa.text("'{}'::json"))
+        )
     op.alter_column('visualizations', 'options',
         type_=sa.Text(),
         existing_type=JSONB(astext_type=sa.Text()),
         postgresql_using='options::text',
-        server_default=sa.text("'{}'::text"))
+        )
     op.alter_column('widgets', 'options',
         type_=sa.Text(),
         existing_type=JSONB(astext_type=sa.Text()),
         postgresql_using='options::text',
-        server_default=sa.text("'{}'::text"))
+        )
diff --git a/migrations/versions/fd4fc850d7ea_.py b/migrations/versions/fd4fc850d7ea_.py
@@ -28,7 +28,7 @@ def upgrade():
                existing_nullable=True,
                existing_server_default=sa.text("'{}'::jsonb"))
     ### end Alembic commands ###
-    
+
     update_query = """
     update users
     set details = details::jsonb || ('{"profile_image_url": "' || profile_image_url || '"}')::jsonb

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redash-client",
-  "version": "24.06.0-dev",
+  "version": "24.07.0-dev",
   "description": "The frontend part of Redash.",
   "main": "index.js",
   "scripts": {