15271191055

Committed 27 May 2025 09:05AM UTC coverage: 57.382% (+0.1%) from 57.253%

Build # 15271191055

Build Type

push

github

Committed by Hang Le

Commit Message

Update React to version 19 (merge commit)

Merge branch 'feature/upgrade-react-v19' into 'main'
* Fix styles and Home view's filter error

* Update React to version 19

Closes #1026
See merge request https://gitlab.ci.csc.fi/sds-dev/sd-submit/metadata-submitter-frontend/-/merge_requests/1116

Approved-by: Monika Radaviciute <mradavic@csc.fi>
Merged by Hang Le <lhang@csc.fi>

Run Details

645 of 927 branches covered (69.58%)

Branch coverage included in aggregate %.

78 of 107 new or added lines in 19 files covered. (72.9%)

4 existing lines in 2 files now uncovered.

6149 of 10913 relevant lines covered (56.35%)

4.81 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

89.66

/src/components/SubmissionWizard/WizardSteps/WizardAddObjectStep.tsx

import CircularProgress from "@mui/material/CircularProgress"
import Grid from "@mui/material/Grid"
import { styled } from "@mui/system"

import WizardAddObjectCard from "../WizardComponents/WizardAddObjectCard"

import WizardDacPoliciesStep from "components/SubmissionWizard/WizardSteps/WizardDacPoliciesStep"
import { ObjectTypes } from "constants/wizardObject"
import { useAppSelector } from "hooks"
import type { HandlerRef } from "types"

const GridContainer = styled(Grid)({
  margin: 0,
  width: "100%",
  "& > :first-of-type": {
    paddingLeft: 0,
  },
  "& > :last-child": {
    paddingRight: 0,
  },
  "& .MuiGrid-item": {
    paddingTop: 0,
  },
})

const ObjectInfo = styled("div")({
  margin: 2,
})

/**
 * Show selection for object and submission types and correct form based on users choice.
 */
const WizardAddObjectStep = ({ formRef }: { formRef?: HandlerRef }) => {
  const objectType = useAppSelector(state => state.objectType)
  const loading = useAppSelector(state => state.loading)
  const openedXMLModal = useAppSelector(state => state.openedXMLModal)

  return (
    <>
      <GridContainer container spacing={2}>
        <Grid size={{ xs: 12 }}>
          {objectType === "" ? (
            <ObjectInfo>
              <p>Add objects by clicking the name, then fill form or upload XML File.</p>
              <p>You can also add objects and edit them after saving your draft.</p>
            </ObjectInfo>
          ) : objectType === ObjectTypes.dacPolicies ? (
            <WizardDacPoliciesStep />
          ) : (
            <WizardAddObjectCard formRef={formRef} />
          )}
        </Grid>

        <Grid>
          {!openedXMLModal && loading && (
            <Grid container justifyContent="center">
              <CircularProgress />
            </Grid>
          )}
        </Grid>
      </GridContainer>
    </>
  )
}

export default WizardAddObjectStep

1	import CircularProgress from "@mui/material/CircularProgress"	1✔
2	import Grid from "@mui/material/Grid"	1✔
3	import { styled } from "@mui/system"	1✔
4
5	import WizardAddObjectCard from "../WizardComponents/WizardAddObjectCard"	1✔
6
7	import WizardDacPoliciesStep from "components/SubmissionWizard/WizardSteps/WizardDacPoliciesStep"	1✔
8	import { ObjectTypes } from "constants/wizardObject"	1✔
9	import { useAppSelector } from "hooks"	1✔
10	import type { HandlerRef } from "types"
11
12	const GridContainer = styled(Grid)({	1✔
13	margin: 0,	1✔
14	width: "100%",	1✔
15	"& > :first-of-type": {	1✔
16	paddingLeft: 0,	1✔
17	},	1✔
18	"& > :last-child": {	1✔
19	paddingRight: 0,	1✔
20	},	1✔
21	"& .MuiGrid-item": {	1✔
22	paddingTop: 0,	1✔
23	},	1✔
24	})	1✔
25
26	const ObjectInfo = styled("div")({	1✔
27	margin: 2,	1✔
28	})	1✔
29
30	/**
31	* Show selection for object and submission types and correct form based on users choice.
32	*/
33	const WizardAddObjectStep = ({ formRef }: { formRef?: HandlerRef }) => {	1✔
34	const objectType = useAppSelector(state => state.objectType)	3✔
35	const loading = useAppSelector(state => state.loading)	3✔
36	const openedXMLModal = useAppSelector(state => state.openedXMLModal)	3✔
37
38	return (	3✔
39	<>	3✔
40	<GridContainer container spacing={2}>	3✔
41	<Grid size={{ xs: 12 }}>	3✔
42	{objectType === "" ? (	3✔
43	<ObjectInfo>	1✔
44	<p>Add objects by clicking the name, then fill form or upload XML File.</p>	1✔
45	<p>You can also add objects and edit them after saving your draft.</p>	1✔
46	</ObjectInfo>	1✔
47	) : objectType === ObjectTypes.dacPolicies ? (	2!
NEW 48	<WizardDacPoliciesStep />	×
49	) : (
50	<WizardAddObjectCard formRef={formRef} />	2✔
51	)}
52	</Grid>	3✔
53
54	<Grid>	3✔
55	{!openedXMLModal && loading && (	3!
56	<Grid container justifyContent="center">	×
57	<CircularProgress />	×
58	</Grid>	×
59	)}
60	</Grid>	3✔
61	</GridContainer>	3✔
62	</>	3✔
63	)
64	}	3✔
65
66	export default WizardAddObjectStep	1✔

CSCfi / metadata-submitter-frontend / 15271191055

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous