Skip to content

fix: Info panel not showing when some apps miss infoPanel config #2627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update fix
  • Loading branch information
unknown committed Dec 20, 2024
commit f12995756609fac9015320063da87e1927e7c19c
8 changes: 4 additions & 4 deletions src/components/Toolbar/Toolbar.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { useNavigate, useNavigationType, NavigationType } from 'react-router-dom

const POPOVER_CONTENT_ID = 'toolbarStatsPopover';

const Stats = ({ data, classwiseCloudFunctions, className, appId }) => {
const Stats = ({ data, classwiseCloudFunctions, className, appId , appName}) => {
const [selected, setSelected] = React.useState(null);
const [open, setOpen] = React.useState(false);
const buttonRef = React.useRef();
Expand Down Expand Up @@ -98,7 +98,7 @@ const Stats = ({ data, classwiseCloudFunctions, className, appId }) => {
setSelected(statsOptions[0]);
}, []);

const rightMarginStyle = classwiseCloudFunctions && classwiseCloudFunctions[appId] && classwiseCloudFunctions[appId][className] ? '120px' : 'initial';
const rightMarginStyle = classwiseCloudFunctions && classwiseCloudFunctions[`${appId}${appName}`] && classwiseCloudFunctions[`${appId}${appName}`][className] ? '120px' : 'initial';

return (
<>
Expand Down Expand Up @@ -140,9 +140,9 @@ const Toolbar = props => {
</div>
</div>
</div>
{props?.selectedData?.length ? <Stats data={props.selectedData} classwiseCloudFunctions={props.classwiseCloudFunctions} className={props.className} appId={props.appId} /> : null}
{props?.selectedData?.length ? <Stats data={props.selectedData} classwiseCloudFunctions={props.classwiseCloudFunctions} className={props.className} appId={props.appId} appName={props.appName}/> : null}
<div className={styles.actions}>{props.children}</div>
{props.classwiseCloudFunctions && props.classwiseCloudFunctions[props.appId] && props.classwiseCloudFunctions[props.appId][props.className] && (
{props.classwiseCloudFunctions && props.classwiseCloudFunctions[`${props.appId}${props.appName}`] && props.classwiseCloudFunctions[`${props.appId}${props.appName}`][props.className] && (
<button
onClick={props.togglePanel}
className={styles.btn}
Expand Down
14 changes: 8 additions & 6 deletions src/dashboard/Data/Browser/Browser.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ class Browser extends DashboardView {
const params = {
objectId: objectId,
};
const cloudCodeFunction = this.state.classwiseCloudFunctions[appId][className][0].cloudCodeFunction;

const appName = this.props.params.appId;
const cloudCodeFunction = this.state.classwiseCloudFunctions[`${appId}${appName}`]?.[className][0].cloudCodeFunction;
Parse.Cloud.run(cloudCodeFunction, params).then(
result => {
if (result && result.panel && result.panel && result.panel.segments) {
Expand Down Expand Up @@ -328,13 +328,14 @@ class Browser extends DashboardView {
classAndCloudFuntionMap(data) {
const classMap = {};
data.apps.forEach(app => {
classMap[app.appId] = {};
const appName = app.appName;
classMap[`${app.appId}${appName}`] = {};
app.infoPanel && app.infoPanel.forEach(panel => {
panel.classes.forEach(className => {
if (!classMap[app.appId][className]) {
classMap[app.appId][className] = [];
if (!classMap[`${app.appId}${appName}`][className]) {
classMap[`${app.appId}${appName}`][className] = [];
}
classMap[app.appId][className].push({
classMap[`${app.appId}${appName}`][className].push({
title: panel.title,
cloudCodeFunction: panel.cloudCodeFunction,
classes: panel.classes,
Expand Down Expand Up @@ -2067,6 +2068,7 @@ class Browser extends DashboardView {
setAggregationPanelData={this.setAggregationPanelData}
setErrorAggregatedData={this.setErrorAggregatedData}
errorAggregatedData={this.state.errorAggregatedData}
appName = {this.props.params.appId}
/>
);
}
Expand Down
4 changes: 3 additions & 1 deletion src/dashboard/Data/Browser/BrowserToolbar.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ const BrowserToolbar = ({
togglePanel,
isPanelVisible,
classwiseCloudFunctions,
appId
appId,
appName
}) => {
const selectionLength = Object.keys(selection).length;
const isPendingEditCloneRows = editCloneRows && editCloneRows.length > 0;
Expand Down Expand Up @@ -278,6 +279,7 @@ const BrowserToolbar = ({
isPanelVisible={isPanelVisible}
classwiseCloudFunctions={classwiseCloudFunctions}
appId={appId}
appName = {appName}
>
{onAddRow && (
<a className={classes.join(' ')} onClick={onClick}>
Expand Down
3 changes: 2 additions & 1 deletion src/dashboard/Data/Browser/DataBrowser.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default class DataBrowser extends React.Component {
this.setState({ order });
}
if (props && props.className) {
if (!props.classwiseCloudFunctions?.[props.app.applicationId]?.[props.className]) {
if (!props.classwiseCloudFunctions?.[`${props.app.applicationId}${props.appName}`]?.[props.className]) {
this.setState({ isPanelVisible: false });
this.setState({ selectedObjectId: undefined });
}
Expand Down Expand Up @@ -643,6 +643,7 @@ export default class DataBrowser extends React.Component {
togglePanel={this.togglePanelVisibility}
isPanelVisible={this.state.isPanelVisible}
appId={this.props.app.applicationId}
appName = {this.props.appName}
{...other}
/>

Expand Down