chore: remove defaultProps to get rid of warning messages (#1855)

MaibornWolff · Aug 30, 2024 · e9f0268 · e9f0268
1 parent 10a6686
commit e9f0268
Show file tree

Hide file tree

Showing 26 changed files with 67 additions and 64 deletions.
diff --git a/frontend/src/commons/custom_fields/LabeledTextField.tsx b/frontend/src/commons/custom_fields/LabeledTextField.tsx
@@ -17,6 +17,4 @@ const LabeledTextField = (props: LabeledTextFieldProps) => {
     );
 };
 
-LabeledTextField.defaultProps = { label: "" };
-
 export default LabeledTextField;
diff --git a/frontend/src/commons/custom_fields/MarkdownField.tsx b/frontend/src/commons/custom_fields/MarkdownField.tsx
@@ -33,6 +33,4 @@ const MarkdownField = (props: MarkdownProps) => {
     );
 };
 
-MarkdownField.defaultProps = { label: "" };
-
 export default MarkdownField;
diff --git a/frontend/src/commons/custom_fields/ObservationsCountField.tsx b/frontend/src/commons/custom_fields/ObservationsCountField.tsx
@@ -86,6 +86,4 @@ const ObservationsCountField = (props: ObservationsProps) => {
     ) : null;
 };
 
-ObservationsCountField.defaultProps = { label: "Open observations" };
-
 export default ObservationsCountField;
diff --git a/frontend/src/commons/custom_fields/SecurityGateTextField.tsx b/frontend/src/commons/custom_fields/SecurityGateTextField.tsx
@@ -1,7 +1,6 @@
 import { ChipField, useRecordContext } from "react-admin";
 
 interface SecurityGateTextProps {
-    sortable: boolean;
     label: string;
 }
 
@@ -26,9 +25,10 @@ export const SecurityGateTextField = (props: SecurityGateTextProps) => {
 
     return record && record.security_gate_passed != null ? (
         <ChipField
+            label={props.label}
             source="text"
             record={get_text_record()}
-            sortable={props.sortable}
+            sortable={true}
             sortBy="security_gate_passed"
             sx={{
                 backgroundColor: get_severity_color(),
@@ -37,5 +37,3 @@ export const SecurityGateTextField = (props: SecurityGateTextProps) => {
         />
     ) : null;
 };
-
-SecurityGateTextField.defaultProps = { label: "Security gate", sortable: true };
diff --git a/frontend/src/commons/custom_fields/SeverityField.tsx b/frontend/src/commons/custom_fields/SeverityField.tsx
@@ -4,7 +4,6 @@ import { get_severity_color } from "../functions";
 
 interface SeverityProps {
     source: string;
-    sortable: boolean;
     label: string;
 }
 
@@ -30,7 +29,7 @@ export const SeverityField = (props: SeverityProps) => {
     return record ? (
         <ChipField
             source={props.source}
-            sortable={props.sortable}
+            sortable={true}
             sortBy={props.source}
             sx={{
                 backgroundColor: get_severity_color(get_current_severity(record)),
@@ -40,5 +39,3 @@ export const SeverityField = (props: SeverityProps) => {
         />
     ) : null;
 };
-
-SeverityField.defaultProps = { label: "Severity", sortable: true };
diff --git a/frontend/src/commons/custom_fields/TextUrlField.tsx b/frontend/src/commons/custom_fields/TextUrlField.tsx
@@ -85,6 +85,4 @@ const TextUrlField = (props: TextUrlFieldProps) => {
     );
 };
 
-TextUrlField.defaultProps = { label: "" };
-
 export default TextUrlField;
diff --git a/frontend/src/core/branches/BranchEmbeddedList.tsx b/frontend/src/core/branches/BranchEmbeddedList.tsx
@@ -46,13 +46,17 @@ const BranchEmbeddedList = ({ product }: BranchEmbeddedListProps) => {
                     <WithRecord
                         label="Name"
                         render={(branch) => (
-                            <TextUrlField text={branch.name} url={get_observations_url(product.id, branch.id)} />
+                            <TextUrlField
+                                label="Name"
+                                text={branch.name}
+                                url={get_observations_url(product.id, branch.id)}
+                            />
                         )}
                     />
                     <BooleanField source="is_default_branch" label="Default branch / version" sortable={false} />
                     <TextField source="purl" label="PURL" />
                     <TextField source="cpe23" label="CPE 2.3" />
-                    <ObservationsCountField withLabel={false} />
+                    <ObservationsCountField label="Open observations" withLabel={false} />
                     <DateField source="last_import" showTime />
                     <WithRecord
                         label="Protect"

diff --git a/frontend/src/core/observation_logs/ObservationLogShow.tsx b/frontend/src/core/observation_logs/ObservationLogShow.tsx
@@ -90,8 +90,8 @@ const ObservationLogComponent = () => {
                                 <TextField source="user_full_name" />
                             </Labeled>
                             {observation_log.severity && (
-                                <Labeled label="Severity">
-                                    <SeverityField source="severity" />
+                                <Labeled>
+                                    <SeverityField label="Severity" source="severity" />
                                 </Labeled>
                             )}
                             {observation_log.status && (
@@ -147,8 +147,8 @@ const ObservationLogComponent = () => {
                                     />
                                 </Labeled>
                             )}
-                            <Labeled label="Comment">
-                                <MarkdownField content={observation_log.comment} />
+                            <Labeled>
+                                <MarkdownField content={observation_log.comment} label="Comment" />
                             </Labeled>
                             <Labeled label="Created">
                                 <DateField source="created" showTime />

diff --git a/frontend/src/core/observations/ObservationDashboardList.tsx b/frontend/src/core/observations/ObservationDashboardList.tsx
@@ -52,7 +52,7 @@ const ObservationDashboardList = () => {
                     >
                         <TextField source="product_data.name" label="Product" />
                         <TextField source="title" sx={{ wordBreak: "break-word" }} />
-                        <SeverityField source="current_severity" />
+                        <SeverityField label="Severity" source="current_severity" />
                         <ChipField source="current_status" label="Status" />
                         <TextField source="scanner_name" label="Scanner" />
                         <FunctionField<Observation>

diff --git a/frontend/src/core/observations/ObservationEmbeddedList.tsx b/frontend/src/core/observations/ObservationEmbeddedList.tsx
@@ -184,7 +184,7 @@ const ObservationsEmbeddedList = ({ product }: ObservationsEmbeddedListProps) =>
                 >
                     {product && product.has_branches && <TextField source="branch_name" label="Branch / Version" />}
                     <TextField source="title" />
-                    <SeverityField source="current_severity" />
+                    <SeverityField label="Severity" source="current_severity" />
                     <ChipField source="current_status" label="Status" />
                     {product && product.has_component && <NumberField source="epss_score" label="EPSS" />}
                     {product && product.has_services && <TextField source="origin_service_name" label="Service" />}

diff --git a/frontend/src/core/observations/ObservationList.tsx b/frontend/src/core/observations/ObservationList.tsx
@@ -113,7 +113,7 @@ const ObservationList = () => {
                     <TextField source="product_data.product_group_name" label="Group" />
                     <TextField source="branch_name" label="Branch / Version" />
                     <TextField source="title" />
-                    <SeverityField source="current_severity" />
+                    <SeverityField label="Severity" source="current_severity" />
                     <ChipField source="current_status" label="Status" />
                     <NumberField source="epss_score" label="EPSS" />
                     <TextField source="origin_service_name" label="Service" />

diff --git a/frontend/src/core/observations/ObservationReviewList.tsx b/frontend/src/core/observations/ObservationReviewList.tsx
@@ -156,7 +156,7 @@ const ObservationsReviewList = ({ product }: ObservationsReviewListProps) => {
                 >
                     <TextField source="branch_name" label="Branch / Version" />
                     <TextField source="title" />
-                    <SeverityField source="current_severity" />
+                    <SeverityField label="Severity" source="current_severity" />
                     {product && product.has_component && <NumberField source="epss_score" label="EPSS" />}
                     <ChipField source="current_status" label="Status" />
                     {product && product.has_services && <TextField source="origin_service_name" label="Service" />}

diff --git a/frontend/src/core/observations/ObservationShow.tsx b/frontend/src/core/observations/ObservationShow.tsx
@@ -112,7 +112,7 @@ const ObservationShowComponent = () => {
                         <Stack direction="row" spacing={4}>
                             <Stack spacing={2}>
                                 <Labeled>
-                                    <SeverityField source="current_severity" />
+                                    <SeverityField label="Severity" source="current_severity" />
                                 </Labeled>
                                 {observation.parser_severity != "" &&
                                     (observation.rule_severity != "" || observation.assessment_severity != "") && (
@@ -193,8 +193,9 @@ const ObservationShowComponent = () => {
                                     )}
                                 {observation.vulnerability_id != "" &&
                                     get_vulnerability_url(observation.vulnerability_id) != null && (
-                                        <Labeled label="Vulnerability ID">
+                                        <Labeled>
                                             <TextUrlField
+                                                label="Vulnerability ID"
                                                 text={observation.vulnerability_id}
                                                 url={
                                                     observation.vulnerability_id &&
@@ -214,8 +215,12 @@ const ObservationShowComponent = () => {
                                     </Labeled>
                                 )}
                                 {observation.cwe != null && (
-                                    <Labeled label="CWE">
-                                        <TextUrlField text={observation.cwe} url={get_cwe_url(observation.cwe)} />
+                                    <Labeled>
+                                        <TextUrlField
+                                            label="CWE"
+                                            text={observation.cwe}
+                                            url={get_cwe_url(observation.cwe)}
+                                        />
                                     </Labeled>
                                 )}
                                 {observation.epss_score != null && (

diff --git a/frontend/src/core/observations/ObservationShowAside.tsx b/frontend/src/core/observations/ObservationShowAside.tsx
@@ -90,8 +90,9 @@ const MetaData = () => {
                             />
                         )}
                         {observation.issue_tracker_issue_id != "" && (
-                            <Labeled label="Issue">
+                            <Labeled>
                                 <TextUrlField
+                                    label="Issue"
                                     text={
                                         observation.product_data.issue_tracker_type +
                                         " #" +

diff --git a/frontend/src/core/observations/ObservationShowDescriptionRecommendation.tsx b/frontend/src/core/observations/ObservationShowDescriptionRecommendation.tsx
@@ -8,13 +8,13 @@ const ObservationShowDescriptionRecommendation = () => {
     return (
         <Stack spacing={2}>
             {observation && observation.description != "" && (
-                <Labeled label="Description" sx={{ paddingTop: 2 }}>
-                    <MarkdownField content={observation.description} />
+                <Labeled sx={{ paddingTop: 2 }}>
+                    <MarkdownField content={observation.description} label="Description" />
                 </Labeled>
             )}
             {observation && observation.recommendation != "" && (
-                <Labeled label="Recommendation">
-                    <MarkdownField content={observation.recommendation} />
+                <Labeled>
+                    <MarkdownField content={observation.recommendation} label="Recommendation" />
                 </Labeled>
             )}
         </Stack>

diff --git a/frontend/src/core/observations/ObservationShowOrigins.tsx b/frontend/src/core/observations/ObservationShowOrigins.tsx
@@ -68,8 +68,9 @@ const ObservationShowOrigins = ({ elevated }: ObservationShowOriginsProps) => {
                                             observation.origin_component_purl_type,
                                             observation.origin_component_purl_namespace
                                         ) != null && (
-                                            <Labeled label="Component PURL">
+                                            <Labeled>
                                                 <TextUrlField
+                                                    label="Component PURL"
                                                     text={observation.origin_component_purl}
                                                     url={
                                                         observation.origin_component_purl &&
@@ -130,8 +131,9 @@ const ObservationShowOrigins = ({ elevated }: ObservationShowOriginsProps) => {
                                     Endpoint
                                 </Typography>
                                 {observation.origin_endpoint_url != "" && (
-                                    <Labeled label="Endpoint URL">
+                                    <Labeled>
                                         <TextUrlField
+                                            label="Endpoint URL"
                                             text={observation.origin_endpoint_url}
                                             url={observation.origin_endpoint_url}
                                         />

diff --git a/frontend/src/core/observations/PotentialDuplicatesList.tsx b/frontend/src/core/observations/PotentialDuplicatesList.tsx
@@ -53,7 +53,7 @@ const PotentialDuplicatesList = ({ observation }: PotentialDuplicatesListProps)
                 resource="potential_duplicates"
             >
                 <TextField source="potential_duplicate_observation.title" label="Title" />
-                <SeverityField source="potential_duplicate_observation.current_severity" />
+                <SeverityField label="Severity" source="potential_duplicate_observation.current_severity" />
                 <ChipField source="potential_duplicate_observation.current_status" label="Status" />
                 <TextField source="potential_duplicate_observation.origin_service_name" label="Service" />
                 {observation && observation.product_data.has_component && (

diff --git a/frontend/src/core/product_groups/ProductGroupHeader.tsx b/frontend/src/core/product_groups/ProductGroupHeader.tsx
@@ -27,8 +27,8 @@ const ProductGroupHeader = () => {
                 <Labeled label="Product Group name">
                     <TextField source="name" className={classes.fontBigBold} />
                 </Labeled>
-                <Labeled label="Open observations">
-                    <ObservationsCountField withLabel={true} />
+                <Labeled>
+                    <ObservationsCountField label="Open observations" withLabel={true} />
                 </Labeled>
             </Paper>
         </RecordContextProvider>

diff --git a/frontend/src/core/product_groups/ProductGroupList.tsx b/frontend/src/core/product_groups/ProductGroupList.tsx
@@ -35,7 +35,7 @@ const ProductGroupList = () => {
                 <Datagrid size={getSettingListSize()} rowClick="show" bulkActionButtons={false}>
                     <TextField source="name" />
                     <TextField source="products_count" label="Products" />
-                    <ObservationsCountField withLabel={false} />
+                    <ObservationsCountField label="Open observations" withLabel={false} />
                 </Datagrid>
             </List>
         </Fragment>

diff --git a/frontend/src/core/products/ProductEmbeddedList.tsx b/frontend/src/core/products/ProductEmbeddedList.tsx
@@ -60,8 +60,8 @@ const ProductEmbeddedList = ({ product_group }: ProductEmbeddedListProps) => {
                         label="Default branch / version"
                         sortable={false}
                     />
-                    <SecurityGateTextField />
-                    <ObservationsCountField withLabel={false} />
+                    <SecurityGateTextField label="Security gate" />
+                    <ObservationsCountField label="Open observations" withLabel={false} />
                     <FunctionField<Product>
                         label="Last observation change"
                         sortBy="last_observation_change"

diff --git a/frontend/src/core/products/ProductHeader.tsx b/frontend/src/core/products/ProductHeader.tsx
@@ -37,11 +37,11 @@ const ProductHeader = () => {
                 </Labeled>
                 {product && product.security_gate_passed != undefined && (
                     <Labeled>
-                        <SecurityGateTextField />
+                        <SecurityGateTextField label="Security gate" />
                     </Labeled>
                 )}
-                <Labeled label={get_open_observation_label(product)}>
-                    <ObservationsCountField withLabel={true} />
+                <Labeled>
+                    <ObservationsCountField label={get_open_observation_label(product)} withLabel={true} />
                 </Labeled>
             </Paper>
         </RecordContextProvider>

diff --git a/frontend/src/core/products/ProductList.tsx b/frontend/src/core/products/ProductList.tsx
@@ -71,8 +71,8 @@ const ProductList = () => {
                         label="Default branch / version"
                         sortable={false}
                     />
-                    <SecurityGateTextField />
-                    <ObservationsCountField withLabel={false} />
+                    <SecurityGateTextField label="Security gate" />
+                    <ObservationsCountField label="Open observations" withLabel={false} />
                     <FunctionField<Product>
                         label="Last observation change"
                         sortBy="last_observation_change"

diff --git a/frontend/src/core/services/ServiceEmbeddedList.tsx b/frontend/src/core/services/ServiceEmbeddedList.tsx
@@ -43,15 +43,15 @@ const ServiceEmbeddedList = ({ product }: ServiceEmbeddedListProps) => {
             <div style={{ width: "100%" }}>
                 <Datagrid size={getSettingListSize()} sx={{ width: "100%" }} bulkActionButtons={false} rowClick={false}>
                     <WithRecord
-                        label="Name"
                         render={(service) => (
                             <TextUrlField
+                                label="Name"
                                 text={service.name}
                                 url={get_observations_url(product.id, service.id, product.repository_default_branch)}
                             />
                         )}
                     />
-                    <ObservationsCountField withLabel={false} />
+                    <ObservationsCountField label="Open observations" withLabel={false} />
                     <WithRecord
                         render={(service) => (
                             <Stack direction="row" spacing={4}>

diff --git a/frontend/src/metrics/MetricsHeader.tsx b/frontend/src/metrics/MetricsHeader.tsx
@@ -79,18 +79,21 @@ const MetricsHeader = (props: MetricsHeaderProps) => {
             {!loading && (
                 <Fragment>
                     {props.repository_default_branch && (
-                        <Labeled label="Default branch">
-                            <LabeledTextField text={props.repository_default_branch} />
+                        <Labeled>
+                            <LabeledTextField label="Default branch" text={props.repository_default_branch} />
                         </Labeled>
                     )}
-                    <Labeled
-                        label="Metrics last calculated"
-                        sx={{ marginLeft: get_margin_left(props.repository_default_branch) }}
-                    >
-                        <LabeledTextField text={new Date(data.last_calculated).toLocaleString()} />
+                    <Labeled sx={{ marginLeft: get_margin_left(props.repository_default_branch) }}>
+                        <LabeledTextField
+                            label="Metrics last calculated"
+                            text={new Date(data.last_calculated).toLocaleString()}
+                        />
                     </Labeled>
-                    <Labeled label="Metrics calculation interval" sx={{ marginLeft: 8 }}>
-                        <LabeledTextField text={data.calculation_interval + " minutes"} />
+                    <Labeled sx={{ marginLeft: 8 }}>
+                        <LabeledTextField
+                            label="Metrics calculation interval"
+                            text={data.calculation_interval + " minutes"}
+                        />
                     </Labeled>
                 </Fragment>
             )}

diff --git a/frontend/src/rules/general_rules/GeneralRuleShow.tsx b/frontend/src/rules/general_rules/GeneralRuleShow.tsx
@@ -55,8 +55,8 @@ const GeneralRuleComponent = () => {
                                 <TextField source="name" className={classes.fontBigBold} />
                             </Labeled>
                             {rule.description && (
-                                <Labeled label="Description">
-                                    <MarkdownField content={rule.description} />
+                                <Labeled>
+                                    <MarkdownField content={rule.description} label="Description" />
                                 </Labeled>
                             )}