replace with useSiteUrlWithEmptyValueWarn

apps/app/src/client/components/Admin/Security/GitHubSecuritySettingContents.jsx

@@ -10,9 +10,9 @@ import urljoin from 'url-join';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminGitHubSecurityContainer from '~/client/services/AdminGitHubSecurityContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import { useSiteUrl } from '~/stores-universal/context';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
+import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 
 class GitHubSecurityManagementContents extends React.Component {
 
@@ -194,7 +194,7 @@ class GitHubSecurityManagementContents extends React.Component {
 
 const GitHubSecurityManagementContentsFC = (props) => {
   const { t } = useTranslation('admin');
-  const { data: siteUrl } = useSiteUrl();
+  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
   return <GitHubSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
 };
 
@@ -210,6 +210,7 @@ GitHubSecurityManagementContents.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   adminGeneralSecurityContainer: PropTypes.instanceOf(AdminGeneralSecurityContainer).isRequired,
   adminGitHubSecurityContainer: PropTypes.instanceOf(AdminGitHubSecurityContainer).isRequired,
+  siteUrl: PropTypes.string.isRequired,
 };
 
 export default GitHubSecurityManagementContentsWrapper;

apps/app/src/client/components/Admin/Security/GoogleSecuritySettingContents.jsx

@@ -8,7 +8,7 @@ import urljoin from 'url-join';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminGoogleSecurityContainer from '~/client/services/AdminGoogleSecurityContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import { useSiteUrl } from '~/stores-universal/context';
+import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
@@ -200,7 +200,7 @@ class GoogleSecurityManagementContents extends React.Component {
 
 const GoogleSecurityManagementContentsFc = (props) => {
   const { t } = useTranslation('admin');
-  const { data: siteUrl } = useSiteUrl();
+  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
   return <GoogleSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
 };
 

apps/app/src/client/components/Admin/Security/OidcSecuritySettingContents.jsx

@@ -9,7 +9,7 @@ import urljoin from 'url-join';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminOidcSecurityContainer from '~/client/services/AdminOidcSecurityContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import { useSiteUrl } from '~/stores-universal/context';
+import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
@@ -476,7 +476,7 @@ OidcSecurityManagementContents.propTypes = {
 
 const OidcSecurityManagementContentsWrapperFC = (props) => {
   const { t } = useTranslation('admin');
-  const { data: siteUrl } = useSiteUrl();
+  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
   return <OidcSecurityManagementContents t={t} {...props} siteUrl={siteUrl} />;
 };
 

apps/app/src/client/components/Admin/Security/SamlSecuritySettingContents.jsx

@@ -11,9 +11,9 @@ import urljoin from 'url-join';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminSamlSecurityContainer from '~/client/services/AdminSamlSecurityContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import { useSiteUrl } from '~/stores-universal/context';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
+import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 
 
 class SamlSecurityManagementContents extends React.Component {
@@ -546,12 +546,12 @@ SamlSecurityManagementContents.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   adminGeneralSecurityContainer: PropTypes.instanceOf(AdminGeneralSecurityContainer).isRequired,
   adminSamlSecurityContainer: PropTypes.instanceOf(AdminSamlSecurityContainer).isRequired,
-  siteUrl: PropTypes.string,
+  siteUrl: PropTypes.string.isRequired,
 };
 
 const SamlSecurityManagementContentsWrapperFC = (props) => {
   const { t } = useTranslation('admin');
-  const { data: siteUrl } = useSiteUrl();
+  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
   return <SamlSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
 };
 

apps/app/src/client/components/Admin/SlackIntegration/WithProxyAccordions.jsx

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 
 import { apiv3Put, apiv3Post } from '~/client/util/apiv3-client';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import { useSiteUrl } from '~/stores-universal/context';
+import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 import loggerFactory from '~/utils/logger';
 
 import CustomCopyToClipBoard from '../../Common/CustomCopyToClipBoard';
@@ -286,7 +286,7 @@ const TestProcess = ({
 
 const WithProxyAccordions = (props) => {
   const { t } = useTranslation();
-  const { data: siteUrl } = useSiteUrl();
+  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
   const [isLatestConnectionSuccess, setIsLatestConnectionSuccess] = useState(false);
 
   const submitForm = () => {

apps/app/src/states/global/global.ts

@@ -42,7 +42,7 @@ export const useSiteUrl = (): UseAtom<typeof siteUrlAtom> => {
 };
 
 // Site URL atom (no persistence needed as it's server-provided)
-export const siteUrlWithEmptyValueWarnAtom = atom<string>();
+export const siteUrlWithEmptyValueWarnAtom = atom<string>('');
 export const useSiteUrlWithEmptyValueWarn = (): UseAtom<
   typeof siteUrlWithEmptyValueWarnAtom
 > => {