feat(web-hosting): fix tests and add get expanded row

ref: #PUWEPT-86

Signed-off-by: stif59100 <[email protected]>

Author: stif59100

packages/manager/apps/web-hosting/package.json

@@ -30,11 +30,10 @@
     "@ovh-ux/manager-react-shell-client": "^0.11.2",
     "@ovh-ux/manager-tailwind-config": "^0.6.1",
     "@ovh-ux/request-tagger": "^0.5.9",
-    "@ovh-ux/shell": "^4.9.2",
-    "@ovhcloud/ods-components": "^18.6.2",
-    "@ovhcloud/ods-themes": "^18.6.2",
-    "@ovh-ux/muk": "^0.9.0",
-    "@ovhcloud/ods-react": "^19.2.1",
+    "@ovh-ux/shell": "^4.9.2",  
+    "@ovh-ux/muk": "^0.9.1",
+    "@ovhcloud/ods-react": "^19.3.0",
+    "@ovhcloud/ods-themes": "^19.3.0",
     "@tanstack/react-query": "^5.51.21",
     "@tanstack/react-table": "^8.20.1",
     "clsx": "2.1.1",

packages/manager/apps/web-hosting/src/hooks/localSeo/useDatagridColumn.tsx

@@ -97,13 +97,13 @@ export default function useDatagridColumn() {
     return [
       {
         id: 'name',
-        accessorFn: (row: LocalSeoType) => row.name, // Assurez-vous que `accessorFn` est présent et typé correctement
+        accessorKey: 'name',
         cell: ({ row }) => <div>{row.original.name}</div>,
         header: t('hosting_tab_LOCAL_SEO_table_header_name'),
       },
       {
         id: 'address',
-        accessorFn: (row: LocalSeoType) => row.address,
+        accessorKey: 'address',
         cell: ({ row }) => (
           <div>
             {row.original.address ? (
@@ -119,7 +119,7 @@ export default function useDatagridColumn() {
       },
       {
         id: 'email',
-        accessorFn: (row: LocalSeoType) => row.accountId,
+        accessorKey: 'accountId',
         cell: ({ row }) => (
           <EmailCell
             serviceName={serviceName}
@@ -130,7 +130,7 @@ export default function useDatagridColumn() {
       },
       {
         id: 'status',
-        accessorFn: (row: LocalSeoType) => row.status,
+        accessorKey: 'status',
         cell: ({ row }) => (
           <div className="w-10">
             <Badge className="my-3" color={StatusColor[row.original.status]}>

packages/manager/apps/web-hosting/src/index.scss

@@ -1,5 +1,6 @@
 @tailwind utilities;
 @import '@ovh-ux/muk/dist/style.css';
+@import '@ovhcloud/ods-themes/default';
 html {
   font-family: var(--ods-font-family-default);
 }

packages/manager/apps/web-hosting/src/pages/dashboard/OrderDomain.page.spec.tsx

@@ -22,7 +22,6 @@ import {
 
 import { ShellContext, useRouteSynchro } from '@ovh-ux/manager-react-shell-client';
 import {
-  ActionMenu,
   BaseLayout,
   ChangelogMenu,
   GuideMenu,
@@ -41,7 +40,6 @@ import { EmailOptionType } from '@/data/types/product/service';
 import { DashboardTab } from '@/data/types/product/ssl';
 import { useEmailsUrl, useHostingUrl } from '@/hooks';
 import { useOverridePage } from '@/hooks/overridePage/useOverridePage';
-import { subRoutes, urls } from '@/routes/routes.constants';
 import { CHANGELOG_LINKS } from '@/utils/changelog.constants';
 
 import { GUIDE_URL } from '../websites/websites.constants';
@@ -52,7 +50,6 @@ export default function Layout() {
   const { t } = useTranslation('dashboard');
   const isOverridedPage = useOverridePage();
   const { data } = useGetHostingService(serviceName);
-  const navigate = useNavigate();
 
   const { flattenData } = useDataApi<EmailOptionType>({
     version: 'v6',
@@ -251,19 +248,6 @@ export default function Layout() {
         <>
           <div className="mb-7 flex items-center justify-between">
             <Text>{data?.serviceName}</Text>
-            <div className="flex flex-wrap justify-end">
-              <ActionMenu
-                id="add_domain"
-                items={[
-                  {
-                    id: 1,
-                    label: t('hosting_action_add_domain'),
-                    onClick: () =>
-                      navigate(urls.orderDomain.replace(subRoutes.serviceName, serviceName)),
-                  },
-                ]}
-              />
-            </div>
           </div>
           <ExpirationDate />
           {onUpdateError && (

packages/manager/apps/web-hosting/src/pages/dashboard/OrderDomain.page.tsx

@@ -63,7 +63,7 @@ export default function LocalSeo() {
       </Button>
 
       <Datagrid
-        columns={flattenData?.length ? columns : []}
+        columns={flattenData ? columns : []}
         data={flattenData || []}
         hasNextPage={hasNextPage && !isLoading}
         onFetchNextPage={(): void => {

packages/manager/apps/web-hosting/src/pages/dashboard/layout.tsx

@@ -293,7 +293,7 @@ export default function MultisitePage() {
     <>
       {!isOverridedPage && (
         <Datagrid
-          columns={combinedData ? columns : []}
+          columns={columns}
           data={combinedData || []}
           isLoading={isLoading}
           autoScroll={false}
@@ -309,7 +309,13 @@ export default function MultisitePage() {
           expandable={{
             expanded,
             setExpanded,
-            //   getRowCanExpand: () => {},
+            getRowCanExpand: (row) => {
+              if (isDomain(row.original)) {
+                return false;
+              }
+              const website = row.original as WebHostingWebsiteType;
+              return (website.currentState?.linkedDomains ?? 0) > 0;
+            },
           }}
         />
       )}

packages/manager/apps/web-hosting/src/pages/dashboard/local-seo/LocalSeo.page.tsx

@@ -68,6 +68,6 @@ describe('MultisitePage component', () => {
       expect(getByTestId('add-website-button')).toBeInTheDocument();
     });
     const button = getByTestId('add-website-button');
-    expect(button).toHaveAttribute('label', commonTranslation.add_website);
+    expect(button).toHaveTextContent(commonTranslation.add_website);
   });
 });