Skip to content

Commit e51d7c8

Browse files
added selector for card refresh
1 parent 244fec2 commit e51d7c8

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/card/Card.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
updateReportDatabaseThunk,
1515
} from './CardThunks';
1616
import { forceRefreshCard, toggleReportSettings } from './CardActions';
17-
import { getReportState } from './CardSelectors';
17+
import { getCardForceRefreshQuery, getReportState } from './CardSelectors';
1818
import {
1919
getDashboardIsEditable,
2020
getDatabase,
@@ -39,7 +39,8 @@ const NeoCard = ({
3939
extensions, // A set of enabled extensions.
4040
globalParameters, // Query parameters that are globally set for the entire dashboard.
4141
dashboardSettings, // Dictionary of settings for the entire dashboard.
42-
onRemovePressed, // action to take when the card is removed. (passed from parent)
42+
onRemovePressed,// action to take when the card is removed. (passed from parent)
43+
forceRefresh,
4344
onClonePressed, // action to take when user presses the clone button
4445
onReportHelpButtonPressed, // action to take when someone clicks the 'help' button in the report settings.
4546
onTitleUpdate, // action to take when the card title is updated.
@@ -107,7 +108,7 @@ const NeoCard = ({
107108
if (!report.settingsOpen) {
108109
setActive(report.settings && report.settings.autorun !== undefined ? report.settings.autorun : true);
109110
}
110-
}, [report.query]);
111+
}, [report.query, forceRefresh]);
111112

112113
useEffect(() => {
113114
setSettingsOpen(report.settingsOpen);
@@ -226,6 +227,7 @@ const mapStateToProps = (state, ownProps) => ({
226227
ownProps && ownProps.dashboardSettings ? ownProps.dashboardSettings.pagenumber : undefined,
227228
ownProps.id
228229
),
230+
forceRefresh: getCardForceRefreshQuery(state, ownProps.id),
229231
globalParameters: { ...getGlobalParameters(state), ...getSessionParameters(state) },
230232
});
231233

src/card/CardSelectors.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@ export const getReportState = (state: any, id: any) => {
44
const { pagenumber } = state.dashboard.settings;
55
return state.dashboard.pages[pagenumber].reports.find((o) => o.id === id);
66
};
7+
8+
export const getCardForceRefreshQuery =(state: any, id: any) => {
9+
const { pagenumber } = state.dashboard.settings;
10+
return state.dashboard.pages[pagenumber].reports.find((o) => o.id === id)?.forceRefresh ;
11+
};

0 commit comments

Comments
 (0)