-
Notifications
You must be signed in to change notification settings - Fork 14.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* step 1: broken stuff! * first steps * more adding and slicing * step 1: broken stuff! * can now filter dashboards/charts for "Edited" tabs (filter by changed_by o_m) * more updates * update recent card * add icon * Adding Expand Icon to Collapse component * more updates * clean up code * remove lock file * remove consoles * fixing subnav button height shift * lil' ascii arrows * update branch * update test part 1 * remove consoles * fix typescript * add images and update emptystate * add changes * update chart card * fix css issues from rebase * add suggestions * more changes * update tests and clear typescript errors * Update superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * update from comments * more updates.. * fix rebase * fix pesky type errors * test fixes * lint fix * Update superset-frontend/spec/javascripts/views/CRUD/welcome/Welcome_spec.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/views/CRUD/welcome/EmptyState.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/components/Menu/SubMenu.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/components/ListViewCard/index.tsx Co-authored-by: ʈᵃᵢ <tdupreetan@gmail.com> * Update superset-frontend/src/components/ListViewCard/index.tsx Co-authored-by: ʈᵃᵢ <tdupreetan@gmail.com> * add suggestions * fix lint * remove unused code * toast getrecentActivityobjs * add some suggestions * remove types for now * cypress fix * remove unused type Co-authored-by: Evan Rusackas <evan@preset.io> Co-authored-by: ʈᵃᵢ <tdupreetan@gmail.com>
- Loading branch information
1 parent
a8eb3fe
commit f7051ea
Showing
34 changed files
with
2,177 additions
and
567 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
superset-frontend/spec/javascripts/views/CRUD/welcome/ActivityTable_spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
import React from 'react'; | ||
import { styledMount as mount } from 'spec/helpers/theming'; | ||
import thunk from 'redux-thunk'; | ||
import fetchMock from 'fetch-mock'; | ||
|
||
import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; | ||
import configureStore from 'redux-mock-store'; | ||
import ActivityTable from 'src/views/CRUD/welcome/ActivityTable'; | ||
|
||
const mockStore = configureStore([thunk]); | ||
const store = mockStore({}); | ||
|
||
const chartsEndpoint = 'glob:*/api/v1/chart/?*'; | ||
const dashboardEndpoint = 'glob:*/api/v1/dashboard/?*'; | ||
const savedQueryEndpoint = 'glob:*/api/v1/saved_query/?*'; | ||
|
||
fetchMock.get(chartsEndpoint, { | ||
result: [ | ||
{ | ||
slice_name: 'ChartyChart', | ||
changed_on_utc: '24 Feb 2014 10:13:14', | ||
url: '/fakeUrl/explore', | ||
id: '4', | ||
table: {}, | ||
}, | ||
], | ||
}); | ||
|
||
fetchMock.get(dashboardEndpoint, { | ||
result: [ | ||
{ | ||
dashboard_title: 'Dashboard_Test', | ||
changed_on_utc: '24 Feb 2014 10:13:14', | ||
url: '/fakeUrl/dashboard', | ||
id: '3', | ||
}, | ||
], | ||
}); | ||
|
||
fetchMock.get(savedQueryEndpoint, { | ||
result: [], | ||
}); | ||
|
||
describe('ActivityTable', () => { | ||
const activityProps = { | ||
user: { | ||
userId: '1', | ||
}, | ||
activityFilter: 'Edited', | ||
}; | ||
const wrapper = mount(<ActivityTable {...activityProps} />, { | ||
context: { store }, | ||
}); | ||
|
||
beforeAll(async () => { | ||
await waitForComponentToPaint(wrapper); | ||
}); | ||
|
||
it('the component renders ', () => { | ||
expect(wrapper.find(ActivityTable)).toExist(); | ||
}); | ||
|
||
it('calls batch method and renders ListViewCArd', async () => { | ||
const chartCall = fetchMock.calls(/chart\/\?q/); | ||
const dashboardCall = fetchMock.calls(/dashboard\/\?q/); | ||
expect(chartCall).toHaveLength(2); | ||
expect(dashboardCall).toHaveLength(2); | ||
}); | ||
}); |
79 changes: 79 additions & 0 deletions
79
superset-frontend/spec/javascripts/views/CRUD/welcome/ChartTable_spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
import React from 'react'; | ||
import { styledMount as mount } from 'spec/helpers/theming'; | ||
import thunk from 'redux-thunk'; | ||
import fetchMock from 'fetch-mock'; | ||
import configureStore from 'redux-mock-store'; | ||
|
||
import ChartTable from 'src/views/CRUD/welcome/ChartTable'; | ||
import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; | ||
|
||
const mockStore = configureStore([thunk]); | ||
const store = mockStore({}); | ||
|
||
const chartsEndpoint = 'glob:*/api/v1/chart/?*'; | ||
const chartsInfoEndpoint = 'glob:*/api/v1/chart/_info*'; | ||
|
||
const mockCharts = [...new Array(3)].map((_, i) => ({ | ||
changed_on_utc: new Date().toISOString(), | ||
created_by: 'super user', | ||
id: i, | ||
slice_name: `cool chart ${i}`, | ||
url: 'url', | ||
viz_type: 'bar', | ||
datasource_title: `ds${i}`, | ||
thumbnail_url: '', | ||
})); | ||
|
||
fetchMock.get(chartsEndpoint, { | ||
result: mockCharts, | ||
}); | ||
|
||
fetchMock.get(chartsInfoEndpoint, { | ||
permissions: ['can_add', 'can_edit', 'can_delete'], | ||
}); | ||
|
||
describe('ChartTable', () => { | ||
const mockedProps = { | ||
user: { | ||
userId: '2', | ||
}, | ||
}; | ||
const wrapper = mount(<ChartTable {...mockedProps} />, { | ||
context: { store }, | ||
}); | ||
it('it renders', () => { | ||
expect(wrapper.find(ChartTable)).toExist(); | ||
}); | ||
|
||
it('fetches chart favorites and renders chart cards ', async () => { | ||
expect(fetchMock.calls(chartsEndpoint)).toHaveLength(1); | ||
await waitForComponentToPaint(wrapper); | ||
expect(wrapper.find('ChartCard')).toExist(); | ||
}); | ||
|
||
it('display EmptyState if there is no data', () => { | ||
fetchMock.resetHistory(); | ||
const wrapper = mount(<ChartTable {...mockedProps} />, { | ||
context: { store }, | ||
}); | ||
expect(wrapper.find('EmptyState')).toExist(); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
superset-frontend/spec/javascripts/views/CRUD/welcome/EmptyState_spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
import React from 'react'; | ||
import { styledMount as mount } from 'spec/helpers/theming'; | ||
import EmptyState from 'src/views/CRUD/welcome/EmptyState'; | ||
|
||
describe('EmptyState', () => { | ||
const variants = [ | ||
{ | ||
tab: 'Favorite', | ||
tableName: 'DASHBOARDS', | ||
}, | ||
{ | ||
tab: 'Mine', | ||
tableName: 'DASHBOARDS', | ||
}, | ||
{ | ||
tab: 'Favorite', | ||
tableName: 'CHARTS', | ||
}, | ||
{ | ||
tab: 'Mine', | ||
tableName: 'CHARTS', | ||
}, | ||
{ | ||
tab: 'Favorite', | ||
tableName: 'SAVED_QUERIES', | ||
}, | ||
{ | ||
tab: 'Mine', | ||
tableName: 'SAVED_QUEREIS', | ||
}, | ||
]; | ||
const recents = [ | ||
{ | ||
tab: 'Viewed', | ||
tableName: 'RECENTS', | ||
}, | ||
{ | ||
tab: 'Edited', | ||
tableName: 'RECENTS', | ||
}, | ||
{ | ||
tab: 'Created', | ||
tableName: 'RECENTS', | ||
}, | ||
]; | ||
variants.forEach(variant => { | ||
it(`it renders an ${variant.tab} ${variant.tableName} empty state`, () => { | ||
const wrapper = mount(<EmptyState {...variant} />); | ||
expect(wrapper).toExist(); | ||
const textContainer = wrapper.find('.ant-empty-description'); | ||
expect(textContainer.text()).toEqual( | ||
variant.tab === 'Favorite' | ||
? "You don't have any favorites yet!" | ||
: `No ${ | ||
variant.tableName === 'SAVED_QUERIES' | ||
? 'saved queries' | ||
: variant.tableName.toLowerCase() | ||
} yet`, | ||
); | ||
expect(wrapper.find('button')).toHaveLength(1); | ||
}); | ||
}); | ||
recents.forEach(recent => { | ||
it(`it renders an ${recent.tab} ${recent.tableName} empty state`, () => { | ||
const wrapper = mount(<EmptyState {...recent} />); | ||
expect(wrapper).toExist(); | ||
const textContainer = wrapper.find('.ant-empty-description'); | ||
expect(wrapper.find('.ant-empty-image').children()).toHaveLength(1); | ||
expect(textContainer.text()).toContain( | ||
`Recently ${recent.tab.toLowerCase()} charts, dashboards, and saved queries will appear here`, | ||
); | ||
}); | ||
}); | ||
}); |
Oops, something went wrong.