A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(registration): Registration portal switch function development done
haitao(lj)b9717cd41af8
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.tsindex f657272d..843bb687 100644--- a/ui/src/common/interface.ts+++ b/ui/src/common/interface.ts@@ -320,6 +320,7 @@ export interface SiteSettings {branding: AdminSettingBranding;general: AdminSettingsGeneral;interface: AdminSettingsInterface;+ login: AdminSettingsLogin;}export interface AdminSettingBranding {diff --git a/ui/src/components/Header/index.tsx b/ui/src/components/Header/index.tsxindex 3ec00e2c..257397bc 100644--- a/ui/src/components/Header/index.tsx+++ b/ui/src/components/Header/index.tsx@@ -17,7 +17,12 @@ import {useLocation,} from 'react-router-dom';-import { loggedUserInfoStore, siteInfoStore, brandingStore } from '@/stores';+import {+ loggedUserInfoStore,+ siteInfoStore,+ brandingStore,+ loginSettingStore,+} from '@/stores';import { logout, useQueryNotificationStatus } from '@/services';import { RouteAlias } from '@/router/alias';import { DEFAULT_SITE_NAME } from '@/common/constants';@@ -35,6 +40,7 @@ const Header: FC = () => {const [searchStr, setSearch] = useState('');const siteInfo = siteInfoStore((state) => state.siteInfo);const brandingInfo = brandingStore((state) => state.branding);+ const loginSetting = loginSettingStore((state) => state.login);const { data: redDot } = useQueryNotificationStatus();const location = useLocation();const handleInput = (val) => {@@ -105,9 +111,11 @@ const Header: FC = () => {href="/users/login">{t('btns.login')}</Button>- <Button variant="light" href="/users/register">- {t('btns.signup')}- </Button>+ {loginSetting.allow_new_registrations && (+ <Button variant="light" href="/users/register">+ {t('btns.signup')}+ </Button>+ )}</>)}</div>@@ -174,9 +182,11 @@ const Header: FC = () => {href="/users/login">{t('btns.login')}</Button>- <Button variant="light" href="/users/register">- {t('btns.signup')}- </Button>+ {loginSetting.allow_new_registrations && (+ <Button variant="light" href="/users/register">+ {t('btns.signup')}+ </Button>+ )}</>)}</Col>diff --git a/ui/src/pages/Users/Login/index.tsx b/ui/src/pages/Users/Login/index.tsxindex ef2cf903..5634354f 100644--- a/ui/src/pages/Users/Login/index.tsx+++ b/ui/src/pages/Users/Login/index.tsx@@ -10,7 +10,7 @@ import type {FormDataType,} from '@/common/interface';import { Unactivate } from '@/components';-import { loggedUserInfoStore } from '@/stores';+import { loggedUserInfoStore, loginSettingStore } from '@/stores';import { guard, floppyNavigation, handleFormError } from '@/utils';import { login, checkImgCode } from '@/services';import { REDIRECT_PATH_STORAGE_KEY } from '@/common/constants';@@ -25,6 +25,7 @@ const Index: React.FC = () => {const [refresh, setRefresh] = useState(0);const updateUser = loggedUserInfoStore((state) => state.update);const storeUser = loggedUserInfoStore((state) => state.user);+ const loginSetting = loginSettingStore((state) => state.login);const [formData, setFormData] = useState<FormDataType>({e_mail: {value: '',@@ -236,15 +237,16 @@ const Index: React.FC = () => {</Button></div></Form>-- <div className="text-center mt-5">- <Trans i18nKey="login.info_sign" ns="translation">- Don’t have an account?- <Link to="/users/register" tabIndex={2}>- Sign up- </Link>- </Trans>- </div>+ {loginSetting.allow_new_registrations && (+ <div className="text-center mt-5">+ <Trans i18nKey="login.info_sign" ns="translation">+ Don’t have an account?+ <Link to="/users/register" tabIndex={2}>+ Sign up+ </Link>+ </Trans>+ </div>+ )}</Col>)}diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.tsindex e09071ff..efe0ec87 100644--- a/ui/src/router/routes.ts+++ b/ui/src/router/routes.ts@@ -144,6 +144,10 @@ const routes: RouteNode[] = [path: 'users/register',page: 'pages/Users/Register',guard: async () => {+ const allowNew = guard.allowNewRegistration();+ if (!allowNew.ok) {+ return allowNew;+ }return guard.notLogged();},},diff --git a/ui/src/stores/branding.ts b/ui/src/stores/branding.tsindex ca21f930..fea96ca0 100644--- a/ui/src/stores/branding.ts+++ b/ui/src/stores/branding.ts@@ -1,25 +1,19 @@import create from 'zustand';import { AdminSettingBranding } from '@/common/interface';-import { DEFAULT_LANG } from '@/common/constants';-interface InterfaceType {+interface IType {branding: AdminSettingBranding;update: (params: AdminSettingBranding) => void;}-const interfaceSetting = create<InterfaceType>((set) => ({+const brandingSetting = create<IType>((set) => ({branding: {logo: '',square_icon: '',mobile_logo: '',favicon: '',},- interface: {- theme: '',- language: DEFAULT_LANG,- time_zone: '',- },update: (params) =>set(() => {return {@@ -28,4 +22,4 @@ const interfaceSetting = create<InterfaceType>((set) => ({}),}));-export default interfaceSetting;+export default brandingSetting;diff --git a/ui/src/stores/global.ts b/ui/src/stores/global.tsdeleted file mode 100644index c8734b3a..00000000--- a/ui/src/stores/global.ts+++ /dev/null@@ -1,31 +0,0 @@-import create from 'zustand';--interface GlobalStoreType {- title: string;- description: string;- keywords: string;- updateTitle: (title: string) => void;- updateSeo: (params: { description: string; keywords: string }) => void;-}--const globalStore = create<GlobalStoreType>((set) => ({- title: '',- description: '',- keywords: '',- updateTitle: (params) =>- set((state) => {- return {- ...state,- title: params,- };- }),- updateSeo: (params) =>- set((state) => {- return {- ...state,- ...params,- };- }),-}));--export default globalStore;diff --git a/ui/src/stores/index.ts b/ui/src/stores/index.tsindex 55f03a7d..c1d1b58e 100644--- a/ui/src/stores/index.ts+++ b/ui/src/stores/index.ts@@ -1,6 +1,7 @@+import loginSettingStore from '@/stores/loginSetting';+import toastStore from './toast';import loggedUserInfoStore from './userInfo';-import globalStore from './global';import siteInfoStore from './siteInfo';import interfaceStore from './interface';import brandingStore from './branding';@@ -9,9 +10,9 @@ import pageTagStore from './pageTags';export {toastStore,loggedUserInfoStore,- globalStore,siteInfoStore,interfaceStore,brandingStore,pageTagStore,+ loginSettingStore,};diff --git a/ui/src/stores/loginSetting.ts b/ui/src/stores/loginSetting.tsnew file mode 100644index 00000000..43b1cc8a--- /dev/null+++ b/ui/src/stores/loginSetting.ts@@ -0,0 +1,23 @@+import create from 'zustand';++import { AdminSettingsLogin } from '@/common/interface';++interface IType {+ login: AdminSettingsLogin;+ update: (params: AdminSettingsLogin) => void;+}++const loginSetting = create<IType>((set) => ({+ login: {+ allow_new_registrations: true,+ login_required: false,+ },+ update: (params) =>+ set(() => {+ return {+ login: params,+ };+ }),+}));++export default loginSetting;diff --git a/ui/src/utils/guard.ts b/ui/src/utils/guard.tsindex 887e5257..c6228c4f 100644--- a/ui/src/utils/guard.ts+++ b/ui/src/utils/guard.ts@@ -4,6 +4,7 @@ import {siteInfoStore,interfaceStore,brandingStore,+ loginSettingStore,} from '@/stores';import { RouteAlias } from '@/router/alias';import Storage from '@/utils/storage';@@ -157,6 +158,16 @@ export const admin = () => {return gr;};+export const allowNewRegistration = () => {+ const gr: TGuardResult = { ok: true };+ const loginSetting = loginSettingStore.getState().login;+ if (!loginSetting.allow_new_registrations) {+ gr.ok = false;+ gr.redirect = RouteAlias.home;+ }+ return gr;+};+/*** try user was logged and all state ok* @param canNavigate // if true, will navigate to login page if not logged@@ -203,6 +214,7 @@ export const initAppSettingsStore = async () => {siteInfoStore.getState().update(appSettings.general);interfaceStore.getState().update(appSettings.interface);brandingStore.getState().update(appSettings.branding);+ loginSettingStore.getState().update(appSettings.login);}};