Skip to content

Commit

Permalink
feat: link status and control
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kav91
Kav91 committed Aug 30, 2024
1 parent 5951828 commit 1d3171d
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 14 deletions.
4 changes: 3 additions & 1 deletion nerdlets/entity-mode/components/map/map-utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ export const rightClick = (
sourceEntityType &&
targetEntityType &&
!sourceEntityType.includes('INFRA') &&
!targetEntityType.includes('INFRA')
!targetEntityType.includes('INFRA') &&
!sourceEntityType.includes('WORKLOAD') &&
!targetEntityType.includes('WORKLOAD')
) {
// add node
let selectedEntity = null;
Expand Down
4 changes: 3 additions & 1 deletion nerdlets/observability-maps-nerdlet/components/map/map-utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ export const rightClick = (
sourceEntityType &&
targetEntityType &&
!sourceEntityType.includes('INFRA') &&
!targetEntityType.includes('INFRA')
!targetEntityType.includes('INFRA') &&
!sourceEntityType.includes('WORKLOAD') &&
!targetEntityType.includes('WORKLOAD')
) {
// add node
let selectedEntity = null;
Expand Down
69 changes: 59 additions & 10 deletions nerdlets/observability-maps-nerdlet/components/map/settings.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Modal, Button, Form } from 'semantic-ui-react';
import { writeUserDocument } from '../../lib/utils';
import { writeUserDocument, writeAccountDocument } from '../../lib/utils';
import { DataConsumer } from '../../context/data';

export default class MapSettings extends React.PureComponent {
Expand All @@ -12,7 +12,8 @@ export default class MapSettings extends React.PureComponent {
backgroundImage: null,
backgroundPosition: null,
backgroundRepeat: null,
backgroundSize: null
backgroundSize: null,
linkType: null
};
}

Expand All @@ -21,13 +22,20 @@ export default class MapSettings extends React.PureComponent {
handleChange = (e, { value }, formType) =>
this.setState({ [formType]: value });

handleSave = async (tempState, dataFetcher, mapConfig, selectedMap) => {
handleSave = async (
tempState,
dataFetcher,
mapConfig,
selectedMap,
storageLocation
) => {
const {
backgroundColor,
backgroundImage,
backgroundPosition,
backgroundRepeat,
backgroundSize
backgroundSize,
linkType
} = tempState;

if (!mapConfig.settings) {
Expand All @@ -54,9 +62,24 @@ export default class MapSettings extends React.PureComponent {
this.state.backgroundRepeat || backgroundRepeat;
mapConfig.settings.backgroundSize =
this.state.backgroundSize || backgroundSize;
mapConfig.settings.linkType = this.state.linkType || linkType;

await writeUserDocument('ObservabilityMaps', selectedMap.value, mapConfig);
await dataFetcher(['userMaps']);
if (storageLocation.type === 'user') {
await writeUserDocument(
'ObservabilityMaps',
selectedMap.value,
mapConfig
);
} else if (storageLocation.type === 'account') {
await writeAccountDocument(
storageLocation.value,
'ObservabilityMaps',
selectedMap.value,
mapConfig
);
}

await dataFetcher(['userMaps', 'accountMaps']);
};

onUnmount = updateDataContextState => {
Expand All @@ -66,7 +89,8 @@ export default class MapSettings extends React.PureComponent {
backgroundImage: null,
backgroundPosition: null,
backgroundRepeat: null,
backgroundSize: null
backgroundSize: null,
linkType: null
});
};

Expand All @@ -75,13 +99,20 @@ export default class MapSettings extends React.PureComponent {

return (
<DataConsumer>
{({ updateDataContextState, dataFetcher, mapConfig, selectedMap }) => {
{({
updateDataContextState,
dataFetcher,
mapConfig,
selectedMap,
storageLocation
}) => {
const tempState = {
backgroundColor: '',
backgroundImage: '',
backgroundPosition: '',
backgroundRepeat: '',
backgroundSize: ''
backgroundSize: '',
linkType: ''
};

if (mapConfig.settings) {
Expand All @@ -91,6 +122,7 @@ export default class MapSettings extends React.PureComponent {
mapConfig.settings.backgroundPosition;
tempState.backgroundRepeat = mapConfig.settings.backgroundRepeat;
tempState.backgroundSize = mapConfig.settings.backgroundSize;
tempState.linkType = mapConfig.settings.linkType;
}

const value = name =>
Expand Down Expand Up @@ -181,6 +213,22 @@ export default class MapSettings extends React.PureComponent {
label="Background Size"
placeholder="auto"
/>
<Form.Select
fluid
label="Link Type"
width="8"
value={value('linkType')}
options={[
{ key: 's', text: 'STRAIGHT', value: 'STRAIGHT' },
{
key: 'cs',
text: 'CURVE_SMOOTH',
value: 'CURVE_SMOOTH'
},
{ key: 'cf', text: 'CURVE_FULL', value: 'CURVE_FULL' }
]}
onChange={(e, d) => this.handleChange(e, d, 'linkType')}
/>
</Form.Group>
</Form>
<br />
Expand All @@ -194,7 +242,8 @@ export default class MapSettings extends React.PureComponent {
tempState,
dataFetcher,
mapConfig,
selectedMap
selectedMap,
storageLocation
)
}
/>
Expand Down
3 changes: 3 additions & 0 deletions nerdlets/observability-maps-nerdlet/components/observability-maps.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ export default class ObservabilityMaps extends React.Component {
}) => {
const errors = [];

d3MapConfig.link.type =
mapConfig?.settings?.linkType || 'CURVE_SMOOTH';

if (isWidget) {
if (!vizMapStorage) {
errors.push('Map storage not selected');
Expand Down
32 changes: 30 additions & 2 deletions nerdlets/observability-maps-nerdlet/context/data.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,15 @@ export class DataProvider extends Component {
}

// eslint-disable-next-line
this.setState({ storageLocation, vizMapName: mapName, vizMapStorage: mapStorage, vizAccountId: accountId, vizHideMenu: hideMenu }, async () => {
this.setState(
{
storageLocation,
vizMapName: mapName,
vizMapStorage: mapStorage,
vizAccountId: accountId,
vizHideMenu: hideMenu
},
async () => {
if (storageLocation.type === 'account') {
const maps = await this.dataFetcher(['accountMaps']);
const accountMaps = maps.accountMaps || [];
Expand Down Expand Up @@ -743,10 +751,30 @@ export class DataProvider extends Component {

// reconstruct link data for graph
const mapLinks = Object.keys((mapData || {}).linkData || {}).map(link => {
return {
const configuredLink = {
source: mapData.linkData[link].source,
target: mapData.linkData[link].target
};

const sourceNodeData =
mapData.nodeData?.[mapData.linkData[link].source];

// link alert severity handling
if (sourceNodeData.alertSeverity === 'CRITICAL') {
configuredLink.strokeWidth = 2.5;
configuredLink.color = 'red';
} else if (sourceNodeData.alertSeverity === 'WARNING') {
configuredLink.strokeWidth = 2.5;
configuredLink.color = 'orange';
} else if (sourceNodeData.alertSeverity === 'WARNING') {
configuredLink.strokeWidth = 2.5;
configuredLink.color = 'orange';
} else if (sourceNodeData.alertSeverity === 'NOT_ALERTING') {
configuredLink.strokeWidth = 2.5;
configuredLink.color = 'green';
}

return configuredLink;
});

links = [...links, ...mapLinks];
Expand Down

0 comments on commit 1d3171d

Please sign in to comment.