From 044d6fde65b598e1573eef3df0ec4225291223db Mon Sep 17 00:00:00 2001 From: M Fahru Date: Thu, 10 Nov 2022 11:21:56 -0700 Subject: [PATCH] Fix webpack build failure on server pro/CE: - Add missing modules for local image dev env - Use macro import to import modules GitOrigin-RevId: 403a9950bc74063a9c9d34c9bc912af18f418e85 --- services/web/config/settings.defaults.js | 1 + .../editor-left-menu/components/help-contact-us.tsx | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index 8e07337e92..5ebf5bea83 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -782,6 +782,7 @@ module.exports = { integrationLinkingWidgets: [], referenceLinkingWidgets: [], importProjectFromGithubModalWrapper: [], + editorLeftMenuSync: [], }, moduleImportSequence: ['launchpad', 'server-ce-scripts', 'user-activate'], diff --git a/services/web/frontend/js/features/editor-left-menu/components/help-contact-us.tsx b/services/web/frontend/js/features/editor-left-menu/components/help-contact-us.tsx index cb924b42c0..9775948a3c 100644 --- a/services/web/frontend/js/features/editor-left-menu/components/help-contact-us.tsx +++ b/services/web/frontend/js/features/editor-left-menu/components/help-contact-us.tsx @@ -1,16 +1,15 @@ -import { useState } from 'react' import { useTranslation } from 'react-i18next' -import ContactUsModal from '../../../../../modules/support/frontend/js/components/contact-us-modal' +import { useContactUsModal } from '../../../shared/hooks/use-contact-us-modal' import LeftMenuButton from './left-menu-button' export default function HelpContactUs() { - const [showModal, setShowModal] = useState(false) + const { modal, showModal } = useContactUsModal() const { t } = useTranslation() return ( <> setShowModal(true)} + onClick={showModal} icon={{ type: 'question', fw: true, @@ -18,7 +17,7 @@ export default function HelpContactUs() { > {t('contact_us')} - setShowModal(false)} /> + {modal} ) }