feat: filter button for graph view #354
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import React, { useState, useCallback, useMemo } from 'react'; | ||
| import { ReactFlow, Background, Controls, MarkerType, Node } from '@xyflow/react'; | ||
| import { Button, Popover } from '@ui5/webcomponents-react'; | ||
| import type { NodeProps } from '@xyflow/react'; | ||
| import styles from './Graph.module.css'; | ||
| import '@xyflow/react/dist/style.css'; | ||
| import { NodeData, ColorBy } from './types'; | ||
|
|
@@ -32,7 +32,8 @@ const Graph: React.FC = () => { | |
| const { t } = useTranslation(); | ||
| const { openInAside } = useSplitter(); | ||
| const { isDarkTheme } = useTheme(); | ||
| const [colorBy, setColorBy] = useState<ColorBy>('source'); | ||
| const [filterPopoverOpen, setFilterPopoverOpen] = useState(false); | ||
|
|
||
| const handleYamlClick = useCallback( | ||
| (item: ManagedResourceItem) => { | ||
|
|
@@ -92,37 +93,56 @@ const Graph: React.FC = () => { | |
| > | ||
| <Controls showInteractive={false} /> | ||
| <Background /> | ||
| </ReactFlow> | ||
|
|
||
| <div className={styles.topLegendContainer}> | ||
|
Contributor
There was a problem hiding this comment. Any reason for replacing the Can't we just position the panel to |
||
| <Legend legendItems={legendItems} /> | ||
| <Popover | ||
| opener="filter-button" | ||
| open={filterPopoverOpen} | ||
| placement="Bottom" | ||
| onClose={() => setFilterPopoverOpen(false)} | ||
| > | ||
| <div className={styles.popoverButtonContainer}> | ||
| <Button | ||
| design={colorBy === 'source' ? 'Emphasized' : 'Default'} | ||
| onClick={() => { | ||
| setColorBy('source'); | ||
| setFilterPopoverOpen(false); | ||
| }} | ||
| > | ||
| {t('Graphs.colorsProvider')} | ||
| </Button> | ||
| <Button | ||
| design={colorBy === 'provider' ? 'Emphasized' : 'Default'} | ||
| onClick={() => { | ||
| setColorBy('provider'); | ||
| setFilterPopoverOpen(false); | ||
| }} | ||
| > | ||
| {t('Graphs.colorsProviderConfig')} | ||
| </Button> | ||
| <Button | ||
| design={colorBy === 'flux' ? 'Emphasized' : 'Default'} | ||
| onClick={() => { | ||
| setColorBy('flux'); | ||
| setFilterPopoverOpen(false); | ||
| }} | ||
| > | ||
| {t('Graphs.colorsFlux')} | ||
| </Button> | ||
| </div> | ||
| </Popover> | ||
| <div className={styles.filterIcon}> | ||
| <Button | ||
| id="filter-button" | ||
|
Contributor
There was a problem hiding this comment. Can we use |
||
| design="Transparent" | ||
| icon="filter" | ||
| tooltip={t('Graphs.colorizedTitle')} | ||
|
Contributor
There was a problem hiding this comment. There’s a colon in the tooltip which we should remove. Could also think of moving the text as a header of the popover. Another idea would be to call it something like "color by" because we're not really filtering or grouping (in a sense of rearranging content), are we? There are also other icons like sap-icon://legend or sap-icon://palette – just as an idea. Leaving it up to you ✌️ |
||
| onClick={() => setFilterPopoverOpen(!filterPopoverOpen)} | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2,7 +2,7 @@ import { useMemo, useEffect, useState } from 'react'; | |||||
| import { useApiResource, useProvidersConfigResource } from '../../lib/api/useApiResource'; | ||||||
| import { ManagedResourcesRequest } from '../../lib/api/types/crossplane/listManagedResources'; | ||||||
| import { resourcesInterval } from '../../lib/shared/constants'; | ||||||
| import { Node, Edge, Position } from '@xyflow/react'; | ||||||
| import dagre from 'dagre'; | ||||||
| import { NodeData, ColorBy } from './types'; | ||||||
| import { buildTreeData, generateColorMap } from './graphUtils'; | ||||||
|
|
@@ -24,14 +24,18 @@ function buildGraph( | |||||
| treeData.forEach((n) => { | ||||||
| const colorKey: string = | ||||||
| colorBy === 'source' ? n.providerType : colorBy === 'flux' ? (n.fluxName ?? 'default') : n.providerConfigName; | ||||||
| const borderColor = colorMap[colorKey] || '#ccc'; | ||||||
| // 8% opacity for background | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
It's 8/255, so about 3% opacity. |
||||||
| const backgroundColor = `${borderColor}08`; | ||||||
Lasserich marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
||||||
| const node: Node<NodeData> = { | ||||||
| id: n.id, | ||||||
| type: 'custom', | ||||||
| data: { ...n }, | ||||||
| style: { | ||||||
| border: `2px solid ${borderColor}`, | ||||||
| borderRadius: 8, | ||||||
| backgroundColor, | ||||||
| width: nodeWidth, | ||||||
| height: nodeHeight, | ||||||
| }, | ||||||
|
|
@@ -53,7 +57,7 @@ function buildGraph( | |||||
| id: `e-${n.parentId}-${n.id}`, | ||||||
| source: n.parentId, | ||||||
| target: n.id, | ||||||
| style: { strokeWidth: 2, stroke: '#888' }, | ||||||
| }); | ||||||
| } | ||||||
| n.extraRefs?.forEach((refId) => { | ||||||
|
|
@@ -63,7 +67,7 @@ function buildGraph( | |||||
| id: `e-${refId}-${n.id}`, | ||||||
| source: refId, | ||||||
| target: n.id, | ||||||
| style: { strokeWidth: 2, stroke: '#888' }, | ||||||
| }); | ||||||
| } | ||||||
| }); | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's only for the container? What do you thing about giving it more precise name?