From f4d54a4b4b2aff220ac225b268bf76b3e59c4c3f Mon Sep 17 00:00:00 2001 From: Omar Alshaker Date: Thu, 20 Jun 2024 23:11:43 +0200 Subject: [PATCH] Move away further from Calypso --- .../src/components/help-center-article-fetching-content.tsx | 2 +- .../help-center/src/components/help-center-contact-form.tsx | 4 ++-- .../help-center/src/components/help-center-search-results.tsx | 2 +- packages/help-center/src/constants.ts | 1 + .../help-center/src/hooks}/use-help-search-query.ts | 0 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 packages/help-center/src/constants.ts rename {client/data/help => packages/help-center/src/hooks}/use-help-search-query.ts (100%) diff --git a/packages/help-center/src/components/help-center-article-fetching-content.tsx b/packages/help-center/src/components/help-center-article-fetching-content.tsx index d937badf62aca4..7c63787ce23740 100644 --- a/packages/help-center/src/components/help-center-article-fetching-content.tsx +++ b/packages/help-center/src/components/help-center-article-fetching-content.tsx @@ -1,8 +1,8 @@ /* eslint-disable no-restricted-imports */ import { useLocale } from '@automattic/i18n-utils'; import { useEffect } from 'react'; -import { SUPPORT_BLOG_ID } from 'calypso/blocks/inline-help/constants'; import useSupportArticleAlternatesQuery from 'calypso/data/support-article-alternates/use-support-article-alternates-query'; +import { SUPPORT_BLOG_ID } from '../constants'; import { usePostByKey } from '../hooks/use-post-by-key'; import ArticleContent from './help-center-article-content'; import './help-center-article-content.scss'; diff --git a/packages/help-center/src/components/help-center-contact-form.tsx b/packages/help-center/src/components/help-center-contact-form.tsx index cf1c90bb20ad1f..10a04f5dcf1e98 100644 --- a/packages/help-center/src/components/help-center-contact-form.tsx +++ b/packages/help-center/src/components/help-center-contact-form.tsx @@ -13,12 +13,12 @@ import { Button, TextControl, CheckboxControl, Tip } from '@wordpress/components import { useDispatch, useSelect } from '@wordpress/data'; import { __ } from '@wordpress/i18n'; import { Icon, info } from '@wordpress/icons'; +import { getQueryArgs } from '@wordpress/url'; import { useCallback, useEffect, useRef, useState } from 'react'; import { useNavigate, useLocation } from 'react-router-dom'; import { useDebounce } from 'use-debounce'; import { decodeEntities, preventWidows } from 'calypso/lib/formatting'; import { isWcMobileApp } from 'calypso/lib/mobile-app'; -import { getQueryArgs } from 'calypso/lib/query-args'; /** * Internal Dependencies */ @@ -353,7 +353,7 @@ export const HelpCenterContactForm = ( props: HelpCenterContactFormProps ) => { `Plan: ${ productId } - ${ productName } (${ productTerm })`, ]; - if ( getQueryArgs()?.ref === 'woocommerce-com' ) { + if ( getQueryArgs( window.location.href )?.ref === 'woocommerce-com' ) { ticketMeta.push( `Created during store setup on ${ isWcMobileApp() ? 'Woo mobile app' : 'Woo browser' diff --git a/packages/help-center/src/components/help-center-search-results.tsx b/packages/help-center/src/components/help-center-search-results.tsx index 3eabf2a63cc7f4..1b6ca36e54ac3b 100644 --- a/packages/help-center/src/components/help-center-search-results.tsx +++ b/packages/help-center/src/components/help-center-search-results.tsx @@ -24,11 +24,11 @@ import { debounce } from 'lodash'; import PropTypes from 'prop-types'; import { Fragment, useEffect, useMemo } from 'react'; import { useDebounce } from 'use-debounce'; -import { useHelpSearchQuery } from 'calypso/data/help/use-help-search-query'; import { decodeEntities, preventWidows } from 'calypso/lib/formatting'; import { useHelpCenterContext } from '../contexts/HelpCenterContext'; import { useAdminResults } from '../hooks/use-admin-results'; import { useContextBasedSearchMapping } from '../hooks/use-context-based-search-mapping'; +import { useHelpSearchQuery } from '../hooks/use-help-search-query'; import { useSiteIntent } from '../hooks/use-site-intent'; import PlaceholderLines from './placeholder-lines'; import type { SearchResult } from '../types'; diff --git a/packages/help-center/src/constants.ts b/packages/help-center/src/constants.ts new file mode 100644 index 00000000000000..ac04c3deaeba35 --- /dev/null +++ b/packages/help-center/src/constants.ts @@ -0,0 +1 @@ +export const SUPPORT_BLOG_ID = 9619154; diff --git a/client/data/help/use-help-search-query.ts b/packages/help-center/src/hooks/use-help-search-query.ts similarity index 100% rename from client/data/help/use-help-search-query.ts rename to packages/help-center/src/hooks/use-help-search-query.ts