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

MERGING RELEASE branches #37

Merged
merged 5 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: "CodeQL"

on:
push:
branches: [ "main", "develop" ]
pull_request:
branches: [ "main" ]
schedule:
- cron: "39 17 * * 0"

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ javascript ]

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{ matrix.language }}"
1 change: 1 addition & 0 deletions src/pages/ExtractsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import FeedbackIcon from "@material-ui/icons/SpeakerNotesOutlined";
import Block from "../components/Block";
import { RIGHT_EXTRACTS } from "../constants";
import {string} from "prop-types";

Check notice

Code scanning / CodeQL

Unused variable, import, function or class Note

Unused import string.

const EXTRACTS_URL = `${baseApiUrl}/tools/extracts`;

Expand Down
10 changes: 4 additions & 6 deletions src/pages/RegistersPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Dialog,
DialogContent,
DialogTitle,
DialogActions,
DialogActions
} from "@material-ui/core";

import {
Expand Down Expand Up @@ -84,7 +84,6 @@
const rights = useSelector((state) => state.core?.user?.i_user?.rights ?? []);
const [dialogState, setDialogState] = useState({});
const [popupState, setPopupState] = useState({});

const REGISTERS_URL = `${baseApiUrl}/tools/registers`;
const EXPORTS_URL = `${baseApiUrl}/tools/exports`;
const IMPORTS_URL = `${baseApiUrl}/tools/imports`;
Expand Down Expand Up @@ -141,6 +140,7 @@
});
};


const onDialogClose = (reason) => {
if (reason === "escapeKeyDown" || reason === "backdropClick") {
return;
Expand All @@ -165,10 +165,8 @@
anchorEl: null,
error: null,
});

const fileFormat = values.file.type;
let formData = new FormData();

formData.append("file", values.file);

let url_import;
Expand Down Expand Up @@ -227,7 +225,7 @@
});
}
};

console.log("TOOLS RENDERING")

Check notice

Code scanning / CodeQL

Semicolon insertion Note

Avoid automated semicolon insertion (95% of all statements in
the enclosing function
have an explicit semicolon).
return (
<>
{dialogState?.open && (
Expand Down Expand Up @@ -515,7 +513,7 @@
/>
</Grid>
<Grid item>
<Button
<Button
variant="contained"
color="primary"
onClick={(e) => openPopup(e, LOCATIONS_TYPE)}
Expand Down