Merged in feature/IO-3499-React-19 (pull request #2836)

feature/IO-3499-React-19: Some more missing <Cards> and a missing message -> title
This commit is contained in:
Dave Richer
2026-01-16 18:28:36 +00:00
4 changed files with 13 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
import { CheckCircleFilled } from "@ant-design/icons";
import { useQuery } from "@apollo/client/react";
import { Button, Col, List, Row } from "antd";
import { Button, Card, Col, List, Row } from "antd";
import { useState } from "react";
import { useTranslation } from "react-i18next";
@@ -21,7 +21,7 @@ export default function ShopCsiConfig() {
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent title={error.message} type="error" />;
return (
<div>
<Card>
<Row>
<Col span={3}>
<List
@@ -41,6 +41,6 @@ export default function ShopCsiConfig() {
<ShopCsiConfigForm selectedCsi={selectedCsi} />
</Col>
</Row>
</div>
</Card>
);
}

View File

@@ -1,4 +1,4 @@
import { Typography } from "antd";
import { Card, Typography } from "antd";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -15,10 +15,10 @@ function ShopInfoConsentComponent({ bodyshop }) {
const { t } = useTranslation();
return (
<div>
<Card>
<Typography.Title level={4}>{t("settings.title")}</Typography.Title>
{<PhoneNumberConsentList bodyshop={bodyshop} />}
</div>
</Card>
);
}

View File

@@ -312,7 +312,11 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
scenario_meta: JSON.stringify(notifications.map((notif) => notif.variables || {})),
created_at: new Date(notifications[0].timestamp).toISOString(),
read: null,
job: { ro_number: jobRoNumber }
job: {
ro_number: jobRoNumber,
id: jobId,
__typename: "jobs"
}
};
const baseVariables = {
@@ -377,7 +381,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
});
notification.info({
message: (
title: (
<div
onClick={() => {
markNotificationRead({ variables: { id: notificationId } })

View File

@@ -363,7 +363,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
}
]);
notification.info({
message: "Reynolds RO created",
title: "Reynolds RO created",
description:
"Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
duration: 8