This is an automated email from the ASF dual-hosted git repository.
arafat2198 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new fab56b44a0 HDDS-11229. Chain optionals in Recon Insight (#7064)
fab56b44a0 is described below
commit fab56b44a003b0085af244df566e71b3d8569e04
Author: Smita <[email protected]>
AuthorDate: Wed Aug 28 01:21:32 2024 +0530
HDDS-11229. Chain optionals in Recon Insight (#7064)
---
.../recon/ozone-recon-web/src/views/insights/insights.tsx | 8 +++-----
.../webapps/recon/ozone-recon-web/src/views/insights/om/om.tsx | 10 +++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git
a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/insights/insights.tsx
b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/insights/insights.tsx
index f273f758ea..63f095ff7c 100644
---
a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/insights/insights.tsx
+++
b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/insights/insights.tsx
@@ -101,9 +101,7 @@ export class Insights extends
React.Component<Record<string, object>, IInsightsS
// Disable bucket selection dropdown if more than one volume is selected
// If there is only one volume, bucket selection dropdown should not be
disabled.
const isBucketSelectionDisabled = !selectedVolumes ||
- (selectedVolumes &&
- (selectedVolumes.length > 1 &&
- (volumeBucketMap.size !== 1)));
+ (selectedVolumes?.length > 1 && volumeBucketMap.size !== 1);
let bucketOptions: IOption[] = [];
// When volume is changed and more than one volume is selected,
// selected buckets value should be reset to all buckets
@@ -455,7 +453,7 @@ export class Insights extends
React.Component<Record<string, object>, IInsightsS
<Tabs.TabPane tab='File Size' key='1'>
<div className='content-div'>
{isLoading ? <span><LoadingOutlined /> Loading...</span> :
- ((fileCountsResponse && fileCountsResponse.length > 0) ?
+ ((fileCountsResponse?.length > 0) ?
<div>
<Row>
<Col xs={24} xl={18}>
@@ -506,7 +504,7 @@ export class Insights extends
React.Component<Record<string, object>, IInsightsS
<Tabs.TabPane tab='Container Size' key='2'>
<div className='content-div'>
{isLoading ? <span><LoadingOutlined /> Loading...</span> :
- ((containerCountResponse && containerCountResponse.length >
0) ?
+ ((containerCountResponse?.length > 0) ?
<div>
<Row>
<Col style={{ margin: 'auto', marginTop: '2%' }}>
diff --git
a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/insights/om/om.tsx
b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/insights/om/om.tsx
index b56e8d8151..fdd25929d0 100644
---
a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/insights/om/om.tsx
+++
b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/insights/om/om.tsx
@@ -530,7 +530,7 @@ export class Om extends React.Component<Record<string,
object>, IOmdbInsightsSta
const { request, controller } = AxiosGetHelper(mismatchEndpoint,
cancelMismatchedEndpointSignal)
cancelMismatchedEndpointSignal = controller;
request.then(mismatchContainersResponse => {
- const mismatchContainers: IContainerResponse[] =
mismatchContainersResponse && mismatchContainersResponse.data &&
mismatchContainersResponse.data.containerDiscrepancyInfo;
+ const mismatchContainers: IContainerResponse[] =
mismatchContainersResponse?.data?.containerDiscrepancyInfo && [];
this.setState({
loading: false,
@@ -567,7 +567,7 @@ export class Om extends React.Component<Record<string,
object>, IOmdbInsightsSta
const { request, controller } = AxiosGetHelper(openKeysEndpoint,
cancelOpenKeysSignal)
cancelOpenKeysSignal = controller
request.then(openKeysResponse => {
- const openKeys = openKeysResponse && openKeysResponse.data;
+ const openKeys = openKeysResponse?.data ?? {"fso": []};
let allopenKeysResponse: any[] = [];
for (let key in openKeys) {
if (Array.isArray(openKeys[key])) {
@@ -614,7 +614,7 @@ export class Om extends React.Component<Record<string,
object>, IOmdbInsightsSta
cancelDeletePendingSignal = controller;
request.then(deletePendingKeysResponse => {
- const deletePendingKeys = deletePendingKeysResponse &&
deletePendingKeysResponse.data && deletePendingKeysResponse.data.deletedKeyInfo;
+ const deletePendingKeys =
deletePendingKeysResponse?.data?.deletedKeyInfo ?? [];
//Use Summation Logic iterate through all object and find sum of all
datasize
let deletedKeyInfoData = [];
deletedKeyInfoData = deletePendingKeys &&
deletePendingKeys.flatMap((infoObject: any) => {
@@ -714,7 +714,7 @@ export class Om extends React.Component<Record<string,
object>, IOmdbInsightsSta
cancelDeletedKeysSignal = controller
request.then(deletedKeysResponse => {
let deletedContainerKeys = [];
- deletedContainerKeys = deletedKeysResponse && deletedKeysResponse.data
&& deletedKeysResponse.data.containers;
+ deletedContainerKeys = deletedKeysResponse?.data?.containers ?? [];
this.setState({
loading: false,
deletedContainerKeysDataSource: deletedContainerKeys
@@ -748,7 +748,7 @@ export class Om extends React.Component<Record<string,
object>, IOmdbInsightsSta
cancelDeletedPendingDirSignal = controller
request.then(deletePendingDirResponse => {
let deletedDirInfo = [];
- deletedDirInfo = deletePendingDirResponse &&
deletePendingDirResponse.data && deletePendingDirResponse.data.deletedDirInfo;
+ deletedDirInfo = deletePendingDirResponse?.data?.deletedDirInfo ?? [];
this.setState({
loading: false,
pendingDeleteDirDataSource: deletedDirInfo
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
