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.
refactor(pathFactory): Remove the dependency on : it's not very useful and will throw an error if it encounters a null argument.
haitaoo08d5528e4e6a
diff --git a/ui/package.json b/ui/package.jsonindex 2f8c1d46..237a00b5 100644--- a/ui/package.json+++ b/ui/package.json@@ -38,7 +38,6 @@"react-router-dom": "^6.8.1","semver": "^7.3.8","swr": "^1.3.0",- "urlcat": "^3.0.0","zustand": "^4.1.1"},"devDependencies": {diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yamlindex 231468f8..80e9de86 100644--- a/ui/pnpm-lock.yaml+++ b/ui/pnpm-lock.yaml@@ -67,7 +67,6 @@ specifiers:semver: ^7.3.8swr: ^1.3.0typescript: ^4.8.3- urlcat: ^3.0.0yaml-loader: ^0.8.0zustand: ^4.1.1@@ -98,7 +97,6 @@ dependencies:react-router-dom: 6.8.1_biqbaboplfbrettd7655fr4n2ysemver: 7.3.8swr: [email protected]- urlcat: 3.0.0zustand: [email protected]devDependencies:@@ -10986,12 +10984,6 @@ packages:querystringify: 2.2.0requires-port: 1.0.0- /urlcat/3.0.0:- resolution: {integrity: sha512-SSXrIzInzKdWjBfm5iOrPfO6E5Nt0aFs5PTZCauxJTjJE3qhfePAWz8tjGm7dnWMYIAdPGjio51aakunyZHMXQ==}- dependencies:- qs: 6.11.0- dev: false-/use-sync-external-store/[email protected]:resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}peerDependencies:diff --git a/ui/src/router/pathFactory.ts b/ui/src/router/pathFactory.tsindex acf6b690..01ffb529 100644--- a/ui/src/router/pathFactory.ts+++ b/ui/src/router/pathFactory.ts@@ -1,22 +1,20 @@-import urlcat from 'urlcat';-import { seoSettingStore } from '@/stores';const tagLanding = (slugName: string) => {- if (!slugName) {- return '/tags';- }- return urlcat('/tags/:slugName', { slugName });+ const r = slugName ? `/tags/${slugName}` : '/tags';+ return r;};+const tagInfo = (slugName: string) => {- if (!slugName) {- return '/tags';- }- return urlcat('/tags/:slugName/info', { slugName });+ const r = slugName ? `/tags/${slugName}/info` : '/tags';+ return r;};+const tagEdit = (tagId: string) => {- return urlcat('/tags/:tagId/edit', { tagId });+ const r = `/tags/${tagId}/edit`;+ return r;};+const questionLanding = (questionId: string, slugTitle: string = '') => {const { seo } = seoSettingStore.getState();if (!questionId) {@@ -24,14 +22,12 @@ const questionLanding = (questionId: string, slugTitle: string = '') => {}// @ts-ignoreif (/[13]/.test(seo.permalink) && slugTitle) {- return urlcat('/questions/:questionId/:slugPermalink', {- questionId,- slugPermalink: slugTitle,- });+ return `/questions/${questionId}/${slugTitle}`;}- return urlcat('/questions/:questionId', { questionId });+ return `/questions/${questionId}`;};+const answerLanding = (params: {questionId: string;slugTitle?: string;@@ -41,9 +37,7 @@ const answerLanding = (params: {params.questionId,params.slugTitle,);- return urlcat(`${questionLandingUrl}/:answerId`, {- answerId: params.answerId,- });+ return `${questionLandingUrl}/${params.answerId}`;};export const pathFactory = {