Skip to content

Commit 442bd02

Browse files
committed
Merge branch 'main' into resources-yaml-edit
2 parents a937eef + 7ebda58 commit 442bd02

File tree

5 files changed

+33
-24
lines changed

5 files changed

+33
-24
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# BUILD STAGE
2-
FROM node:24-slim@sha256:0cce74a5708f603925e2bf01929da8d71e92b5e2493fcfb662d5a8ffed2d8ef1 AS build-stage
2+
FROM node:24-slim@sha256:3e69116c924bfcba6c6979aff60d966c37aef56d488ce091c69d442ebec9f103 AS build-stage
33
WORKDIR /usr/src/app
44

55
# Copy package.json and package-lock.json

package-lock.json

Lines changed: 26 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"@apollo/client": "3.14.0",
2626
"@fastify/autoload": "6.3.1",
2727
"@fastify/cookie": "11.0.2",
28-
"@fastify/env": "5.0.2",
29-
"@fastify/helmet": "13.0.1",
28+
"@fastify/env": "5.0.3",
29+
"@fastify/helmet": "13.0.2",
3030
"@fastify/http-proxy": "11.3.0",
3131
"@fastify/secure-session": "8.2.0",
3232
"@fastify/sensible": "6.0.3",
@@ -49,7 +49,7 @@
4949
"diff": "^8.0.2",
5050
"dotenv": "17.2.2",
5151
"fastify": "5.6.1",
52-
"fastify-plugin": "5.0.1",
52+
"fastify-plugin": "5.1.0",
5353
"graphql": "16.11.0",
5454
"graphql-config": "5.1.5",
5555
"i18next": "25.5.2",
@@ -76,7 +76,7 @@
7676
"@types/dagre": "0.7.53",
7777
"@types/js-yaml": "4.0.9",
7878
"@types/node": "22.18.6",
79-
"@types/react": "19.1.14",
79+
"@types/react": "19.1.15",
8080
"@types/react-dom": "19.1.9",
8181
"@ui5/webcomponents-cypress-commands": "2.14.1",
8282
"@vitejs/plugin-react": "5.0.4",

src/components/Graphs/Graph.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import '@xyflow/react/dist/style.css';
77
import { NodeData, ColorBy } from './types';
88
import CustomNode from './CustomNode';
99
import { Legend, LegendItem } from './Legend';
10-
11-
import { Resource } from '../../utils/removeManagedFieldsAndFilterData.ts';
1210
import { useTranslation } from 'react-i18next';
1311
import { useGraph } from './useGraph';
1412
import { ManagedResourceItem } from '../../lib/shared/types';
1513
import { useTheme } from '../../hooks/useTheme';
1614
import { useSplitter } from '../Splitter/SplitterContext.tsx';
1715
import { YamlSidePanel } from '../Yaml/YamlSidePanel.tsx';
16+
import { Resource } from '../../utils/removeManagedFieldsAndFilterData.ts';
17+
1818

1919

2020
const nodeTypes = {

src/components/Yaml/YamlViewButton.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import styles from './YamlViewButton.module.css';
33
import { useTranslation } from 'react-i18next';
44
import { Resource } from '../../utils/removeManagedFieldsAndFilterData.ts';
55

6-
76
import { YamlIcon } from './YamlIcon.tsx';
87
import { useSplitter } from '../Splitter/SplitterContext.tsx';
98
import { YamlSidePanel } from './YamlSidePanel.tsx';

0 commit comments

Comments
 (0)