diff --git a/src/components/AggregationPanel/AggregationPanel.js b/src/components/AggregationPanel/AggregationPanel.js
index 1b64c0adb0..bd1ead90e3 100644
--- a/src/components/AggregationPanel/AggregationPanel.js
+++ b/src/components/AggregationPanel/AggregationPanel.js
@@ -38,16 +38,20 @@ const AggregationPanel = ({
}
}, [errorAggregatedData, setSelectedObjectId, setErrorAggregatedData]);
- const isLoading = useMemo(() =>
- depth === 0 && selectedObjectId && isLoadingCloudFunction && showAggregatedData,
- [depth, selectedObjectId, isLoadingCloudFunction, showAggregatedData]
+ const isLoading = useMemo(
+ () => depth === 0 && selectedObjectId && isLoadingCloudFunction && showAggregatedData,
+ [depth, selectedObjectId, isLoadingCloudFunction, showAggregatedData]
);
- const shouldShowAggregatedData = useMemo(() =>
- depth === 0
- ? (selectedObjectId && showAggregatedData && Object.keys(data).length !== 0 && Object.keys(errorAggregatedData).length === 0)
- : true,
- [depth, selectedObjectId, showAggregatedData, data, errorAggregatedData]
+ const shouldShowAggregatedData = useMemo(
+ () =>
+ depth === 0
+ ? selectedObjectId &&
+ showAggregatedData &&
+ Object.keys(data).length !== 0 &&
+ Object.keys(errorAggregatedData).length === 0
+ : true,
+ [depth, selectedObjectId, showAggregatedData, data, errorAggregatedData]
);
const fetchNestedData = useCallback(async () => {
@@ -137,8 +141,13 @@ const AggregationPanel = ({
if (depth > 0) {
return (
-
-
{panelTitle}
+
+
+ {panelTitle}
+
{isExpanded && (
-
)}
- {isExpanded ? '▼' : '▲'}
+ {isExpanded ? '▼' : '▲'}
{isExpanded && (
@@ -160,7 +168,8 @@ const AggregationPanel = ({
) : (
- nestedData && nestedData.panel.segments.map((segment, index) =>
+ nestedData &&
+ nestedData.panel.segments.map((segment, index) =>
renderSegmentContent(segment, index)
)
)}
@@ -178,14 +187,10 @@ const AggregationPanel = ({
) : shouldShowAggregatedData ? (
- {data.panel.segments.map((segment, index) =>
- renderSegmentContent(segment, index)
- )}
+ {data.panel.segments.map((segment, index) => renderSegmentContent(segment, index))}
) : (
- No object selected.
)}
);
diff --git a/src/components/AggregationPanel/AggregationPanelComponents.js b/src/components/AggregationPanel/AggregationPanelComponents.js
index d81ca31569..d85d05eee6 100644
--- a/src/components/AggregationPanel/AggregationPanelComponents.js
+++ b/src/components/AggregationPanel/AggregationPanelComponents.js
@@ -12,7 +12,13 @@ export const TextElement = ({ text }) => (
export const KeyValueElement = ({ item, appName }) => (
@@ -50,11 +50,11 @@ export default class DataBrowserHeaderBar extends React.Component {
!preventSort &&
(type === 'String' || type === 'Number' || type === 'Date' || type === 'Boolean')
) {
- onClick = () =>{
+ onClick = () => {
updateOrdering((order === 'descending' ? '' : '-') + name);
setSelectedObjectId(null);
- setCurrent(null)
- }
+ setCurrent(null);
+ };
}
let className = styles.wrap;
@@ -83,7 +83,7 @@ export default class DataBrowserHeaderBar extends React.Component {
const finalStyle = {};
if (headers.length % 2) {
finalStyle.background = '#726F85';
- } else{
+ } else {
finalStyle.background = '#66637A';
}
diff --git a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
index ba42c5694e..a69e8eba73 100644
--- a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
+++ b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
@@ -8,7 +8,8 @@
@import 'stylesheets/globals.scss';
.bar {
- position: absolute;
+ position: sticky;
+ z-index: 10;
top: 0;
left: 0;
height: 0;
diff --git a/src/components/Filter/Filter.react.js b/src/components/Filter/Filter.react.js
index 29397f4213..67592444ec 100644
--- a/src/components/Filter/Filter.react.js
+++ b/src/components/Filter/Filter.react.js
@@ -61,7 +61,8 @@ function changeConstraint(schema, currentClassName, filters, index, newConstrain
class: currentClassName,
field: field,
constraint: newConstraint,
- compareTo: (compareType && prevCompareTo) ? prevCompareTo : Filters.DefaultComparisons[compareType],
+ compareTo:
+ compareType && prevCompareTo ? prevCompareTo : Filters.DefaultComparisons[compareType],
});
return filters.set(index, newFilter);
}
@@ -88,7 +89,7 @@ const Filter = ({
const [compare, setCompare] = useState(false);
const hasCompareTo = filters.some(filter => filter.get('compareTo') !== undefined);
- if(compare !== hasCompareTo){
+ if (compare !== hasCompareTo) {
setCompare(hasCompareTo);
}
const currentApp = React.useContext(CurrentApp);
@@ -108,7 +109,7 @@ const Filter = ({
gap: '10px',
padding: '12px 15px 0px 15px',
color: '#343445',
- 'font-weight': '600'
+ 'font-weight': '600',
}}
>
Class
diff --git a/src/components/Label/Label.react.js b/src/components/Label/Label.react.js
index d48f5d276c..b2b3bb0021 100644
--- a/src/components/Label/Label.react.js
+++ b/src/components/Label/Label.react.js
@@ -15,7 +15,8 @@ const Label = props => {
return (
+ style={{ padding: '0 ' + padding, ...props.style }}
+ >
{props.text}
{props.description ?
{props.description}
: null}
diff --git a/src/components/Toolbar/Toolbar.react.js b/src/components/Toolbar/Toolbar.react.js
index 670cd205dc..e5e6642534 100644
--- a/src/components/Toolbar/Toolbar.react.js
+++ b/src/components/Toolbar/Toolbar.react.js
@@ -15,7 +15,7 @@ import { useNavigate, useNavigationType, NavigationType } from 'react-router-dom
const POPOVER_CONTENT_ID = 'toolbarStatsPopover';
-const Stats = ({ data, classwiseCloudFunctions, className, appId , appName}) => {
+const Stats = ({ data, classwiseCloudFunctions, className, appId, appName }) => {
const [selected, setSelected] = React.useState(null);
const [open, setOpen] = React.useState(false);
const buttonRef = React.useRef();
@@ -98,7 +98,12 @@ const Stats = ({ data, classwiseCloudFunctions, className, appId , appName}) =>
setSelected(statsOptions[0]);
}, []);
- const rightMarginStyle = classwiseCloudFunctions && classwiseCloudFunctions[`${appId}${appName}`] && classwiseCloudFunctions[`${appId}${appName}`][className] ? '120px' : 'initial';
+ const rightMarginStyle =
+ classwiseCloudFunctions &&
+ classwiseCloudFunctions[`${appId}${appName}`] &&
+ classwiseCloudFunctions[`${appId}${appName}`][className]
+ ? '120px'
+ : 'initial';
return (
<>
@@ -140,22 +145,29 @@ const Toolbar = props => {
- {props?.selectedData?.length ?