Skip to content
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

[GEN-1716]: fixed ReactFlow "fit to view" #1769

Merged
merged 125 commits into from
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
c25c631
Merge pull request #1 from odigos-io/main
BenElferink Oct 20, 2024
12046ba
Refactor old ui to new product design (#1605)
alonkeyval Oct 21, 2024
6037f4c
Merge remote-tracking branch 'odigos/new-ui' into gen-1511-new-ui
BenElferink Oct 21, 2024
62934de
[GEN-1539] Refactor action api to gql (#1606)
alonkeyval Oct 22, 2024
d456363
[GEN-1540] Add update action mutation (#1607)
alonkeyval Oct 22, 2024
02682f9
Merge branch 'new-ui' of https://github.com/odigos-io/odigos into gen…
BenElferink Oct 22, 2024
522e782
feat(frontend): added actions form, and fixed bugs: empty inputs, sea…
BenElferink Oct 22, 2024
f435deb
[GEN-1541] Add delete action mutation (#1609)
alonkeyval Oct 22, 2024
9dbdc21
Lint rules (#1610)
alonkeyval Oct 22, 2024
a55f35b
fix: KeyValueInputsList would not always call onChange
BenElferink Oct 22, 2024
619bb6d
feat: custom fields with state management
BenElferink Oct 22, 2024
389fc46
fix: semicolon
BenElferink Oct 22, 2024
2487549
fix: docs link
BenElferink Oct 22, 2024
9e5224b
fix: frament & imports
BenElferink Oct 22, 2024
e4a8350
fix: MONITORING_OPTIONS from global consts
BenElferink Oct 22, 2024
a908130
fix: use const, not string
BenElferink Oct 22, 2024
38e862f
Merge pull request #2 from BenElferink/gen-1515-dynamic-action-form
BenElferink Oct 22, 2024
31f1db3
fix: dynamic signals for actions
BenElferink Oct 22, 2024
bc3bad3
fix: drawer & modal widths
BenElferink Oct 22, 2024
f1ac07b
[GEN-1546] Add delete attr new api (#1612)
alonkeyval Oct 22, 2024
254427a
[GEN-1546] Add pii masking new api (#1613)
alonkeyval Oct 22, 2024
c769731
[GEN-1513]: actions modal form (#1608)
BenElferink Oct 22, 2024
89a6594
fix: stringify for graphql
BenElferink Oct 22, 2024
9d260f4
Merge remote-tracking branch 'odigos/new-ui' into gen-1515-fix-string…
BenElferink Oct 22, 2024
19eb1fe
[GEN-1515]: fix stringify for graphql (#1615)
BenElferink Oct 27, 2024
446c37a
Merge branch 'main' into new-ui
BenElferink Oct 27, 2024
f97a5a1
Merge pull request #4 from odigos-io/new-ui
BenElferink Oct 27, 2024
944480f
[GEN-1547] Add error sampler api (#1629)
alonkeyval Oct 27, 2024
2637c1e
[GEN-1555] Add new latency sampler api (#1630)
alonkeyval Oct 27, 2024
4cedea9
[GEN-1557] Add prod sampler new api (#1631)
alonkeyval Oct 27, 2024
40f2215
[GEN-1559] Add new gql api for rename attr action (#1634)
alonkeyval Oct 27, 2024
2d4b1bb
[GEN-1517]: actions add via gql (#1635)
BenElferink Oct 27, 2024
afa1268
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 27, 2024
eff6d90
[GEN-1529]: latency sampler (#1644)
BenElferink Oct 28, 2024
536f32f
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 28, 2024
1ea39de
[GEN-1521]: update action - AddClusterInfo (#1646)
BenElferink Oct 28, 2024
fa352be
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 28, 2024
f3c1a26
[GEN-1579]: button outline (#1647)
BenElferink Oct 28, 2024
3bb2338
[GEN-1580]: useKeyDown hook fixed (#1648)
BenElferink Oct 28, 2024
a4f03d8
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 28, 2024
2a83b84
[GEN-1591]: make "add action" in overview functional (#1650)
BenElferink Oct 29, 2024
b3fa682
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 29, 2024
9ac0d13
[GEN-1583]: fix validations for "add actions" custom fields (#1651)
BenElferink Oct 29, 2024
f0a397f
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 29, 2024
33cb867
[GEN-1521]: update actions (#1652)
BenElferink Oct 29, 2024
2c13a75
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 29, 2024
d42c32b
[GEN-1593]: upgraded "status" component (#1655)
BenElferink Oct 29, 2024
3ab5c0c
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 29, 2024
c15a6ba
[GEN-1574]: delete actions (#1657)
BenElferink Oct 30, 2024
977c57b
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 30, 2024
fa609c3
[GEN-1592] Add instrumentation rules to gql (#1659)
alonkeyval Oct 30, 2024
78eda6e
[GEN-1582]: UI tweaks (#1658)
BenElferink Oct 30, 2024
6a91aba
[GEN-1603]: add rules column to overview (#1661)
BenElferink Oct 30, 2024
d95b6fe
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 30, 2024
fa5c457
fix: autocompleted notification type (#1664)
BenElferink Oct 31, 2024
cde9bdd
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 31, 2024
93bbe30
[GEN-1604]: create & get rules (#1665)
BenElferink Oct 31, 2024
7ca44f7
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Oct 31, 2024
c270e78
[GEN-1616] Add delete destination to gql (#1669)
alonkeyval Nov 3, 2024
9358337
[GEN-1601]: refetch after create/update destination (#1668)
BenElferink Nov 3, 2024
29d2e0d
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 3, 2024
08eacfe
[GEN-1581]: lists auto-focus & disable delete (#1670)
BenElferink Nov 3, 2024
240730f
[GEN-1613]: delete destination (#1672)
BenElferink Nov 3, 2024
5647431
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 3, 2024
9748362
[GEN-1620] Add metrics to gql (#1675)
alonkeyval Nov 3, 2024
8d22beb
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 3, 2024
a4a5d34
[GEN-1584]: fix close modal & animations (#1676)
BenElferink Nov 3, 2024
d933798
[GEN-1536]: scramble secret values (#1677)
BenElferink Nov 3, 2024
e53746d
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 3, 2024
2c9c79b
[GEN-1621]: add cancel modal & breakdown overview-drawer files (#1682)
BenElferink Nov 4, 2024
0dab5bd
[GEN-1626]: add mockup for overview filters (#1683)
BenElferink Nov 4, 2024
6fa1955
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 4, 2024
702e71a
[GEN-1641]: added UI for metrics (#1688)
BenElferink Nov 5, 2024
a6b6ec2
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 5, 2024
577ef58
[GEN-1646] Add destination condition and type (#1692)
alonkeyval Nov 5, 2024
746f560
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 5, 2024
0c39a29
[GEN-1642]: get metrics from API (with mockup for dev mode) (#1693)
BenElferink Nov 5, 2024
5c55719
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 5, 2024
a816fda
[GEN-1624]: refactor existing components in preparation for notificat…
BenElferink Nov 6, 2024
c790156
[GEN-1670]: kill redux, use new toasts (#1699)
BenElferink Nov 6, 2024
d9292ff
[GEN-1671]: toast animations + enriched messages (#1701)
BenElferink Nov 6, 2024
834e5ed
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 6, 2024
e15ea9a
[GEN-1672]: add logic for "go to details" button of toast notificatio…
BenElferink Nov 7, 2024
8f1cd3e
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 7, 2024
9f25eb4
[GEN-1668]: add handling for "dirty forms" (#1704)
BenElferink Nov 7, 2024
f4435c0
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 7, 2024
f596073
[GEN-1665]: formatting with prettier instead of eslint (#1705)
BenElferink Nov 10, 2024
b3b5007
[GEN-1629]: boolean store (isPolling) (#1706)
BenElferink Nov 10, 2024
1cd0a4b
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 10, 2024
0bbd34b
[GEN-1679]: added useSourceCRUD hook (#1720)
BenElferink Nov 10, 2024
eec5074
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 10, 2024
d9e8582
[GEN-1669] delete unused files (#1721)
alonkeyval Nov 10, 2024
c94d982
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 10, 2024
f32923b
[GEN-1680]: added new "toggle buttons" component (#1723)
BenElferink Nov 10, 2024
8771192
[GEN-1691] load styled on server (#1725)
alonkeyval Nov 10, 2024
5e3bb02
[GEN-1694]: search overview entities (#1731)
BenElferink Nov 11, 2024
fed3d84
Merge branch 'new-ui' of https://github.com/odigos-io/odigos
BenElferink Nov 11, 2024
b24e7c1
feat: UI tweaks in prep for overview filters
BenElferink Nov 11, 2024
5e078a4
feat: add filter action buttons
BenElferink Nov 11, 2024
5cf7fdd
feat: filter overview by namespace
BenElferink Nov 11, 2024
5cdb31e
feat: filter overview by "kind"
BenElferink Nov 11, 2024
3a371f7
feat: filter over by metrics
BenElferink Nov 11, 2024
d0748e9
feat: add logic for dropdown mutli-select
BenElferink Nov 11, 2024
d7ec9fb
fix: temporary labels for multi select
BenElferink Nov 11, 2024
b42215d
fix: dropdown smaller components
BenElferink Nov 11, 2024
80bb335
feat: multi-labels with remove buttons
BenElferink Nov 11, 2024
d10a8fd
fix: minor edits
BenElferink Nov 11, 2024
ad8323c
fix: filters is now a container
BenElferink Nov 11, 2024
29a9b27
perf: re-use styled components
BenElferink Nov 11, 2024
704e86d
fix: button alignment
BenElferink Nov 11, 2024
51bf1d3
fix: smaller components
BenElferink Nov 11, 2024
5130970
fix: continued cleanup
BenElferink Nov 11, 2024
9e3b772
feat: prepare component for error messages dropdown
BenElferink Nov 11, 2024
c868eab
feat: filter overview by error messages
BenElferink Nov 11, 2024
5f88f86
fix: toggle & dropdown
BenElferink Nov 12, 2024
52a7065
Merge branch 'odigos-ui-beta' of https://github.com/odigos-io/odigos …
BenElferink Nov 12, 2024
d1674a5
Merge branch 'odigos-ui-beta' of https://github.com/odigos-io/odigos …
BenElferink Nov 12, 2024
2abe0e4
fix: duplicates
BenElferink Nov 12, 2024
4e19e69
fix: dropdown
BenElferink Nov 12, 2024
6d2af50
Merge branch 'odigos-ui-beta' of https://github.com/odigos-io/odigos …
BenElferink Nov 12, 2024
89ab764
Merge pull request #5 from BenElferink/gen-1695
BenElferink Nov 12, 2024
05f0b0d
Merge branch 'odigos-ui-beta' of https://github.com/odigos-io/odigos
BenElferink Nov 14, 2024
e24f361
Merge branch 'odigos-ui-beta' of https://github.com/odigos-io/odigos
BenElferink Nov 17, 2024
9b886ba
Merge branch 'odigos-ui-beta' of https://github.com/odigos-io/odigos
BenElferink Nov 17, 2024
a7b0865
fix: fit to view
BenElferink Nov 17, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const MenuContainer = styled.div`
display: flex;
align-items: center;
margin: 20px 0;
padding: 0 16px;
gap: 16px;
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ToastList } from '@/components';
import MultiSourceControl from '../multi-source-control';
import { OverviewActionMenuContainer } from '../overview-actions-menu';
import { buildNodesAndEdges, NodeBaseDataFlow } from '@/reuseable-components';
import { useMetrics, useContainerWidth, useNodeDataFlowHandlers, useSourceCRUD, useDestinationCRUD, useInstrumentationRuleCRUD, useActionCRUD } from '@/hooks';
import { useMetrics, useContainerSize, useNodeDataFlowHandlers, useSourceCRUD, useDestinationCRUD, useInstrumentationRuleCRUD, useActionCRUD } from '@/hooks';

const AllDrawers = dynamic(() => import('../all-drawers'), {
ssr: false,
Expand All @@ -17,7 +17,7 @@ const AllModals = dynamic(() => import('../all-modals'), {
});

export const OverviewDataFlowWrapper = styled.div`
width: calc(100% - 64px);
width: 100%;
height: calc(100vh - 176px);
position: relative;
`;
Expand All @@ -31,7 +31,8 @@ export default function OverviewDataFlowContainer() {
const { actions } = useActionCRUD();
const { destinations } = useDestinationCRUD();
const { instrumentationRules } = useInstrumentationRuleCRUD();
const { containerRef, containerWidth } = useContainerWidth();
const { containerRef, containerWidth, containerHeight } = useContainerSize();

const { handleNodeClick } = useNodeDataFlowHandlers({
rules: instrumentationRules,
sources,
Expand All @@ -48,10 +49,11 @@ export default function OverviewDataFlowContainer() {
destinations,
metrics,
containerWidth,
containerHeight,
nodeWidth: NODE_WIDTH,
nodeHeight: NODE_HEIGHT,
});
}, [instrumentationRules, sources, actions, destinations, metrics, containerWidth]);
}, [instrumentationRules, sources, actions, destinations, metrics, containerWidth, containerHeight]);

return (
<OverviewDataFlowWrapper ref={containerRef}>
Expand Down
2 changes: 1 addition & 1 deletion frontend/webapp/hooks/common/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './useContainerWidth';
export * from './useContainerSize';
export * from './useOnClickOutside';
export * from './useKeyDown';
export * from './useTimeAgo';
25 changes: 25 additions & 0 deletions frontend/webapp/hooks/common/useContainerSize.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { useEffect, useState, useRef } from 'react';

export function useContainerSize() {
const containerRef = useRef<HTMLDivElement | null>(null);
const [containerWidth, setContainerWidth] = useState<number>(0);
const [containerHeight, setContainerHeight] = useState<number>(0);

useEffect(() => {
const resize = () => {
if (containerRef.current) {
const { width, height } = containerRef.current.getBoundingClientRect();

setContainerWidth(width);
setContainerHeight(height);
}
};

resize();

window.addEventListener('resize', resize);
return () => window.removeEventListener('resize', resize);
}, []);

return { containerRef, containerWidth, containerHeight };
}
23 changes: 0 additions & 23 deletions frontend/webapp/hooks/common/useContainerWidth.ts

This file was deleted.

43 changes: 30 additions & 13 deletions frontend/webapp/reuseable-components/nodes-data-flow/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export const buildNodesAndEdges = ({
destinations,
metrics,
containerWidth,
containerHeight,
nodeWidth,
nodeHeight,
}: {
Expand All @@ -64,6 +65,7 @@ export const buildNodesAndEdges = ({
destinations: ActualDestination[];
metrics?: OverviewMetricsResponse;
containerWidth: number;
containerHeight: number;
nodeWidth: number;
nodeHeight: number;
}) => {
Expand All @@ -77,33 +79,32 @@ export const buildNodesAndEdges = ({
};
}

// Calculate positions for each node
const startX = 0;
const endX = (containerWidth <= 1500 ? 1500 : containerWidth) - nodeWidth;
const startX = 24;
const endX = (containerWidth <= 1500 ? 1500 : containerWidth) - nodeWidth - 40 - startX;
const getY = (idx?: number) => nodeHeight * ((idx || 0) + 1);

const postions = {
rules: {
x: startX,
y: (idx?: number) => nodeHeight * ((idx || 0) + 1),
y: getY,
},
sources: {
x: getValueForRange(containerWidth, [
[0, 1500, endX / 3.5],
[1500, 1600, endX / 4],
[1600, null, endX / 4.5],
[0, 1600, endX / 3.5],
[1600, null, endX / 4],
]),
y: (idx?: number) => nodeHeight * ((idx || 0) + 1),
y: getY,
},
actions: {
x: getValueForRange(containerWidth, [
[0, 1500, endX / 1.55],
[1500, 1600, endX / 1.6],
[1600, null, endX / 1.65],
[0, 1600, endX / 1.55],
[1600, null, endX / 1.6],
]),
y: (idx?: number) => nodeHeight * ((idx || 0) + 1),
y: getY,
},
destinations: {
x: endX,
y: (idx?: number) => nodeHeight * ((idx || 0) + 1),
y: getY,
},
};

Expand Down Expand Up @@ -331,6 +332,22 @@ export const buildNodesAndEdges = ({
});
}

tempNodes['rules'].push(
createNode(
'hidden',
'hidden',
postions['rules']['x'],
containerHeight,
{},
{
width: 1,
height: 1,
opacity: 0,
pointerEvents: 'none',
},
),
);

Object.values(tempNodes).forEach((arr) => nodes.push(...arr));

return { nodes, edges };
Expand Down
13 changes: 12 additions & 1 deletion frontend/webapp/reuseable-components/nodes-data-flow/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,18 @@ export function NodeBaseDataFlow({ nodes, edges, onNodeClick, nodeWidth }: NodeB
<FlowWrapper>
<ReactFlow nodes={nodes} nodeTypes={nodeTypes} edges={edges} edgeTypes={edgeTypes} onNodeClick={onNodeClick} zoomOnScroll={false} fitView={false}>
<ControllerWrapper>
<Controls position='bottom-left' orientation='horizontal' showZoom showFitView showInteractive={false} />
<Controls
position='bottom-left'
orientation='horizontal'
showInteractive={false}
showZoom
showFitView
fitViewOptions={{
duration: 300,
padding: 0.02,
includeHiddenNodes: true,
}}
/>
</ControllerWrapper>
</ReactFlow>
</FlowWrapper>
Expand Down
Loading