fix(dop): with default endTime cannot download log (#842) (#847)

Co-authored-by: Zero <mobius_pan@yeah.net>
erda-project · Aug 4, 2021 · 748bfb2 · 748bfb2
1 parent d6a4153
commit 748bfb2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/shell/app/common/__tests__/components/log/download-log-modal.test.tsx b/shell/app/common/__tests__/components/log/download-log-modal.test.tsx
@@ -13,22 +13,23 @@
 
 import React from 'react';
 import { DownloadLogModal } from 'common/components/log/download-log-modal';
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 import { describe, it, jest } from '@jest/globals';
 import moment from 'moment';
+import { sleep } from '../../../../../test/utils';
 
 describe('DownloadLogModal', () => {
+  const startTimestamp = 1624954155390947968;
+  const defaultPickerValue = moment(startTimestamp / 1000000).subtract(1, 'hours');
+  const anHourAgo = moment().subtract(1, 'hours');
+  const query = {
+    taskID: 1,
+    downloadAPI: '/api/log/download',
+  };
   it('DownloadLogModal should work well', () => {
     const spyOpen = jest.spyOn(window, 'open').mockImplementation(() => {});
-    const startTimestamp = 1624954155390947968;
-    const defaultPickerValue = moment(startTimestamp / 1000000).subtract(1, 'hours');
-    const anHourAgo = moment().subtract(1, 'hours');
     const cancelFn = jest.fn();
     const setFieldsValue = jest.fn();
-    const query = {
-      taskID: 1,
-      downloadAPI: '/api/log/download',
-    };
     const wrapper = shallow(<DownloadLogModal start={startTimestamp} visible query={query} onCancel={cancelFn} />);
     wrapper.prop('onOk')({ startTime: defaultPickerValue, endTime: 5 });
     expect(spyOpen).toHaveBeenLastCalledWith(
@@ -50,4 +51,21 @@ describe('DownloadLogModal', () => {
     expect(cancelFn).toHaveBeenCalledTimes(2);
     spyOpen.mockReset();
   });
+  it('should download with default endTime', async () => {
+    const spyOpen = jest.spyOn(window, 'open').mockImplementation(() => {});
+    const cancelFn = jest.fn();
+    const wrapper = mount(<DownloadLogModal start={startTimestamp} visible query={query} onCancel={cancelFn} />);
+    wrapper.find('Picker').at(0).prop('onChange')(defaultPickerValue);
+    await wrapper.find('.ant-btn-primary').simulate('click');
+    await sleep(2000);
+    expect(cancelFn).toHaveBeenCalledTimes(1);
+    expect(spyOpen).toHaveBeenCalledTimes(1);
+    wrapper.find('Picker').at(0).prop('onChange')(defaultPickerValue);
+    wrapper.find('InputNumber').at(0).prop('onChange')(1);
+    await wrapper.find('.ant-btn-primary').simulate('click');
+    await sleep(2000);
+    expect(cancelFn).toHaveBeenCalledTimes(2);
+    expect(spyOpen).toHaveBeenCalledTimes(2);
+    spyOpen.mockReset();
+  });
 });
diff --git a/shell/app/common/__tests__/components/tree/tree.test.tsx b/shell/app/common/__tests__/components/tree/tree.test.tsx
@@ -53,8 +53,8 @@ describe('TreeCategory', () => {
         onSelectNode={selectNodeFn}
       />,
     );
-    const select = wrapper.find('Select').at(0);
-    expect(wrapper.find('Select')).toExist();
+    const select = wrapper.find('.w-full').at(0);
+    expect(wrapper.find('.w-full')).toExist();
     select.prop('onSearch')();
     expect(fuzzySearch).not.toHaveBeenCalled();
     await act(async () => {

diff --git a/shell/app/common/components/log/download-log-modal.tsx b/shell/app/common/components/log/download-log-modal.tsx
@@ -78,11 +78,11 @@ const DownloadLogFormModal = ({ start, visible, query, onCancel }: IProps) => {
       name: 'endTime',
       label: i18n.t('common:duration(minutes)'),
       required: true,
+      initialValue: 60,
       getComp: ({ form }: { form: FormInstance }) => (
         <InputNumber
           min={1}
           max={60}
-          defaultValue={60}
           className="w-full"
           onChange={(duration) => {
             form.setFieldsValue({ endTime: duration });