From 59a266dd848d5c346695ce51376443a01507f896 Mon Sep 17 00:00:00 2001 From: Ramya krishna Date: Fri, 26 Apr 2024 11:58:49 +0530 Subject: [PATCH] comments are addressed --- build/index.asset.php | 2 +- src/components/OnboardingList.js | 18 ++++------------ src/components/OnboardingScreen.js | 2 +- src/configs/OnboardingList.config.js | 31 +++++++++++++--------------- src/configs/Utility.js | 12 +++++++++++ 5 files changed, 32 insertions(+), 33 deletions(-) create mode 100644 src/configs/Utility.js diff --git a/build/index.asset.php b/build/index.asset.php index 542d8cee..e0ca98c2 100644 --- a/build/index.asset.php +++ b/build/index.asset.php @@ -1 +1 @@ - array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'c6147259a9b626f98199'); + array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'e72128cbb42973f2488a'); diff --git a/src/components/OnboardingList.js b/src/components/OnboardingList.js index 5027a4ec..b476e5df 100644 --- a/src/components/OnboardingList.js +++ b/src/components/OnboardingList.js @@ -9,7 +9,7 @@ import { Card, Link, Spinner, Title } from "@newfold/ui-component-library"; import useSWRMutation from "swr/mutation"; import { OnboardingListDefinition } from "../configs/OnboardingList.config"; import { useCardManager } from "./useCardManager"; -import { BH_UR_REGEX, HG_UR_REGEX } from "../constants"; +import { check_url_match } from "../configs/Utility"; function OnboardingCheckListItem({ children, actions, state, ...props }) { let manageAction = useSWRMutation(props.name, async () => { @@ -62,17 +62,7 @@ function OnboardingCheckListItem({ children, actions, state, ...props }) { ); } -const check_url_match = () => { - const brandName = (NewfoldRuntime?.sdk?.ecommerce?.brand_settings?.name).toLowerCase(); - switch (brandName){ - case "bluehost": - return !(BH_UR_REGEX.test(window.location.origin)); - case "hostgator": - return !(HG_UR_REGEX.test(window.location.origin)); - default: - return true; - } -} +const brandName = (NewfoldRuntime?.sdk?.ecommerce?.brand_settings?.name).toLowerCase(); export function OnboardingList(props) { let [view, setView] = useState("incomplete"); @@ -90,8 +80,8 @@ export function OnboardingList(props) { props.isMigrationCompleted ? items.slice(0, 3) : (view === "incomplete" ? incompleteItems.slice(0, 5) : completedItems); const migration_text = { - title: check_url_match() && props.webServersUpdated ? __("Good job!", "wp-module-ecommerce") : __("One last thing to do...", "wp-module-ecommerce"), - description: check_url_match() && props.webServersUpdated ? __("Your site is now ready for public visitors!", "wp-module-ecommerce") : __("Finish this last step so your migrated site is ready for visitors.", "wp-module-ecommerce") + title: check_url_match( brandName ) && props.webServersUpdated ? __("Good job!", "wp-module-ecommerce") : __("One last thing to do...", "wp-module-ecommerce"), + description: check_url_match( brandName ) && props.webServersUpdated ? __("Your site is now ready for public visitors!", "wp-module-ecommerce") : __("Finish this last step so your migrated site is ready for visitors.", "wp-module-ecommerce") } return ( diff --git a/src/components/OnboardingScreen.js b/src/components/OnboardingScreen.js index b99ece09..1d08cef2 100644 --- a/src/components/OnboardingScreen.js +++ b/src/components/OnboardingScreen.js @@ -65,7 +65,7 @@ export function OnboardingScreen({ useEffect(() => { WordPressSdk.settings.get().then((res) => { - setIsMigrationCompleted( res.showMigrationSteps ); + setIsMigrationCompleted( res.showMigrationSteps || false ); setWebServersUpdated( res.update_site_server_clicked ); if (res?.page_on_front && res?.show_on_front === "page") { setEditUrl( diff --git a/src/configs/OnboardingList.config.js b/src/configs/OnboardingList.config.js index 41ed0ad5..796437c0 100644 --- a/src/configs/OnboardingList.config.js +++ b/src/configs/OnboardingList.config.js @@ -18,7 +18,7 @@ import { get_tax_configured, get_settings_list } from "./selectors"; -import { BH_UR_REGEX, HG_UR_REGEX } from "../constants"; +import { check_url_match } from "./Utility"; const parsePluginStatus = (plugins) => ({ isWCActive: PluginsSdk.queries.isPlugin(plugins, ["woocommerce"], "active"), @@ -68,16 +68,7 @@ const signUpYoastSEOAcademy = () => { const brandName = (NewfoldRuntime?.sdk?.ecommerce?.brand_settings?.name).toLowerCase(); -const check_url_match = () => { - switch (brandName) { - case "bluehost": - return !(BH_UR_REGEX.test(window.location.origin)); - case "hostgator": - return !(HG_UR_REGEX.test(window.location.origin)); - default: - return true; - } -} + export function OnboardingListDefinition(props) { const installJetpack = createPluginInstallAction("jetpack", 20, props); @@ -98,7 +89,7 @@ export function OnboardingListDefinition(props) { "wp-module-ecommerce" ), state: { - isCompleted: (queries) => queries?.settings?.update_site_server_clicked || check_url_match(), + isCompleted: (queries) => queries?.settings?.update_site_server_clicked || check_url_match(brandName), isMigrated: (queries) => queries?.settings?.showMigrationSteps || props.isMigrationCompleted }, shouldRender: (state) => (state.isMigrated), @@ -106,7 +97,10 @@ export function OnboardingListDefinition(props) { manage: () => updateSiteServers(props.setWebServersUpdated), }, - "data-nfdhelpcenterquery": "How do I update my nameserver to BH?", + "data-nfdhelpcenterquery": __( + "How do I update my nameserver to BH?", + "wp-module-ecommerce" + ), queries: [ { key: "settings", selector: get_settings_list } ], @@ -118,11 +112,14 @@ export function OnboardingListDefinition(props) { "wp-module-ecommerce" ), state: { - isCompleted: () => check_url_match(), + isCompleted: () => check_url_match( brandName ), isMigrated: (queries) => queries?.settings?.showMigrationSteps || props.isMigrationCompleted, }, - "data-nfdhelpcenterquery": "How do I connect my site to the Domain ?", + "data-nfdhelpcenterquery": __( + "How do I connect my site to the Domain ?", + "wp-module-ecommerce" + ), shouldRender: (state) => state.isMigrated, actions: { manage: updateSiteDomain, @@ -138,7 +135,7 @@ export function OnboardingListDefinition(props) { "wp-module-ecommerce" ), state: { - isCompleted: (queries) => (queries?.settings?.update_site_server_clicked && check_url_match()) || check_url_match(), + isCompleted: (queries) => (queries?.settings?.update_site_server_clicked && check_url_match(brandName)) || check_url_match(brandName), isMigrated: (queries) => queries?.settings?.showMigrationSteps, className: () => "nfd-bg-canvas", hideCheck: () => true, @@ -160,7 +157,7 @@ export function OnboardingListDefinition(props) { ), state: { isCompleted: (queries) => false, - isMigrated: (queries) => queries?.settings?.showMigrationSteps && (queries?.settings?.update_site_server_clicked || check_url_match()), + isMigrated: (queries) => queries?.settings?.showMigrationSteps && (queries?.settings?.update_site_server_clicked || check_url_match(brandName)), }, shouldRender: (state) => state.isMigrated && !state.isCompleted, actions: { diff --git a/src/configs/Utility.js b/src/configs/Utility.js new file mode 100644 index 00000000..93395041 --- /dev/null +++ b/src/configs/Utility.js @@ -0,0 +1,12 @@ +import { BH_UR_REGEX, HG_UR_REGEX } from "../constants"; + +export const check_url_match = (brandName) => { + switch (brandName) { + case "bluehost": + return !(BH_UR_REGEX.test(window.location.origin)); + case "hostgator": + return !(HG_UR_REGEX.test(window.location.origin)); + default: + return true; + } + } \ No newline at end of file