From e475568d6d1bb38a11370ab9bb8368d5c17f5626 Mon Sep 17 00:00:00 2001 From: Nick Misasi Date: Fri, 7 Feb 2025 09:34:09 -0500 Subject: [PATCH] [MM-62669] Updates to cloud specific imagery in system console (#29963) * Updates to cloud specific imagery in system console * Revert something from images * Fix linter * Updates from PR feedback * Fix lint * Add svg * Lint fixes, update another SVG * change to pre-existing already-themed version of svg * change the folder of the file * add file * Adjust styling --- .../billing/billing_history.scss | 3 +- .../admin_console/billing/billing_history.tsx | 4 +- .../billing_summary/billing_summary.tsx | 4 +- .../billing/company_info_display.scss | 1 - .../billing/company_info_display.tsx | 6 +- .../chat_illustration.tsx | 0 .../svg_images_components/company_svg.tsx | 523 ++++++++++++++---- .../empty_billing_history_svg.tsx | 404 +++++--------- .../pricing_modal/blank_card_image.svg.tsx | 523 ------------------ .../src/components/pricing_modal/card.tsx | 4 +- .../global_threads/global_threads.tsx | 2 +- 11 files changed, 561 insertions(+), 913 deletions(-) rename webapp/channels/src/components/{threading/common => common/svg_images_components}/chat_illustration.tsx (100%) delete mode 100644 webapp/channels/src/components/pricing_modal/blank_card_image.svg.tsx diff --git a/webapp/channels/src/components/admin_console/billing/billing_history.scss b/webapp/channels/src/components/admin_console/billing/billing_history.scss index c6022249f8..d6569ee436 100644 --- a/webapp/channels/src/components/admin_console/billing/billing_history.scss +++ b/webapp/channels/src/components/admin_console/billing/billing_history.scss @@ -35,7 +35,7 @@ } .BillingHistory__cardBody { - padding: 20px; + padding: 48px; } .BillingHistory__noHistory { @@ -53,7 +53,6 @@ .BillingHistory__noHistory-link { margin-top: 20px; - margin-bottom: 40px; color: var(--sys-button-bg); font-size: 14px; font-weight: 600; diff --git a/webapp/channels/src/components/admin_console/billing/billing_history.tsx b/webapp/channels/src/components/admin_console/billing/billing_history.tsx index c3e10d5f9a..238841af5e 100644 --- a/webapp/channels/src/components/admin_console/billing/billing_history.tsx +++ b/webapp/channels/src/components/admin_console/billing/billing_history.tsx @@ -36,8 +36,8 @@ interface NoBillingHistorySectionProps { export const NoBillingHistorySection = (props: NoBillingHistorySectionProps) => (
{ let body = noCompanyInfoSection; const address = companyInfo?.company_address?.line1 ? companyInfo.company_address : companyInfo?.billing_address; - const isCompanyBillingFilled = address?.line1 !== undefined; + const isCompanyBillingFilled = address?.line1 !== undefined && address?.line1 !== ''; if (isCompanyBillingFilled) { body = (
diff --git a/webapp/channels/src/components/threading/common/chat_illustration.tsx b/webapp/channels/src/components/common/svg_images_components/chat_illustration.tsx similarity index 100% rename from webapp/channels/src/components/threading/common/chat_illustration.tsx rename to webapp/channels/src/components/common/svg_images_components/chat_illustration.tsx diff --git a/webapp/channels/src/components/common/svg_images_components/company_svg.tsx b/webapp/channels/src/components/common/svg_images_components/company_svg.tsx index 8465b73152..573f19b97f 100644 --- a/webapp/channels/src/components/common/svg_images_components/company_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/company_svg.tsx @@ -12,107 +12,434 @@ const CompanySvg = (props: SvgProps) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/webapp/channels/src/components/common/svg_images_components/empty_billing_history_svg.tsx b/webapp/channels/src/components/common/svg_images_components/empty_billing_history_svg.tsx index 049ae51188..f988389a1d 100644 --- a/webapp/channels/src/components/common/svg_images_components/empty_billing_history_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/empty_billing_history_svg.tsx @@ -12,306 +12,152 @@ const EmptyBillingHistorySvg = (props: SvgProps) => ( - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ); export default EmptyBillingHistorySvg; diff --git a/webapp/channels/src/components/pricing_modal/blank_card_image.svg.tsx b/webapp/channels/src/components/pricing_modal/blank_card_image.svg.tsx deleted file mode 100644 index af07eb2e6e..0000000000 --- a/webapp/channels/src/components/pricing_modal/blank_card_image.svg.tsx +++ /dev/null @@ -1,523 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -import React from 'react'; - -const BlankCardImage = () => { - return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ); -}; - -export default BlankCardImage; diff --git a/webapp/channels/src/components/pricing_modal/card.tsx b/webapp/channels/src/components/pricing_modal/card.tsx index 39695995d1..d2a69e8d12 100644 --- a/webapp/channels/src/components/pricing_modal/card.tsx +++ b/webapp/channels/src/components/pricing_modal/card.tsx @@ -8,11 +8,11 @@ import {useIntl} from 'react-intl'; import styled from 'styled-components'; import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink'; +import ChatIllustration from 'components/common/svg_images_components/chat_illustration'; import ExternalLink from 'components/external_link'; import {HostedCustomerLinks} from 'utils/constants'; -import BlankCardImage from './blank_card_image.svg'; import BuildingSvg from './building.svg'; import TadaSvg from './tada.svg'; @@ -74,7 +74,7 @@ export function BlankCard() { return (
- + {ChatIllustration}
diff --git a/webapp/channels/src/components/threading/global_threads/global_threads.tsx b/webapp/channels/src/components/threading/global_threads/global_threads.tsx index 0ae5b9d0a3..05467e0a8b 100644 --- a/webapp/channels/src/components/threading/global_threads/global_threads.tsx +++ b/webapp/channels/src/components/threading/global_threads/global_threads.tsx @@ -27,6 +27,7 @@ import {getSelectedThreadIdInCurrentTeam} from 'selectors/views/threads'; import {useGlobalState} from 'stores/hooks'; import LocalStorageStore from 'stores/local_storage_store'; +import ChatIllustration from 'components/common/svg_images_components/chat_illustration'; import LoadingScreen from 'components/loading_screen'; import NoResultsIndicator from 'components/no_results_indicator'; @@ -39,7 +40,6 @@ import {LhsItemType, LhsPage} from 'types/store/lhs'; import ThreadList, {ThreadFilter, FILTER_STORAGE_KEY} from './thread_list'; import ThreadPane from './thread_pane'; -import ChatIllustration from '../common/chat_illustration'; import {useThreadRouting} from '../hooks'; import ThreadViewer from '../thread_viewer';