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.
fix: add algolia plugins for ui
shuaif10261cb6dcb
diff --git a/ui/src/components/Icon/svg.tsx b/ui/src/components/Icon/svg.tsxindex 4629c0be..f5526631 100644--- a/ui/src/components/Icon/svg.tsx+++ b/ui/src/components/Icon/svg.tsx@@ -3,13 +3,14 @@ import { FC } from 'react';import { base64ToSvg } from '@/utils';interface IProps {+ svgClassName?: string;base64: string | undefined;}-const Icon: FC<IProps> = ({ base64 = '' }) => {+const Icon: FC<IProps> = ({ base64 = '', svgClassName = '' }) => {return base64 ? (<spandangerouslySetInnerHTML={{- __html: base64ToSvg(base64),+ __html: base64ToSvg(base64, svgClassName),}}/>) : null;diff --git a/ui/src/index.scss b/ui/src/index.scssindex 7e7df5ee..d2a581bd 100644--- a/ui/src/index.scss+++ b/ui/src/index.scss@@ -310,3 +310,11 @@ img[src=""] {fill: currentColor;vertical-align: -0.125em;}++.algoliaSvg {+ display: inline-block;+ width: 92px;+ height: 24px;+ fill: currentColor;+ vertical-align: -0.125em;+}diff --git a/ui/src/pages/Search/components/Head/index.tsx b/ui/src/pages/Search/components/Head/index.tsxindex 35d3cead..6d835a36 100644--- a/ui/src/pages/Search/components/Head/index.tsx+++ b/ui/src/pages/Search/components/Head/index.tsx@@ -7,6 +7,7 @@ import { following } from '@/services';import { tryNormalLogged } from '@/utils/guard';import { escapeRemove } from '@/utils';import { pathFactory } from '@/router/pathFactory';+import { PluginRender } from '@/components';interface Props {data;@@ -34,37 +35,42 @@ const Index: FC<Props> = ({ data }) => {};return (- <div className="mb-5">- <h3 className="mb-3">{t('title')}</h3>- <p>- <span className="text-secondary me-1">{t('keywords')}</span>- {q?.replace(reg, '')}- <br />- {options?.length && (+ <div className="mb-5 d-flex justify-content-between">+ <div>+ <h3 className="mb-3">{t('title')}</h3>+ <p>+ <span className="text-secondary me-1">{t('keywords')}</span>+ {q?.replace(reg, '')}+ <br />+ {options?.length && (+ <>+ <span className="text-secondary">{t('options')} </span>+ {options?.map((item) => {+ return <code key={item}>{item} </code>;+ })}+ </>+ )}+ </p>+ {data?.slug_name && (<>- <span className="text-secondary">{t('options')} </span>- {options?.map((item) => {- return <code key={item}>{item} </code>;- })}+ {data.excerpt && (+ <p className="text-break">+ {escapeRemove(data.excerpt)}+ <Link className="ms-1" to={pathFactory.tagInfo(data.slug_name)}>+ [{t('more')}]+ </Link>+ </p>+ )}++ <Button variant="outline-primary" onClick={follow}>+ {followed ? t('following') : t('follow')}+ </Button></>)}- </p>- {data?.slug_name && (- <>- {data.excerpt && (- <p className="text-break">- {escapeRemove(data.excerpt)}- <Link className="ms-1" to={pathFactory.tagInfo(data.slug_name)}>- [{t('more')}]- </Link>- </p>- )}-- <Button variant="outline-primary" onClick={follow}>- {followed ? t('following') : t('follow')}- </Button>- </>- )}+ </div>+ <div>+ <PluginRender slug_name="algolia" />+ </div></div>);};diff --git a/ui/src/plugins/builtin/Algolia/i18n/en_US.yaml b/ui/src/plugins/builtin/Algolia/i18n/en_US.yamlnew file mode 100644index 00000000..9195c425--- /dev/null+++ b/ui/src/plugins/builtin/Algolia/i18n/en_US.yaml@@ -0,0 +1,4 @@+plugin:+ algolia:+ ui:+ search_by: Search bydiff --git a/ui/src/plugins/builtin/Algolia/i18n/index.ts b/ui/src/plugins/builtin/Algolia/i18n/index.tsnew file mode 100644index 00000000..b693440a--- /dev/null+++ b/ui/src/plugins/builtin/Algolia/i18n/index.ts@@ -0,0 +1,9 @@+import pluginKit from '@/utils/pluginKit';++import en_US from './en_US.yaml';+import zh_CN from './zh_CN.yaml';++pluginKit.initI18nResource({+ en_US,+ zh_CN,+});diff --git a/ui/src/plugins/builtin/Algolia/i18n/zh_CN.yaml b/ui/src/plugins/builtin/Algolia/i18n/zh_CN.yamlnew file mode 100644index 00000000..df939222--- /dev/null+++ b/ui/src/plugins/builtin/Algolia/i18n/zh_CN.yaml@@ -0,0 +1,4 @@+plugin:+ algolia:+ ui:+ search_by: 搜索提供diff --git a/ui/src/plugins/builtin/Algolia/index.tsx b/ui/src/plugins/builtin/Algolia/index.tsxnew file mode 100644index 00000000..416baede--- /dev/null+++ b/ui/src/plugins/builtin/Algolia/index.tsx@@ -0,0 +1,35 @@+import { memo, FC } from 'react';+import { useTranslation } from 'react-i18next';++import pluginKit, { PluginInfo } from '@/utils/pluginKit';+import { SvgIcon } from '@/components';++import info from './info.yaml';+import { useGetAlgoliaInfo } from './services';+import './i18n';++const pluginInfo: PluginInfo = {+ slug_name: info.slug_name,+};++const Index: FC = () => {+ const { t } = useTranslation(pluginKit.getTransNs(), {+ keyPrefix: pluginKit.getTransKeyPrefix(pluginInfo),+ });++ const { data } = useGetAlgoliaInfo();+ console.log(data);+ if (!data?.icon) return null;++ return (+ <div className="d-flex align-items-center">+ <span className="small text-secondary me-2">{t('search_by')}</span>+ <SvgIcon base64={data?.icon} />+ </div>+ );+};++export default {+ info: pluginInfo,+ component: memo(Index),+};diff --git a/ui/src/plugins/builtin/Algolia/info.yaml b/ui/src/plugins/builtin/Algolia/info.yamlnew file mode 100644index 00000000..1485558c--- /dev/null+++ b/ui/src/plugins/builtin/Algolia/info.yaml@@ -0,0 +1,4 @@+slug_name: algolia+version: 0.0.1+link: https://github.com/answerdev/plugins/tree/main/connector/+author: Answer.devdiff --git a/ui/src/plugins/builtin/Algolia/services.ts b/ui/src/plugins/builtin/Algolia/services.tsnew file mode 100644index 00000000..9d1779e9--- /dev/null+++ b/ui/src/plugins/builtin/Algolia/services.ts@@ -0,0 +1,20 @@+import useSWR from 'swr';++import request from '@/utils/request';++export interface AlgoliaRes {+ name: string;+ icon: string;+}++export const useGetAlgoliaInfo = () => {+ const { data, error } = useSWR<AlgoliaRes>(+ '/answer/api/v1/search/desc',+ request.instance.get,+ );++ return {+ data,+ error,+ };+};diff --git a/ui/src/plugins/builtin/Connector/index.tsx b/ui/src/plugins/builtin/Connector/index.tsxindex c5b39431..af6b4f75 100644--- a/ui/src/plugins/builtin/Connector/index.tsx+++ b/ui/src/plugins/builtin/Connector/index.tsx@@ -31,7 +31,7 @@ const Index: FC<Props> = ({ className }) => {{data?.map((item) => {return (<Button variant="outline-secondary" href={item.link} key={item.name}>- <SvgIcon base64={item.icon} />+ <SvgIcon base64={item.icon} svgClassName="btnSvg" /><span>{t('connect', { auth_name: item.name })}</span></Button>);diff --git a/ui/src/plugins/builtin/UcLogin/index.tsx b/ui/src/plugins/builtin/UcLogin/index.tsxindex 4e2f8c66..7c98a8e7 100644--- a/ui/src/plugins/builtin/UcLogin/index.tsx+++ b/ui/src/plugins/builtin/UcLogin/index.tsx@@ -33,7 +33,7 @@ const Index: FC<Props> = ({ className }) => {className={classnames('w-100', className)}variant="outline-secondary"href={ucAgent?.agent_info.login_redirect_url}>- <SvgIcon base64={ucAgent?.agent_info.icon} />+ <SvgIcon base64={ucAgent?.agent_info.icon} svgClassName="btnSvg" /><span>{t('connect', { auth_name: ucAgent?.agent_info.display_name })}</span>diff --git a/ui/src/plugins/builtin/index.ts b/ui/src/plugins/builtin/index.tsindex 95c102e1..54418eb6 100644--- a/ui/src/plugins/builtin/index.ts+++ b/ui/src/plugins/builtin/index.ts@@ -1,7 +1,9 @@import Connector from './Connector';import UcLogin from './UcLogin';+import Algolia from './Algolia';export default {Connector,UcLogin,+ Algolia,};diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.tsindex efd93e0a..ef5b56ab 100644--- a/ui/src/utils/common.ts+++ b/ui/src/utils/common.ts@@ -184,18 +184,20 @@ function diffText(newText: string, oldText?: string): string {return result.join('');}-function base64ToSvg(base64: string) {+function base64ToSvg(base64: string, svgClassName?: string) {// base64 to svg xmlconst svgxml = atob(base64);- // svg add class btnSvg+ // svg add classconst parser = new DOMParser();const doc = parser.parseFromString(svgxml, 'image/svg+xml');const parseError = doc.querySelector('parsererror');const svg = doc.querySelector('svg');let str = '';if (svg && !parseError) {- svg.classList.add('btnSvg');+ if (svgClassName) {+ svg.classList.add(svgClassName);+ }svg.classList.add('me-2');// transform svg to string