diff --git a/dictation_client/src/features/license/partnerLicense/partnerLicenseSlice.ts b/dictation_client/src/features/license/partnerLicense/partnerLicenseSlice.ts index 8fd549a..ed843c4 100644 --- a/dictation_client/src/features/license/partnerLicense/partnerLicenseSlice.ts +++ b/dictation_client/src/features/license/partnerLicense/partnerLicenseSlice.ts @@ -61,6 +61,9 @@ export const partnerLicenseSlice = createSlice({ const { deleteCount } = action.payload; state.apps.hierarchicalElements.splice(-deleteCount); }, + clearHierarchicalElement: (state) => { + state.apps.hierarchicalElements = []; + }, changeSelectedRow: ( state, action: PayloadAction<{ value?: PartnerLicenseInfo }> @@ -110,6 +113,7 @@ export const { pushHierarchicalElement, popHierarchicalElement, spliceHierarchicalElement, + clearHierarchicalElement, changeSelectedRow, savePageInfo, } = partnerLicenseSlice.actions; diff --git a/dictation_client/src/pages/LicensePage/cardLicenseIssuePopup.tsx b/dictation_client/src/pages/LicensePage/cardLicenseIssuePopup.tsx index 9298a50..d3cd6fe 100644 --- a/dictation_client/src/pages/LicensePage/cardLicenseIssuePopup.tsx +++ b/dictation_client/src/pages/LicensePage/cardLicenseIssuePopup.tsx @@ -2,6 +2,10 @@ import React, { useState, useCallback, useEffect } from "react"; import { useTranslation } from "react-i18next"; import { AppDispatch } from "app/store"; import { useDispatch, useSelector } from "react-redux"; +import { + clearHierarchicalElement, + getMyAccountAsync, +} from "features/license/partnerLicense"; import styles from "../../styles/app.module.scss"; import { getTranslationID } from "../../translation"; import close from "../../assets/images/close.svg"; @@ -92,6 +96,8 @@ export const CardLicenseIssuePopup: React.FC = ( setIsPushCreateButton(false); if (meta.requestStatus === "fulfilled") { + dispatch(getMyAccountAsync()); + dispatch(clearHierarchicalElement()); closePopup(); } }, [ diff --git a/dictation_client/src/pages/LicensePage/licenseOrderPopup.tsx b/dictation_client/src/pages/LicensePage/licenseOrderPopup.tsx index 8d46a79..a6dc34b 100644 --- a/dictation_client/src/pages/LicensePage/licenseOrderPopup.tsx +++ b/dictation_client/src/pages/LicensePage/licenseOrderPopup.tsx @@ -14,6 +14,10 @@ import { cleanupApps, selectIsLoading, } from "features/license/licenseOrder"; +import { + clearHierarchicalElement, + getMyAccountAsync, +} from "features/license/partnerLicense"; import close from "../../assets/images/close.svg"; import progress_activit from "../../assets/images/progress_activit.svg"; @@ -90,6 +94,8 @@ export const LicenseOrderPopup: React.FC = (props) => { setIsPushOrderButton(false); if (meta.requestStatus === "fulfilled") { + dispatch(getMyAccountAsync()); + dispatch(clearHierarchicalElement()); closePopup(); } }, [ diff --git a/dictation_client/src/pages/LicensePage/partnerLicense.tsx b/dictation_client/src/pages/LicensePage/partnerLicense.tsx index 6e72762..acc9801 100644 --- a/dictation_client/src/pages/LicensePage/partnerLicense.tsx +++ b/dictation_client/src/pages/LicensePage/partnerLicense.tsx @@ -216,13 +216,11 @@ const PartnerLicense: React.FC = (): JSX.Element => { return ( <> - {/* 表示確認用の仮画面 */} {/* isPopupOpenがfalseの場合はポップアップのhtmlを生成しないように対応。これによりポップアップは都度生成されて初期化の考慮が減る */} {isCardLicenseIssuePopupOpen && ( { setIsCardLicenseIssuePopupOpen(false); - dispatch(getMyAccountAsync()); }} /> )} @@ -230,7 +228,6 @@ const PartnerLicense: React.FC = (): JSX.Element => { { setIslicenseOrderPopupOpen(false); - dispatch(getMyAccountAsync()); }} /> )}