From 1c7f9d46ac5e03e026069f8779909c250d987b60 Mon Sep 17 00:00:00 2001 From: hasyed-akamai Date: Mon, 9 Dec 2024 13:37:44 +0530 Subject: [PATCH 1/5] fix: [M3-8905] - Change document title from address to appropriate keyword --- packages/manager/src/features/Domains/DomainsLanding.tsx | 1 + .../src/features/ObjectStorage/BucketDetail/BucketDetail.tsx | 2 ++ .../manager/src/features/StackScripts/StackScriptsDetail.tsx | 2 ++ 3 files changed, 5 insertions(+) diff --git a/packages/manager/src/features/Domains/DomainsLanding.tsx b/packages/manager/src/features/Domains/DomainsLanding.tsx index a5b026bdc14..47e4dae0884 100644 --- a/packages/manager/src/features/Domains/DomainsLanding.tsx +++ b/packages/manager/src/features/Domains/DomainsLanding.tsx @@ -189,6 +189,7 @@ export const DomainsLanding = (props: DomainsLandingProps) => { if (domains?.results === 0) { return ( <> + { return ( <> + { const { _hasGrant, _isRestrictedUser, profile } = useAccountManagement(); @@ -114,6 +115,7 @@ export const StackScriptsDetail = () => { return ( <> + Date: Mon, 9 Dec 2024 14:41:21 +0530 Subject: [PATCH 2/5] Added changeset: Document title from URL to appropriate keyword --- packages/manager/.changeset/pr-11385-fixed-1733735480951.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/manager/.changeset/pr-11385-fixed-1733735480951.md diff --git a/packages/manager/.changeset/pr-11385-fixed-1733735480951.md b/packages/manager/.changeset/pr-11385-fixed-1733735480951.md new file mode 100644 index 00000000000..b939ad60f34 --- /dev/null +++ b/packages/manager/.changeset/pr-11385-fixed-1733735480951.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Fixed +--- + +Document title from URL to appropriate keyword ([#11385](https://github.com/linode/manager/pull/11385)) From b5ed848a1f4512f6321858a653288527af5794e4 Mon Sep 17 00:00:00 2001 From: hasyed-akamai Date: Tue, 10 Dec 2024 15:27:23 +0530 Subject: [PATCH 3/5] Make Document title more descriptive --- .../src/features/ObjectStorage/BucketDetail/BucketDetail.tsx | 5 ++--- .../manager/src/features/StackScripts/StackScriptsDetail.tsx | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/manager/src/features/ObjectStorage/BucketDetail/BucketDetail.tsx b/packages/manager/src/features/ObjectStorage/BucketDetail/BucketDetail.tsx index b0753729740..cf8c6f09be8 100644 --- a/packages/manager/src/features/ObjectStorage/BucketDetail/BucketDetail.tsx +++ b/packages/manager/src/features/ObjectStorage/BucketDetail/BucketDetail.tsx @@ -10,6 +10,7 @@ import { debounce } from 'throttle-debounce'; import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel'; import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog'; +import { DocumentTitleSegment } from 'src/components/DocumentTitle'; import { Hidden } from 'src/components/Hidden'; import { Table } from 'src/components/Table'; import { TableBody } from 'src/components/TableBody'; @@ -59,7 +60,6 @@ import type { ObjectStorageObjectList, } from '@linode/api-v4'; import type { InfiniteData } from '@tanstack/react-query'; -import { DocumentTitleSegment } from 'src/components/DocumentTitle'; interface MatchParams { bucketName: string; @@ -379,7 +379,7 @@ export const BucketDetail = (props: Props) => { return ( <> - + ; { )} - {!hasNextPage && numOfDisplayedObjects >= 100 && ( Showing all {numOfDisplayedObjects} items diff --git a/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx b/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx index e6a6b3011c1..766bd340da6 100644 --- a/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx +++ b/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx @@ -6,6 +6,7 @@ import { CircleProgress } from '@linode/ui'; import * as React from 'react'; import { useHistory, useLocation, useParams } from 'react-router-dom'; +import { DocumentTitleSegment } from 'src/components/DocumentTitle'; import { LandingHeader } from 'src/components/LandingHeader'; import { NotFound } from 'src/components/NotFound'; import { StackScript as _StackScript } from 'src/components/StackScript/StackScript'; @@ -20,7 +21,6 @@ import { import type { StackScript } from '@linode/api-v4/lib/stackscripts'; import type { APIError } from '@linode/api-v4/lib/types'; -import { DocumentTitleSegment } from 'src/components/DocumentTitle'; export const StackScriptsDetail = () => { const { _hasGrant, _isRestrictedUser, profile } = useAccountManagement(); @@ -115,7 +115,7 @@ export const StackScriptsDetail = () => { return ( <> - + Date: Tue, 10 Dec 2024 15:32:55 +0530 Subject: [PATCH 4/5] resolve small regression --- .../src/features/ObjectStorage/BucketDetail/BucketDetail.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/manager/src/features/ObjectStorage/BucketDetail/BucketDetail.tsx b/packages/manager/src/features/ObjectStorage/BucketDetail/BucketDetail.tsx index cf8c6f09be8..65cd221650e 100644 --- a/packages/manager/src/features/ObjectStorage/BucketDetail/BucketDetail.tsx +++ b/packages/manager/src/features/ObjectStorage/BucketDetail/BucketDetail.tsx @@ -379,7 +379,7 @@ export const BucketDetail = (props: Props) => { return ( <> - ; + Date: Wed, 11 Dec 2024 11:31:51 +0530 Subject: [PATCH 5/5] Change some more document title from address to appropriate keyword --- .../Billing/InvoiceDetail/InvoiceDetail.tsx | 269 +++++++++--------- .../Databases/DatabaseDetail/index.tsx | 6 +- .../KubernetesClusterDetail.tsx | 4 +- .../BucketDetail/BucketDetail.tsx | 2 +- .../DisplaySettings/DisplaySettings.tsx | 23 +- .../StackScripts/StackScriptsDetail.tsx | 2 +- .../StackScripts/StackScriptsLanding.tsx | 8 +- 7 files changed, 169 insertions(+), 145 deletions(-) diff --git a/packages/manager/src/features/Billing/InvoiceDetail/InvoiceDetail.tsx b/packages/manager/src/features/Billing/InvoiceDetail/InvoiceDetail.tsx index d6896013f79..45d5396ff5e 100644 --- a/packages/manager/src/features/Billing/InvoiceDetail/InvoiceDetail.tsx +++ b/packages/manager/src/features/Billing/InvoiceDetail/InvoiceDetail.tsx @@ -8,6 +8,7 @@ import * as React from 'react'; import { useParams } from 'react-router-dom'; import { Currency } from 'src/components/Currency'; +import { DocumentTitleSegment } from 'src/components/DocumentTitle'; import { DownloadCSV } from 'src/components/DownloadCSV/DownloadCSV'; import { LandingHeader } from 'src/components/LandingHeader'; import { Link } from 'src/components/Link'; @@ -117,152 +118,156 @@ export const InvoiceDetail = () => { }; return ( - - - - - - - + + + + + + + - + + + + {invoice && ( + - - - {invoice && ( - - )} + )} + + + {account && invoice && items && ( + <> + csvRef.current.link.click()} + sx={{ ...sxDownloadButton, marginRight: '8px' }} + /> + + + )} + + + {invoice && ( + + Total:{' '} + + + )} + - - {account && invoice && items && ( - <> - csvRef.current.link.click()} - sx={{ ...sxDownloadButton, marginRight: '8px' }} + + + {pdfGenerationError && ( + Failed generating PDF. + )} + + + + {invoice && ( + + + Subtotal:{' '} + - - - )} - - - {invoice && ( - + + {invoice.tax_summary.map((summary) => { + return ( + + {summary.name === 'Standard' + ? 'Standard Tax: ' + : `${summary.name}: `} + + + ); + })} + + Tax Subtotal: + + Total:{' '} - )} - + + This invoice may include Linode Compute Instances that have + been powered off as the data is maintained and resources are + still reserved. If you no longer need powered-down Linodes, + you can{' '} + + {' '} + remove the service + {' '} + from your account. + + + )} - - {pdfGenerationError && ( - Failed generating PDF. - )} - - - - {invoice && ( - - - Subtotal:{' '} - - - {invoice.tax_summary.map((summary) => { - return ( - - {summary.name === 'Standard' - ? 'Standard Tax: ' - : `${summary.name}: `} - - - ); - })} - - Tax Subtotal: - - - Total:{' '} - - - - This invoice may include Linode Compute Instances that have been - powered off as the data is maintained and resources are still - reserved. If you no longer need powered-down Linodes, you can{' '} - - {' '} - remove the service - {' '} - from your account. - - - )} - - - + + ); }; diff --git a/packages/manager/src/features/Databases/DatabaseDetail/index.tsx b/packages/manager/src/features/Databases/DatabaseDetail/index.tsx index 367dbb113b4..f81eb723e5d 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/index.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/index.tsx @@ -165,7 +165,11 @@ export const DatabaseDetail = () => { return ( <> - + { return ( - + { return ( <> - + { const isProxyUser = profile?.user_type === 'proxy'; return ( - - } spacing={3}> - {!isProxyUser && } - - - - - + <> + + + } + spacing={3} + > + {!isProxyUser && } + + + + + + ); }; diff --git a/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx b/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx index 766bd340da6..0cfa844f3b9 100644 --- a/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx +++ b/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx @@ -115,7 +115,7 @@ export const StackScriptsDetail = () => { return ( <> - + { return ( - + {!!history.location.state && !!history.location.state.successMessage ? (