Skip to content

Replace deprecated components and update ESLint config #397

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.

Sign up for GitHub

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

Merged
chrisburr merged 1 commit into from
Aug 13, 2025
Merged

Replace deprecated components and update ESLint config #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
181 changes: 117 additions & 64 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/diracx-web-components/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const compat = new FlatCompat({
allConfig: js.configs.all,
});

// This config is only for typescript files
export default [
...fixupConfigRules(
compat.extends(
Expand Down Expand Up @@ -47,6 +48,8 @@ export default [
ecmaFeatures: {
jsx: true,
},
project: ["./tsconfig.json"],
tsconfigRootDir: __dirname,
},
},

Expand All @@ -57,6 +60,7 @@ export default [
},

rules: {
"@typescript-eslint/no-deprecated": "warn",
"import/order": ["error"],
"import/no-unused-modules": ["error"],
"import/no-useless-path-segments": ["error"],
Expand Down
3 changes: 2 additions & 1 deletion packages/diracx-web-components/lint-staged.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export default {
"*.{js,ts,jsx,tsx}": "eslint --fix",
// Run eslint on the typescript files because the eslint config is only for typescript files
"*.{ts,tsx}": "eslint --fix",
"*.{js,ts,jsx,tsx,css,md}": "prettier --write",
"**/*.{ts,tsx}": () => "tsc --noEmit",
};
3 changes: 2 additions & 1 deletion packages/diracx-web-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@
"@testing-library/react": "^16.3.0",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.12",
"@typescript-eslint/eslint-plugin": "^8.24.1",
"@typescript-eslint/eslint-plugin": "^8.39.1",
"@typescript-eslint/parser": "^8.39.1",
"babel-jest": "^29.7.0",
"babel-plugin-module-resolver": "^5.0.2",
"eslint": "^9.14.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/diracx-web-components/src/components/DashboardLayout/ApplicationDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
DialogContent,
DialogContentText,
Button,
Grid,
Grid2 as Grid,
Icon,
IconButton,
} from "@mui/material";
Expand Down Expand Up @@ -66,7 +66,7 @@ export default function AppDialog({
</DialogContentText>
<Grid container spacing={2}>
{applicationList.map((app) => (
<Grid item key={app.name} xs="auto">
<Grid key={app.name} sx={{ xs: "auto", pt: 1 }}>
<Button
fullWidth
variant="outlined"
Expand Down
7 changes: 2 additions & 5 deletions packages/diracx-web-components/src/components/JobMonitor/jobDataService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function deleteJobs(

const deleteUrl = `${diracxUrl}/api/jobs/status`;

const currentDate = dayjs().toISOString();
const currentDate = dayjs().utc().toISOString();

const body = selectedIds.reduce((acc: StatusBody, jobId) => {
acc[jobId] = {
Expand Down Expand Up @@ -121,10 +121,7 @@ export function killJobs(
throw new Error("Invalid URL generated for killing jobs.");
}
const killUrl = `${diracxUrl}/api/jobs/status`;
const currentDate = dayjs()
.utc()
.format("YYYY-MM-DDTHH:mm:ss.SSSSSS[Z]")
.toString();
const currentDate = dayjs().utc().toISOString();

const body = selectedIds.reduce((acc: StatusBody, jobId) => {
acc[jobId] = {
Expand Down
Loading