fix it

apache · Dec 18, 2020 · 953aeb4 · 953aeb4
1 parent fa23e55
commit 953aeb4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
@@ -138,20 +138,15 @@ describe('Time range filter', () => {
     cy.visitChartByParams(JSON.stringify(formData));
     cy.verifySliceSuccess({ waitAlias: '@postJson' });
 
-    cy.get('[data-test=time_range]').within(() => {
-      cy.get('span.label').click();
-    });
-
-    cy.get('#filter-popover').within(() => {
-      cy.get('div.ant-tabs-tabpane-active').within(() => {
-        cy.get('div.PopoverSection :not(.dimmed)').within(() => {
-          cy.get('input[value="100 years ago"]');
-          cy.get('input[value="now"]');
-        });
+    cy.get('[data-test=time-range-trigger]').click().then(() => {
+      cy.get('.ant-modal-footer').find('button').its('length').should('eq', 3)
+      cy.get('.ant-modal-body').within(() => {
+        cy.get('input[value="100 years ago"]');
+        cy.get('input[value="now"]');
       });
+      cy.get('[data-test=modal-cancel-button]').click();
+      cy.get('[data-test=time-range-modal]').should('not.be.visible');
     });
-    cy.get('#filter-popover button').contains('Ok').click();
-    cy.get('#filter-popover').should('not.be.visible');
   });
 });
 

diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx
@@ -658,9 +658,7 @@ export default function DateFilterControl(props: DateFilterLabelProps) {
               <Row>
                 <DatePicker
                   showTime
-                  // @ts-ignore
                   value={dttmToMoment(sinceDatetime)}
-                  // @ts-ignore
                   onChange={(datetime: Moment) =>
                     onCustomRangeChange(
                       'sinceDatetime',
@@ -714,9 +712,7 @@ export default function DateFilterControl(props: DateFilterLabelProps) {
               <Row>
                 <DatePicker
                   showTime
-                  // @ts-ignore
                   value={dttmToMoment(untilDatetime)}
-                  // @ts-ignore
                   onChange={(datetime: Moment) =>
                     onCustomRangeChange(
                       'untilDatetime',
@@ -777,9 +773,7 @@ export default function DateFilterControl(props: DateFilterLabelProps) {
                 <Col>
                   <DatePicker
                     showTime
-                    // @ts-ignore
                     value={dttmToMoment(anchorValue)}
-                    // @ts-ignore
                     onChange={(datetime: Moment) =>
                       onCustomRangeChange(
                         'anchorValue',
@@ -802,12 +796,13 @@ export default function DateFilterControl(props: DateFilterLabelProps) {
       <ControlHeader {...props} />
       <Label
         className="pointer"
-        data-test="popover-trigger"
+        data-test="time-range-trigger"
         onClick={() => setShow(true)}
       >
         {actualTimeRange}
       </Label>
       <Modal
+        name="time-range" // data-test=time-range-modal
         title={
           <IconWrapper>
             <Icon name="edit-alt" />
@@ -817,7 +812,7 @@ export default function DateFilterControl(props: DateFilterLabelProps) {
         show={show}
         onHide={onHide}
         footer={[
-          <Button buttonStyle="secondary" cta key="cancel" onClick={onHide}>
+          <Button buttonStyle="secondary" cta key="cancel" onClick={onHide} data-test="modal-cancel-button">
             {t('CANCEL')}
           </Button>,
           <Button