@voplus/morpho-csp 6.0.112 → 6.0.114

package/es/modules/corporate/company/pages/CompanyPage/index.js

@@ -8,6 +8,7 @@ import { CurrentContactContext } from "@voplus/morpho-document-core/es/data/cont
 import ActivityLog from "@voplus/morpho-org/es/components/ActivityLog2/ActivityLog2";
 import AnnualFilings from "../../../filing-record/components/AnnualFilings";
 import Dashboard from "./Dashboard";
+import { Skeleton } from "antd";
 import CompanyMemberList from "../../member-register/components/CompanyMemberList";
 import DocumentPage from "@voplus/morpho-document/es/pages/DocumentPage";
 import MainContent from "@voplus/morpho-ui/es/components/layout/MainContent";
@@ -16,7 +17,7 @@ import ControllerList from "../../controller-register/components/ControllerList"
 import ShareTransactionList from "../../share-transactions-register/components/ShareTransactionList";
 import ShareClassList from "../../../share-class/components/ShareClassList";
 import VirtualAddressList from "../../../virtual-address/components/VirtualAddressList";
-import NotificationList from "@voplus/morpho-workspace/es/modules/notification/components/NotificationList2";
+import NotificationList from "@voplus/morpho-workspace/es/modules/notification/components/AllNewNotificationList";
 import CorporateNavMenu from "../../../../../components/CorporateNavMenu/CorporateNavMenu";
 import Scrollbars from "react-custom-scrollbars-2";
 import CompanySetting from "./CompanySetting";
@@ -41,26 +42,27 @@ const CompanyPage = (props) => {
     return observe(() => {
         var _a;
         return (React.createElement(CurrentContactContext.Provider, { value: { contact: corporate.unit } },
-            React.createElement(MainContent, { className: "company-page" },
-                React.createElement(MainContent.Nav, { collapsible: true },
-                    React.createElement(NavPanel, null,
-                        React.createElement(Scrollbars, { autoHide: true },
-                            React.createElement(CorporateNavMenu, { id: corporate.id, url: url, defaultSelectedKeys: ["/dashboard"], showShareClass: ((_a = state.corporate) === null || _a === void 0 ? void 0 : _a.liabilityType) === "LimitedByShares" })))),
-                React.createElement("div", { className: "company-page-content" },
-                    React.createElement(Routes, null,
-                        React.createElement(Route, { path: "dashboard", element: React.createElement(Dashboard, { corporate: corporate, unitId: params.id, membersRegisterId: state.MemberId, officersRegisterId: state.OfficerId }) }),
-                        React.createElement(Route, { path: "registers/OfficersRegister", element: state.OfficerId ? (React.createElement(OfficerList, { officersRegisterId: state.OfficerId, corporateId: corporate.id, onRedirect: () => layout.history.replace(`${url}/dashboard`) })) : null }),
-                        React.createElement(Route, { path: "registers/ShareTransactionsRegister", element: state.shareTransactionId ? (React.createElement(ShareTransactionList, { shareTransactionId: state.shareTransactionId, corporateId: corporate.id, memberId: state.MemberId, headerTitle: "ShareTransactions Register", onRedirect: () => layout.history.replace(`${url}/dashboard`) })) : null }),
-                        React.createElement(Route, { path: "registers/MembersRegister", element: state.MemberId ? (React.createElement(CompanyMemberList, { membersRegisterId: state.MemberId, corporateId: corporate.id, onRedirect: () => layout.history.replace(`${url}/dashboard`) })) : null }),
-                        React.createElement(Route, { path: "registers/ControllerRegister", element: state.ControllerId && loaded ? (React.createElement(ControllerList, { controllerRegisterId: state.ControllerId, corporateId: corporate.id, onReload: onReload, onRedirect: () => layout.history.replace(`${url}/dashboard`) })) : null }),
-                        React.createElement(Route, { path: "filings", element: React.createElement(AnnualFilings, { id: corporate.id }) }),
-                        React.createElement(Route, { path: "share-class", element: React.createElement(ShareClassList, { corporateId: corporate.id }) }),
-                        React.createElement(Route, { path: "documents", element: React.createElement(DocumentPage, { root: corporate.id, route: `${url}/documents`, className: "corporate-documents", tabTitle: `Corporate - ${corporate.name}` || "Corporate" }) }),
-                        React.createElement(Route, { path: "virtual-address", element: React.createElement(VirtualAddressList, { corporateId: corporate.id }) }),
-                        React.createElement(Route, { path: "notification", element: React.createElement(NotificationList, { parentId: corporate.id, recipient: corporate.unit }) }),
-                        React.createElement(Route, { path: "activities", element: React.createElement(ActivityLog, { id: corporate.id, isTitle: true }) }),
-                        React.createElement(Route, { path: "settings", element: React.createElement(CompanySetting, { id: props.id, liabilityType: corporate.liabilityType }) }),
-                        React.createElement(Route, { path: "/", element: React.createElement(Navigate, { to: "dashboard" }) }))))));
+            React.createElement(Skeleton, { loading: !corporate.loaded },
+                React.createElement(MainContent, { className: "company-page" },
+                    React.createElement(MainContent.Nav, { collapsible: true },
+                        React.createElement(NavPanel, null,
+                            React.createElement(Scrollbars, { autoHide: true },
+                                React.createElement(CorporateNavMenu, { id: corporate.id, url: url, defaultSelectedKeys: ["/dashboard"], showShareClass: ((_a = state.corporate) === null || _a === void 0 ? void 0 : _a.liabilityType) === "LimitedByShares" })))),
+                    React.createElement("div", { className: "company-page-content" },
+                        React.createElement(Routes, null,
+                            React.createElement(Route, { path: "dashboard", element: React.createElement(Dashboard, { corporate: corporate, unitId: params.id, membersRegisterId: state.MemberId, officersRegisterId: state.OfficerId }) }),
+                            React.createElement(Route, { path: "registers/OfficersRegister", element: state.OfficerId ? (React.createElement(OfficerList, { officersRegisterId: state.OfficerId, corporateId: corporate.id, onRedirect: () => layout.history.replace(`${url}/dashboard`) })) : null }),
+                            React.createElement(Route, { path: "registers/ShareTransactionsRegister", element: state.shareTransactionId ? (React.createElement(ShareTransactionList, { shareTransactionId: state.shareTransactionId, corporateId: corporate.id, memberId: state.MemberId, headerTitle: "ShareTransactions Register", onRedirect: () => layout.history.replace(`${url}/dashboard`) })) : null }),
+                            React.createElement(Route, { path: "registers/MembersRegister", element: state.MemberId ? (React.createElement(CompanyMemberList, { membersRegisterId: state.MemberId, corporateId: corporate.id, onRedirect: () => layout.history.replace(`${url}/dashboard`) })) : null }),
+                            React.createElement(Route, { path: "registers/ControllerRegister", element: state.ControllerId && loaded ? (React.createElement(ControllerList, { controllerRegisterId: state.ControllerId, corporateId: corporate.id, onReload: onReload, onRedirect: () => layout.history.replace(`${url}/dashboard`) })) : null }),
+                            React.createElement(Route, { path: "filings", element: React.createElement(AnnualFilings, { id: corporate.id }) }),
+                            React.createElement(Route, { path: "share-class", element: React.createElement(ShareClassList, { corporateId: corporate.id }) }),
+                            React.createElement(Route, { path: "documents", element: React.createElement(DocumentPage, { root: corporate.id, route: `${url}/documents`, className: "corporate-documents", tabTitle: `Corporate - ${corporate.name}` || "Corporate" }) }),
+                            React.createElement(Route, { path: "virtual-address", element: React.createElement(VirtualAddressList, { corporateId: corporate.id }) }),
+                            React.createElement(Route, { path: "notification", element: React.createElement(NotificationList, { parentId: corporate.id, recipient: corporate.unit }) }),
+                            React.createElement(Route, { path: "activities", element: React.createElement(ActivityLog, { id: corporate.id, isTitle: true }) }),
+                            React.createElement(Route, { path: "settings", element: React.createElement(CompanySetting, { id: props.id, liabilityType: corporate.liabilityType }) }),
+                            React.createElement(Route, { path: "/", element: React.createElement(Navigate, { to: "dashboard" }) })))))));
     });
     function onReload() {
         setLoaded(false);

package/es/modules/corporate/company/pages/CompanyPage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/corporate/company/pages/CompanyPage/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/corporate/company/pages/CompanyPage/index.tsx"],"names":[],"mappings":"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"}

package/es/modules/corporate/company/pages/CompanyPage/index.less

@@ -50,16 +50,19 @@
 			z-index: 2;
 		}
 
-		.dashboard-content-header {
-			padding: 2em 0px 1em 0px;
-		}
-
 		.activity-card-board {
 			> div {
 				height: 100%;
 			}
 		}
 
+		.document-table-list-card,
+		.capital-card,
+		.shares-card,
+		.subscriptions-schedule-time-line-card {
+			margin-bottom: 15px;
+		}
+
 		.dashboard-related-document {
 			margin: 0;
 		}

package/es/modules/corporate/company/pages/CorporateClientView/Dashboard.js

@@ -1,40 +1,54 @@
-import React, { useRef } from "react";
+import React, { useRef, useState, useLayoutEffect } from "react";
 import { Col, Row } from "antd";
 import { observe } from "@voplus/morpho-ui";
-import SharesCard from "../../components/SharesCard";
+import SharesCard2 from "../../components/SharesCard2";
+import CapitalCard from "../../components/CapitalCard";
+import MemberTableListCard from "../../member-register/components/MemberTableListCard";
+import OfficerTableListCard from "../../officer-register/components/OfficerTableListCard";
+import CompanyPageHead from "../../components/CompanyPageHead";
 import CompanyProperties from "../../components/CompanyProperties/CompanyPropertiesCard";
 import RelatedDocument from "@voplus/morpho-org/es/controls/RelatedDocument";
-import CompanyMemberListCard from "../../member-register/components/CompanyMemberListCard";
+import FilingTimeLineCard from "../../../filing-record/components/FilingTimeLineCard";
 import ContactPropertiesCard from "@voplus/morpho-org/es/components/ContactProperties/ContactPropertiesCard";
-import OfficerListCard from "../../officer-register/components/OfficerListCard";
-import FilingRecordTimeLine from "../../../filing-record/components/FilingRecordTimeLine";
 import styles from "./index.less";
 const Dashboard = (props) => {
     const { corporate, membersRegisterId, officersRegisterId } = props;
     const ref = useRef(null);
+    const [activitiesHeight, setActivitiesHeight] = useState();
+    useLayoutEffect(() => {
+        var _a;
+        setActivitiesHeight((_a = ref.current) === null || _a === void 0 ? void 0 : _a.offsetHeight);
+    });
     return observe(() => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         return (React.createElement("div", { className: styles["dashboard-content"], ref: ref },
-            React.createElement(RelatedDocument, null,
-                React.createElement("div", { className: "dashboard-content-header flex items-center justify-between w-full" },
-                    React.createElement("div", { className: "flex-1 min-w-0" },
-                        React.createElement("div", { className: "text-2xl font-bold leading-7 text-gray-900 sm:text-3xl sm:truncate" }, corporate.name))),
+            React.createElement(CompanyPageHead, { id: corporate.id, unitId: props.unitId, showActive: false }),
+            React.createElement(RelatedDocument, { className: "dashboard-related-document" },
                 React.createElement(Row, { gutter: [16, 0] },
-                    React.createElement(Col, { xs: 0, sm: 0, md: 0, lg: 0, xl: 8 },
+                    React.createElement(Col, { xs: 0, sm: 0, md: 0, lg: 0, xl: 6 },
                         React.createElement(CompanyProperties, { id: corporate.id }),
                         props.unitId && React.createElement(ContactPropertiesCard, { id: props.unitId })),
-                    React.createElement(Col, { xs: 0, sm: 0, md: 0, lg: 0, xl: 16 },
-                        officersRegisterId && (React.createElement(OfficerListCard, { isFilterPresent: true, officersRegisterId: officersRegisterId, corporateId: corporate.id, style: { height: "400px" } })),
-                        membersRegisterId && (React.createElement(CompanyMemberListCard, { membersRegisterId: membersRegisterId, corporateId: corporate.id, style: { height: "400px" } })),
-                        React.createElement(SharesCard, { corporateid: corporate.id }),
-                        ((_a = corporate.latestFilingYear) === null || _a === void 0 ? void 0 : _a.id) && (React.createElement(FilingRecordTimeLine, { filingYearId: (_b = corporate.latestFilingYear) === null || _b === void 0 ? void 0 : _b.id, title: "Latest Filing Year Time Line" }))),
+                    React.createElement(Col, { xs: 0, sm: 0, md: 0, lg: 0, xl: ((_a = corporate.latestFilingYear) === null || _a === void 0 ? void 0 : _a.id) ? 12 : 18 },
+                        React.createElement(Row, { gutter: [16, 0] },
+                            React.createElement(Col, { xl: 15 },
+                                React.createElement(SharesCard2, { corporateid: corporate.id, unitId: props.unitId })),
+                            React.createElement(Col, { xl: 9 },
+                                React.createElement(CapitalCard, { corporateid: corporate.id, unitId: props.unitId }))),
+                        officersRegisterId && (React.createElement(OfficerTableListCard, { isFilterPresent: true, officersRegisterId: officersRegisterId, corporateId: corporate.id })),
+                        membersRegisterId && (React.createElement(MemberTableListCard, { membersRegisterId: membersRegisterId, corporateId: corporate.id }))),
+                    React.createElement(Col, { xs: 0, sm: 0, md: 0, lg: 0, xl: ((_b = corporate.latestFilingYear) === null || _b === void 0 ? void 0 : _b.id) ? 6 : 0 }, ((_c = corporate.latestFilingYear) === null || _c === void 0 ? void 0 : _c.id) && (React.createElement("div", { style: { height: `${activitiesHeight - 120}px` }, className: "filing-time-line-height" },
+                        React.createElement(FilingTimeLineCard, { filingYearId: corporate.latestFilingYear.id })))),
                     React.createElement(Col, { xs: 24, sm: 24, md: 24, lg: 24, xl: 0 },
                         React.createElement(CompanyProperties, { id: corporate.id }),
                         props.unitId && React.createElement(ContactPropertiesCard, { id: props.unitId }),
-                        officersRegisterId && (React.createElement(OfficerListCard, { officersRegisterId: officersRegisterId, corporateId: corporate.id, style: { height: "400px" } })),
-                        membersRegisterId && (React.createElement(CompanyMemberListCard, { membersRegisterId: membersRegisterId, corporateId: corporate.id, style: { height: "400px" } })),
-                        React.createElement(SharesCard, { corporateid: corporate.id }),
-                        ((_c = corporate.latestFilingYear) === null || _c === void 0 ? void 0 : _c.id) && (React.createElement(FilingRecordTimeLine, { filingYearId: (_d = corporate.latestFilingYear) === null || _d === void 0 ? void 0 : _d.id, title: "Latest Filing Year Time Line" })))))));
+                        React.createElement(Row, { gutter: [16, 0] },
+                            React.createElement(Col, { xs: 15, sm: 15, md: 15, lg: 15, xl: 0 },
+                                React.createElement(SharesCard2, { corporateid: corporate.id, unitId: props.unitId })),
+                            React.createElement(Col, { xs: 9, sm: 9, md: 9, lg: 9, xl: 0 },
+                                React.createElement(CapitalCard, { corporateid: corporate.id, unitId: props.unitId }))),
+                        officersRegisterId && (React.createElement(OfficerTableListCard, { officersRegisterId: officersRegisterId, corporateId: corporate.id })),
+                        membersRegisterId && (React.createElement(MemberTableListCard, { membersRegisterId: membersRegisterId, corporateId: corporate.id })),
+                        ((_d = corporate.latestFilingYear) === null || _d === void 0 ? void 0 : _d.id) && (React.createElement(FilingTimeLineCard, { filingYearId: (_e = corporate.latestFilingYear) === null || _e === void 0 ? void 0 : _e.id })))))));
     });
 };
 export default Dashboard;

package/es/modules/corporate/company/pages/CorporateClientView/Dashboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../../../../src/modules/corporate/company/pages/CorporateClientView/Dashboard.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../../../../src/modules/corporate/company/pages/CorporateClientView/Dashboard.tsx"],"names":[],"mappings":"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"}

package/es/modules/corporate/company/pages/CorporateClientView/index.js

@@ -1,18 +1,17 @@
 import React, { useEffect, useState } from "react";
 import { Navigate, Route, Routes, useParams, useResolvedPath } from "react-router-dom";
-import { faTableRows, faScrollOld, faEllipsisVertical, faBell, faEnvelopesBulk, faClipboardListCheck, faFileInvoiceDollar, } from "@fortawesome/pro-duotone-svg-icons";
+import { faTableRows, faScrollOld, faBell, faEnvelopesBulk, faClipboardListCheck, faFileInvoiceDollar, } from "@fortawesome/pro-solid-svg-icons";
 import { State } from "./state";
-import { Menu } from "antd";
+import { Menu, Skeleton } from "antd";
 import { observe, useAutorunEffect, NavPanel } from "@voplus/morpho-ui";
 import { useCorporate } from "../../../../../data/corporate";
 import { useLayout, useTabItem } from "@voplus/morpho-data";
 import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
 import AnnualFilings from "../../../filing-record/components/AnnualFilings";
 import Dashboard from "./Dashboard";
-import CorporateMenu from "../../controls/CorporateMenu";
 import MainContent from "@voplus/morpho-ui/es/components/layout/MainContent";
 import { CurrentContactContext } from "@voplus/morpho-document-core/es/data/context/CurrentContactContext";
-import NotificationList from "@voplus/morpho-workspace/es/modules/notification/components/NotificationList2";
+import NotificationList from "@voplus/morpho-workspace/es/modules/notification/components/AllNewNotificationList";
 import VirtualAddressMailList from "../../../virtual-address-mail/components/VirtualAddressMailList";
 import Scrollbars from "react-custom-scrollbars-2";
 import "./index.less";
@@ -36,59 +35,60 @@ const CorporateClientView = () => {
     useAutorunEffect(() => {
         tab.title = `Corporate - ${corporate.name}` || "Corporate";
     });
-    return observe(() => (React.createElement(CurrentContactContext.Provider, { value: { contact: corporate.unit } },
-        React.createElement(MainContent, { className: "company-page" },
-            React.createElement(MainContent.Nav, { collapsible: true },
-                React.createElement(NavPanel, null,
-                    React.createElement("h2", { className: "nav-panel-title" },
-                        React.createElement("div", { className: "nav-panel-name" }, corporate.name),
-                        React.createElement(CorporateMenu, { id: corporate.id, unitId: params.id, icon: React.createElement(FAIcon, { icon: faEllipsisVertical }) })),
-                    React.createElement(Scrollbars, { autoHide: true },
-                        React.createElement(Menu, { className: "nav-panel-menu", mode: "inline", defaultSelectedKeys: ["/dashboard"], selectedKeys: [menuKey], items: [
-                                {
-                                    key: "/dashboard",
-                                    label: "Dashboard",
-                                    className: `${classId}-dashboard`,
-                                    icon: React.createElement(FAIcon, { icon: faTableRows }),
-                                },
-                                {
-                                    key: "/filings",
-                                    label: "Filings",
-                                    className: `${classId}-filings`,
-                                    icon: React.createElement(FAIcon, { icon: faScrollOld }),
-                                },
-                                {
-                                    key: "/mails",
-                                    label: "Mails",
-                                    className: `${classId}-mails`,
-                                    icon: React.createElement(FAIcon, { icon: faEnvelopesBulk }),
-                                },
-                                {
-                                    key: "/work-schedules",
-                                    label: "Work Schedules",
-                                    className: `${classId}-workSchedules`,
-                                    icon: React.createElement(FAIcon, { icon: faClipboardListCheck }),
-                                },
-                                {
-                                    key: "/statement",
-                                    label: "Statement",
-                                    className: `${classId}-statement`,
-                                    icon: React.createElement(FAIcon, { icon: faFileInvoiceDollar }),
-                                },
-                                {
-                                    key: "/notification",
-                                    label: "Notification",
-                                    className: `${classId}-notification`,
-                                    icon: React.createElement(FAIcon, { icon: faBell }),
-                                },
-                            ], onClick: ({ key }) => onClick(key) })))),
-            React.createElement("div", { className: "company-page-content" },
-                React.createElement(Routes, null,
-                    React.createElement(Route, { path: "dashboard", element: React.createElement(Dashboard, { corporate: corporate, unitId: params.id, membersRegisterId: state.MemberId, officersRegisterId: state.OfficerId }) }),
-                    React.createElement(Route, { path: "filings", element: React.createElement(AnnualFilings, { id: corporate.id }) }),
-                    React.createElement(Route, { path: "notification", element: React.createElement(NotificationList, { parentId: corporate.id }) }),
-                    React.createElement(Route, { path: "mails", element: React.createElement(VirtualAddressMailList, { corporateId: corporate.id }) }),
-                    React.createElement(Route, { path: "/", element: React.createElement(Navigate, { to: "dashboard" }) })))))));
+    return observe(() => {
+        var _a;
+        return (React.createElement(CurrentContactContext.Provider, { value: { contact: corporate.unit } },
+            React.createElement(Skeleton, { loading: !corporate.loaded },
+                React.createElement(MainContent, { className: "company-page" },
+                    React.createElement(MainContent.Nav, { collapsible: true },
+                        React.createElement(NavPanel, null,
+                            React.createElement(Scrollbars, { autoHide: true },
+                                React.createElement(Menu, { className: "nav-panel-menu", mode: "inline", defaultSelectedKeys: ["/dashboard"], selectedKeys: [menuKey], items: [
+                                        {
+                                            key: "/dashboard",
+                                            label: "Dashboard",
+                                            className: `${classId}-dashboard`,
+                                            icon: React.createElement(FAIcon, { icon: faTableRows }),
+                                        },
+                                        {
+                                            key: "/filings",
+                                            label: "Filings",
+                                            className: `${classId}-filings`,
+                                            icon: React.createElement(FAIcon, { icon: faScrollOld }),
+                                        },
+                                        {
+                                            key: "/mails",
+                                            label: "Mails",
+                                            className: `${classId}-mails`,
+                                            icon: React.createElement(FAIcon, { icon: faEnvelopesBulk }),
+                                        },
+                                        {
+                                            key: "/work-schedules",
+                                            label: "Work Schedules",
+                                            className: `${classId}-workSchedules`,
+                                            icon: React.createElement(FAIcon, { icon: faClipboardListCheck }),
+                                        },
+                                        {
+                                            key: "/statement",
+                                            label: "Statement",
+                                            className: `${classId}-statement`,
+                                            icon: React.createElement(FAIcon, { icon: faFileInvoiceDollar }),
+                                        },
+                                        {
+                                            key: "/notification",
+                                            label: "Notification",
+                                            className: `${classId}-notification`,
+                                            icon: React.createElement(FAIcon, { icon: faBell }),
+                                        },
+                                    ], onClick: ({ key }) => onClick(key) })))),
+                    React.createElement("div", { className: "company-page-content" },
+                        React.createElement(Routes, null,
+                            React.createElement(Route, { path: "dashboard", element: React.createElement(Dashboard, { corporate: corporate, unitId: (_a = corporate.unit) === null || _a === void 0 ? void 0 : _a.id, membersRegisterId: state.MemberId, officersRegisterId: state.OfficerId }) }),
+                            React.createElement(Route, { path: "filings", element: React.createElement(AnnualFilings, { id: corporate.id }) }),
+                            React.createElement(Route, { path: "notification", element: React.createElement(NotificationList, { parentId: corporate.id }) }),
+                            React.createElement(Route, { path: "mails", element: React.createElement(VirtualAddressMailList, { corporateId: corporate.id }) }),
+                            React.createElement(Route, { path: "/", element: React.createElement(Navigate, { to: "dashboard" }) })))))));
+    });
     function onClick(key) {
         setMenuKey(key.toString());
         layout.history.push(`${url}${key}`);

package/es/modules/corporate/company/pages/CorporateClientView/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/corporate/company/pages/CorporateClientView/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/corporate/company/pages/CorporateClientView/index.tsx"],"names":[],"mappings":"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"}

package/es/modules/corporate/company/pages/CorporateClientView/index.less

@@ -31,30 +31,27 @@
 }
 
 .dashboard-content {
+	display: flex;
+	flex-direction: column;
 	height: 100%;
 	background: #f5f9fc;
 
 	:global {
-		.corporate-dashboard-alert {
-			border: none;
-			border-radius: 0;
-			margin-top: 10px;
+		.dashboard-related-document {
+			margin: 0;
 		}
 
-		.dashboard-content-header {
-			padding: 2em 0px 1em 0px;
+		.document-table-list-card,
+		.capital-card,
+		.shares-card,
+		.subscriptions-schedule-time-line-card {
+			margin-bottom: 15px;
 		}
 
-		.activity-log-card {
-			// height: calc(100% - 1.25rem);
-			margin-top: 1.25rem;
-			overflow: hidden;
-			border-radius: 0.5rem;
-			border: 1px solid rgb(229 231 235);
-		}
-
-		.activity-log-view,.activity-log-view3 {
-			background: #fff;
+		.filing-time-line-height {
+			.subscriptions-schedule-time-line-card {
+				height: 100%;
+			}
 		}
 	}
 }

package/es/modules/corporate/filing-record/components/FilingTimeLineCard/index.d.ts

@@ -0,0 +1,6 @@
+import React from "react";
+import "./index.less";
+declare const FilingTimeLineCard: (props: {
+    filingYearId: string;
+}) => React.JSX.Element;
+export default FilingTimeLineCard;

package/es/modules/corporate/filing-record/components/FilingTimeLineCard/index.js

@@ -0,0 +1,66 @@
+import { ListDataContext, useCreateListDataState } from "@voplus/morpho-ui/es/data";
+import React, { useState } from "react";
+import { faCheck, faThumbsUp } from "@fortawesome/pro-light-svg-icons";
+import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
+import { useFilingRecoreListEffect } from "../../../../../data/filing-record";
+import UTCShortDate from "@voplus/morpho-ui/es/controls/UTCShortDate";
+import { observe, useRenderOnChange } from "@voplus/morpho-ui";
+import { Scrollbars } from "react-custom-scrollbars-2";
+import { Empty, Skeleton, Timeline } from "antd";
+import Card from "@voplus/morpho-ui/es/controls/Card";
+import classnames from "classnames";
+import { State } from "./state";
+import "./index.less";
+import FilingQuickViewDialog from "../FilingRecordQuickViewDialog";
+import { useAutoUpdateListData } from "../../../../../data/filing-record/filing-record-events";
+const FilingTimeLineCard = (props) => {
+    const { filingYearId } = props;
+    const [state] = useState(new State());
+    const [visibleQuickView, setVisibleQuickView] = useState({ id: "", visible: false });
+    const list = useCreateListDataState({
+        filterDefaults: {
+            filters: [{ c: "ParentNodeId", o: "=", l: "And", v1: filingYearId }],
+            page: { Page: 1, PageSize: 300 },
+        },
+    }, [filingYearId]);
+    /** useOnNewDocument, useOnDeleteDocument的sugar syntax 自動更新list. */
+    useAutoUpdateListData(list, (d) => d.parentId === filingYearId);
+    useRenderOnChange(() => list.filters.options);
+    /** 把ListDataState传给useWorkScheduleListEffect,使之可以自動更新loading, hasmore. */
+    useFilingRecoreListEffect(list, (result, total) => {
+        list.union(result);
+        state.dateList = result;
+    }, {
+        Total: true,
+        ...list.filters.options,
+    });
+    return observe(() => (React.createElement(ListDataContext.Provider, { value: list },
+        React.createElement(Card, { className: "subscriptions-schedule-time-line-card shadow ring-1 ring-black ring-opacity-5" },
+            React.createElement("div", { className: "subscriptions-schedule-time-line" },
+                React.createElement("div", { className: "time-line-heard" },
+                    React.createElement("div", { className: "title" }, "Latest Filing Year Time Line"),
+                    React.createElement("div", null, "Track your company filing timeline yearly here")),
+                React.createElement("div", { className: "schedule-time-line-content" },
+                    React.createElement(Scrollbars, { autoHide: true },
+                        React.createElement("div", { className: "work-schedule-time-line" },
+                            React.createElement(Skeleton, { loading: list.loading }, !state.dateList.length ? (React.createElement(Empty, { image: Empty.PRESENTED_IMAGE_SIMPLE })) : (React.createElement(React.Fragment, null, state.monthList(state.dateList).map((m) => {
+                                return (React.createElement("div", { className: "", key: m.name },
+                                    React.createElement("div", { className: "time-line-month-title" }, m.name),
+                                    React.createElement(Timeline, { items: m.items.map((item, index) => {
+                                            return {
+                                                className: classnames("time-line-dot"),
+                                                dot: item.fileDate ? (React.createElement(FAIcon, { icon: faCheck, color: "#fff" })) : (React.createElement(FAIcon, { icon: faThumbsUp, color: "#fff" })),
+                                                children: (React.createElement("div", { className: "time-line-info" },
+                                                    React.createElement("div", { className: "time-line-name", onClick: () => onQuickView(item.id) }, item.name),
+                                                    React.createElement("div", null, item.dueDate ? (React.createElement(UTCShortDate, { value: item.dueDate, format: "DD MMM" })) : null))),
+                                            };
+                                        }) })));
+                            }))))))))),
+        visibleQuickView.visible && visibleQuickView.id && (React.createElement(FilingQuickViewDialog, { id: visibleQuickView.id, visible: true, onCancel: onQuickView })))));
+    /** Quick View */
+    function onQuickView(id) {
+        setVisibleQuickView({ id: id, visible: !visibleQuickView.visible });
+    }
+};
+export default FilingTimeLineCard;
+//# sourceMappingURL=index.js.map

package/es/modules/corporate/filing-record/components/FilingTimeLineCard/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/corporate/filing-record/components/FilingTimeLineCard/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAiB,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC7F,OAAO,YAAY,MAAM,4CAA4C,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,IAAI,MAAM,oCAAoC,CAAC;AACtD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,cAAc,CAAC;AACtB,OAAO,qBAAqB,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAE/F,MAAM,kBAAkB,GAAG,CAAC,KAA+B,EAAE,EAAE;IAC9D,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAC/B,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IACtC,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAGrD,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAE/B,MAAM,IAAI,GAAG,sBAAsB,CAClC;QACC,cAAc,EAAE;YACf,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;YACpE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE;SAChC;KACD,EACD,CAAC,YAAY,CAAC,CACd,CAAC;IAEF,mEAAmE;IACnE,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC;IAEhE,iBAAiB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAE9C,0EAA0E;IAC1E,yBAAyB,CACxB,IAAI,EACJ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACjB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnB,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;IACzB,CAAC,EACD;QACC,KAAK,EAAE,IAAI;QACX,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO;KACvB,CACD,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,eAAe,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI;QACpC,oBAAC,IAAI,IAAC,SAAS,EAAC,+EAA+E;YAC9F,6BAAK,SAAS,EAAC,kCAAkC;gBAChD,6BAAK,SAAS,EAAC,iBAAiB;oBAC/B,6BAAK,SAAS,EAAC,OAAO,mCAAmC;oBACzD,kFAAyD,CACpD;gBACN,6BAAK,SAAS,EAAC,4BAA4B;oBAC1C,oBAAC,UAAU,IAAC,QAAQ;wBACnB,6BAAK,SAAS,EAAC,yBAAyB;4BACvC,oBAAC,QAAQ,IAAC,OAAO,EAAE,IAAI,CAAC,OAAO,IAC7B,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CACzB,oBAAC,KAAK,IAAC,KAAK,EAAE,KAAK,CAAC,sBAAsB,GAAI,CAC9C,CAAC,CAAC,CAAC,CACH,0CACE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gCAC1C,OAAO,CACN,6BAAK,SAAS,EAAC,EAAE,EAAC,GAAG,EAAE,CAAC,CAAC,IAAI;oCAC5B,6BAAK,SAAS,EAAC,uBAAuB,IAAE,CAAC,CAAC,IAAI,CAAO;oCACrD,oBAAC,QAAQ,IACR,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;4CAClC,OAAO;gDACN,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC;gDACtC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CACpB,oBAAC,MAAM,IAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAC,MAAM,GAAG,CACtC,CAAC,CAAC,CAAC,CACH,oBAAC,MAAM,IAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAC,MAAM,GAAG,CACzC;gDACD,QAAQ,EAAE,CACT,6BAAK,SAAS,EAAC,gBAAgB;oDAC9B,6BACC,SAAS,EAAC,gBAAgB,EAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,IAElC,IAAI,CAAC,IAAI,CACL;oDACN,iCACE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACf,oBAAC,YAAY,IAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAC,QAAQ,GAAG,CACrD,CAAC,CAAC,CAAC,IAAI,CACH,CACD,CACN;6CACD,CAAC;wCACH,CAAC,CAAC,GACD,CACG,CACN,CAAC;4BACH,CAAC,CAAC,CACA,CACH,CACS,CACN,CACM,CACR,CACD,CACA;QACN,gBAAgB,CAAC,OAAO,IAAI,gBAAgB,CAAC,EAAE,IAAI,CACnD,oBAAC,qBAAqB,IAAC,EAAE,EAAE,gBAAgB,CAAC,EAAG,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,GAAI,CACzF,CACyB,CAC3B,CAAC,CAAC;IAEH,iBAAiB;IACjB,SAAS,WAAW,CAAC,EAAW;QAC/B,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;IACrE,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/es/modules/corporate/filing-record/components/FilingTimeLineCard/index.less

@@ -0,0 +1,67 @@
+@import "~@voplus/morpho-theme/styles/index.less";
+
+:global {
+	.subscriptions-schedule-time-line-card {
+		height: 420px;
+		background: #fff;
+		border-radius: @border-radius;
+		padding: 13px 12px 10px 10px;
+		.subscriptions-schedule-time-line {
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			.schedule-time-line-content {
+				height: 100%;
+				// border-radius: @border-radius;
+				// border: 1px solid #e6e6e6;
+			}
+			// .work-schedule-time-line {
+			//   padding: 6px 6px 0;
+			// }
+			.time-line-heard {
+				font-size: 14px;
+				color: #5d5d5d;
+				margin-bottom: 5px;
+				.title {
+					font-size: 16px;
+					color: #217eb2;
+					font-weight: bold;
+				}
+			}
+			.time-line-dot {
+				padding-bottom: 16px;
+				.ant-timeline-item-head {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 10px;
+					width: 16px;
+					height: 16px;
+					border-radius: 50%;
+					color: #21b242;
+					border-color: #21b242;
+					background: #21b242;
+					inset-inline-start: 10px;
+				}
+			}
+			.time-line-info {
+				display: flex;
+				color: #cbcbcb;
+				.time-line-name {
+					flex: 1;
+					color: #868686;
+					cursor: pointer;
+				}
+			}
+			.time-line-month-title {
+				height: 38px;
+				line-height: 38px;
+				color: #217eb2;
+				background: #e7f1fc;
+				font-weight: bold;
+				padding: 0 16px;
+				margin-bottom: 12px;
+			}
+		}
+	}
+}

package/es/modules/corporate/filing-record/components/FilingTimeLineCard/state.d.ts

@@ -0,0 +1,11 @@
+import { IFilingRecore } from "../../../../../data/filing-record";
+export declare class State {
+    constructor();
+    /** 日期 月份 分类 */
+    dateList: IFilingRecore[];
+    groupByMonth(items: IFilingRecore[]): any;
+    monthList(data: IFilingRecore[]): {
+        name: string;
+        items: IFilingRecore[];
+    }[];
+}