Skip to content

Commit 2d649d6

Browse files
authored
Merge pull request #14 from sahil143/tabs-layout
Move Applications workflow and related details page
2 parents 4931fc9 + d4bb8e0 commit 2d649d6

File tree

733 files changed

+83120
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

733 files changed

+83120
-688
lines changed

.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AUTH_URL= https://konflux-ui.apps.stone-stg-rh01.l2vh.p1.openshiftapps.com/
1+
AUTH_URL=https://konflux-ui.apps.stone-stg-rh01.l2vh.p1.openshiftapps.com/
22
REGISTRATION_URL=https://konflux-ui.apps.stone-stg-rh01.l2vh.p1.openshiftapps.com/
33
PROXY_URL=https://konflux-ui.apps.stone-stg-rh01.l2vh.p1.openshiftapps.com/
44
PROXY_WEBSOCKET_URL=wss://konflux-ui.apps.stone-stg-rh01.l2vh.p1.openshiftapps.com/

.eslintrc.cjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ module.exports = {
3030
"@typescript-eslint/no-unsafe-return": "off",
3131
"@typescript-eslint/no-unsafe-member-access": "off",
3232
"@typescript-eslint/no-redundant-type-constituents": "off",
33-
'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
33+
"@typescript-eslint/no-unsafe-enum-comparison": 'off',
34+
'react-refresh/only-export-components': ['off', { allowConstantExport: true }],
3435
camelcase: [
3536
'error',
3637
{

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Logs
2-
logs
2+
./logs
33
*.log
44
npm-debug.log*
55
yarn-debug.log*

config/jest.setup.js

+30
Original file line numberDiff line numberDiff line change
@@ -1 +1,31 @@
11
import '@testing-library/jest-dom';
2+
import { configure } from '@testing-library/react';
3+
// This adds fetch to node environment
4+
import 'whatwg-fetch';
5+
6+
// Mock Request if not available
7+
if (typeof Request !== 'function') {
8+
global.Request = class Request {
9+
constructor(input, init) {
10+
return new URL(input.toString());
11+
}
12+
};
13+
}
14+
15+
jest.mock('../src/k8s', () => ({ __esModule: true, ...jest.requireActual('../src/k8s') }));
16+
17+
jest.mock('react-router-dom', () => ({
18+
__esModule: true,
19+
...jest.requireActual('react-router-dom'),
20+
}));
21+
22+
jest.mock('../src/components/Workspace/useWorkspaceInfo', () => ({
23+
__esModule: true,
24+
...jest.requireActual('../src/components/Workspace/useWorkspaceInfo'),
25+
}));
26+
27+
afterAll(() => {
28+
jest.clearAllMocks();
29+
});
30+
31+
configure({ testIdAttribute: 'data-test' });

jest.config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ export default {
1919
'lodash-es': 'lodash',
2020
},
2121
roots: ['<rootDir>/src/'],
22-
transformIgnorePatterns: ['/node_modules/(?!@patternfly|uuid)'],
22+
transformIgnorePatterns: [
23+
'/node_modules/(?!@patternfly|uuid|lodash-es|@popperjs|i18next|d3|d3-array|delaunator|robust-predicates|internmap|react-dnd|react-dnd-html5-backend|dnd-core|@react-dnd)',
24+
],
2325
collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}', '!src/**/stories/*'],
2426
coverageDirectory: './coverage/',
2527
setupFilesAfterEnv: ['<rootDir>/config/jest.setup.js'],

package.json

+14-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"private": true,
44
"version": "0.0.0",
55
"type": "module",
6+
"homepage": "/",
67
"scripts": {
78
"build": "webpack -c ./webpack.prod.config.js",
89
"start": "dotenvx run -- webpack server --open -c ./webpack.dev.config.js",
@@ -20,18 +21,28 @@
2021
"@patternfly/react-styles": "^5.3.1",
2122
"@patternfly/react-table": "^5.3.4",
2223
"@patternfly/react-tokens": "^5.3.1",
24+
"@patternfly/react-topology": "^5.4.0",
2325
"@patternfly/react-virtualized-extension": "^5.1.0",
24-
"@tanstack/react-query": "^5.51.23",
26+
"@tanstack/react-query": "^5.59.0",
2527
"@tanstack/react-query-devtools": "^5.52.0",
2628
"classnames": "^2.5.1",
29+
"dagre": "^0.8.5",
30+
"dayjs": "^1.11.13",
31+
"file-saver": "^2.0.5",
2732
"formik": "^2.4.6",
2833
"formik-pf": "^0.0.1-alpha11",
2934
"git-url-parse": "^15.0.0",
35+
"jotai": "^2.10.1",
36+
"js-base64": "^3.7.7",
3037
"lodash-es": "^4.17.21",
3138
"react": "^18.3.1",
39+
"react-dnd": "^16.0.1",
40+
"react-dnd-html5-backend": "^16.0.1",
3241
"react-dom": "^18.3.1",
3342
"react-i18next": "^15.0.1",
3443
"react-router-dom": "^6.25.1",
44+
"sanitize-html": "^2.13.0",
45+
"showdown": "^2.1.0",
3546
"yup": "^0.32.11"
3647
},
3748
"devDependencies": {
@@ -83,7 +94,8 @@
8394
"webpack": "^5.93.0",
8495
"webpack-cli": "^5.1.4",
8596
"webpack-dev-server": "^5.0.4",
86-
"webpack-merge": "^6.0.1"
97+
"webpack-merge": "^6.0.1",
98+
"whatwg-fetch": "^3.6.20"
8799
},
88100
"sideEffects": [
89101
"*.css",

src/AppRoot/AppSideBar.tsx

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { NavLink, useLocation } from 'react-router-dom';
33
import { Nav, NavItem, NavList, PageSidebar, PageSidebarBody } from '@patternfly/react-core';
4-
import { useWorkspaceInfo } from '../components/Workspace/workspace-context';
4+
import { useWorkspaceInfo } from '../components/Workspace/useWorkspaceInfo';
55

66
export const AppSideBar: React.FC<{ isOpen: boolean }> = ({ isOpen }) => {
77
const location = useLocation();
@@ -17,6 +17,15 @@ export const AppSideBar: React.FC<{ isOpen: boolean }> = ({ isOpen }) => {
1717
<NavItem isActive={location.pathname.includes('applications')}>
1818
<NavLink to={`/workspaces/${workspace}/applications`}>Applications</NavLink>
1919
</NavItem>
20+
<NavItem isActive={location.pathname.includes('/secrets')}>
21+
<NavLink to={`/workspaces/${workspace}/secrets`}>Secrets</NavLink>
22+
</NavItem>
23+
<NavItem isActive={location.pathname.includes('/release')}>
24+
<NavLink to={`/workspaces/${workspace}/release`}>Releases</NavLink>
25+
</NavItem>
26+
<NavItem isActive={location.pathname.includes('/access')}>
27+
<NavLink to={`/workspaces/${workspace}/access`}>User Access</NavLink>
28+
</NavItem>
2029
</NavList>
2130
</Nav>
2231
</PageSidebarBody>

0 commit comments

Comments
 (0)