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:
@@ -1,6 +1,6 @@
|
|||||||
import { CheckCircleFilled } from "@ant-design/icons";
|
import { CheckCircleFilled } from "@ant-design/icons";
|
||||||
import { useQuery } from "@apollo/client/react";
|
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 { useState } from "react";
|
||||||
|
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
@@ -21,7 +21,7 @@ export default function ShopCsiConfig() {
|
|||||||
if (loading) return <LoadingSpinner />;
|
if (loading) return <LoadingSpinner />;
|
||||||
if (error) return <AlertComponent title={error.message} type="error" />;
|
if (error) return <AlertComponent title={error.message} type="error" />;
|
||||||
return (
|
return (
|
||||||
<div>
|
<Card>
|
||||||
<Row>
|
<Row>
|
||||||
<Col span={3}>
|
<Col span={3}>
|
||||||
<List
|
<List
|
||||||
@@ -41,6 +41,6 @@ export default function ShopCsiConfig() {
|
|||||||
<ShopCsiConfigForm selectedCsi={selectedCsi} />
|
<ShopCsiConfigForm selectedCsi={selectedCsi} />
|
||||||
</Col>
|
</Col>
|
||||||
</Row>
|
</Row>
|
||||||
</div>
|
</Card>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Typography } from "antd";
|
import { Card, Typography } from "antd";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
@@ -15,10 +15,10 @@ function ShopInfoConsentComponent({ bodyshop }) {
|
|||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<Card>
|
||||||
<Typography.Title level={4}>{t("settings.title")}</Typography.Title>
|
<Typography.Title level={4}>{t("settings.title")}</Typography.Title>
|
||||||
{<PhoneNumberConsentList bodyshop={bodyshop} />}
|
{<PhoneNumberConsentList bodyshop={bodyshop} />}
|
||||||
</div>
|
</Card>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -312,7 +312,11 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
|
|||||||
scenario_meta: JSON.stringify(notifications.map((notif) => notif.variables || {})),
|
scenario_meta: JSON.stringify(notifications.map((notif) => notif.variables || {})),
|
||||||
created_at: new Date(notifications[0].timestamp).toISOString(),
|
created_at: new Date(notifications[0].timestamp).toISOString(),
|
||||||
read: null,
|
read: null,
|
||||||
job: { ro_number: jobRoNumber }
|
job: {
|
||||||
|
ro_number: jobRoNumber,
|
||||||
|
id: jobId,
|
||||||
|
__typename: "jobs"
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const baseVariables = {
|
const baseVariables = {
|
||||||
@@ -377,7 +381,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
notification.info({
|
notification.info({
|
||||||
message: (
|
title: (
|
||||||
<div
|
<div
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
markNotificationRead({ variables: { id: notificationId } })
|
markNotificationRead({ variables: { id: notificationId } })
|
||||||
|
|||||||
@@ -363,7 +363,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
|
|||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
notification.info({
|
notification.info({
|
||||||
message: "Reynolds RO created",
|
title: "Reynolds RO created",
|
||||||
description:
|
description:
|
||||||
"Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
|
"Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
|
||||||
duration: 8
|
duration: 8
|
||||||
|
|||||||
Reference in New Issue
Block a user