You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by sh...@apache.org on 2024/01/02 07:11:04 UTC

(incubator-answer) branch test updated: Fix/UI notification (#704)

This is an automated email from the ASF dual-hosted git repository.

shuai pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git


The following commit(s) were added to refs/heads/test by this push:
     new 07b829db Fix/UI notification (#704)
07b829db is described below

commit 07b829dbc1a8ba26f5824a75843d038e42d5f76e
Author: dashuai <li...@sifou.com>
AuthorDate: Tue Jan 2 15:11:00 2024 +0800

    Fix/UI notification (#704)
---
 i18n/en_US.yaml                                    |   6 +-
 ui/src/common/interface.ts                         |  11 +-
 ui/src/pages/Users/Settings/Notification/index.tsx |  55 ++++-----
 ui/src/pages/Users/Settings/Plugins/index.tsx      | 134 +++++++++++++++++++++
 .../pages/Users/Settings/components/Nav/index.tsx  |  14 +++
 ui/src/router/routes.ts                            |   4 +
 ui/src/services/client/settings.ts                 |  28 ++++-
 7 files changed, 211 insertions(+), 41 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index ef4a8935..e8d8a6f9 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -990,10 +990,10 @@ ui:
         label: Location
         placeholder: "City, Country"
     notification:
-      heading: Notifications
-      email: Email
+      heading: Email Notifications
+      turn_on: Turn on
       inbox:
-        label: Email notifications
+        label: Inbox notifications
         description: Answers to your questions, comments, invites, and more.
       all_new_question:
         label: All new questions
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 68f3be95..83feff71 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -622,12 +622,17 @@ export interface NotificationConfigItem {
   key: string;
 }
 export interface NotificationConfig {
-  all_new_question: NotificationConfigItem[];
-  all_new_question_for_following_tags: NotificationConfigItem[];
-  inbox: NotificationConfigItem[];
+  all_new_question: NotificationConfigItem;
+  all_new_question_for_following_tags: NotificationConfigItem;
+  inbox: NotificationConfigItem;
 }
 
 export interface ActivatedPlugin {
   name: string;
   slug_name: string;
 }
+
+export interface UserPluginsConfigRes {
+  name: string;
+  slug_name: string;
+}
diff --git a/ui/src/pages/Users/Settings/Notification/index.tsx b/ui/src/pages/Users/Settings/Notification/index.tsx
index f368564b..c0aa4061 100644
--- a/ui/src/pages/Users/Settings/Notification/index.tsx
+++ b/ui/src/pages/Users/Settings/Notification/index.tsx
@@ -39,51 +39,39 @@ const Index = () => {
         type: 'boolean',
         title: t('inbox.label'),
         description: t('inbox.description'),
-        enum: configData?.inbox?.map((v) => v.enable),
-        default: configData?.inbox?.map((v) => v.enable),
-        enumNames: configData?.inbox?.map((v) => t(v.key)),
+        default: configData?.inbox.enable,
       },
       all_new_question: {
         type: 'boolean',
         title: t('all_new_question.label'),
         description: t('all_new_question.description'),
-        enum: configData?.all_new_question?.map((v) => v.enable),
-        default: configData?.all_new_question?.map((v) => v.enable),
-        enumNames: configData?.all_new_question?.map((v) => t(v.key)),
+        default: configData?.all_new_question.enable,
       },
       all_new_question_for_following_tags: {
         type: 'boolean',
         title: t('all_new_question_for_following_tags.label'),
         description: t('all_new_question_for_following_tags.description'),
-        enum: configData?.all_new_question_for_following_tags?.map(
-          (v) => v.enable,
-        ),
-        default: configData?.all_new_question_for_following_tags?.map(
-          (v) => v.enable,
-        ),
-        enumNames: configData?.all_new_question_for_following_tags?.map((v) =>
-          t(v.key),
-        ),
+        default: configData?.all_new_question_for_following_tags.enable,
       },
     },
   };
   const uiSchema: UISchema = {
     inbox: {
-      'ui:widget': 'checkbox',
+      'ui:widget': 'switch',
       'ui:options': {
-        label: t('email'),
+        label: t('turn_on'),
       },
     },
     all_new_question: {
-      'ui:widget': 'checkbox',
+      'ui:widget': 'switch',
       'ui:options': {
-        label: t('email'),
+        label: t('turn_on'),
       },
     },
     all_new_question_for_following_tags: {
-      'ui:widget': 'checkbox',
+      'ui:widget': 'switch',
       'ui:options': {
-        label: t('email'),
+        label: t('turn_on'),
         text: t('all_new_question_for_following_tags.description'),
       },
     },
@@ -98,19 +86,18 @@ const Index = () => {
     event.preventDefault();
     event.stopPropagation();
     const params = {
-      inbox: configData?.inbox.map((v, index) => {
-        return { enable: formData.inbox.value[index], key: v.key };
-      }),
-      all_new_question: configData?.all_new_question.map((v, index) => {
-        return { enable: formData.all_new_question.value[index], key: v.key };
-      }),
-      all_new_question_for_following_tags:
-        configData?.all_new_question_for_following_tags.map((v, index) => {
-          return {
-            enable: formData.all_new_question_for_following_tags.value[index],
-            key: v.key,
-          };
-        }),
+      inbox: {
+        enable: formData.inbox.value,
+        key: configData?.inbox.key,
+      },
+      all_new_question: {
+        enable: formData.all_new_question.value,
+        key: configData?.all_new_question.key,
+      },
+      all_new_question_for_following_tags: {
+        enable: formData.all_new_question_for_following_tags.value,
+        key: configData?.all_new_question_for_following_tags.key,
+      },
     } as NotificationConfig;
 
     putNotificationConfig(params).then(() => {
diff --git a/ui/src/pages/Users/Settings/Plugins/index.tsx b/ui/src/pages/Users/Settings/Plugins/index.tsx
new file mode 100644
index 00000000..4fbe3ee9
--- /dev/null
+++ b/ui/src/pages/Users/Settings/Plugins/index.tsx
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useParams } from 'react-router-dom';
+
+import { useToast } from '@/hooks';
+import type * as Types from '@/common/interface';
+import { SchemaForm, JSONSchema, UISchema } from '@/components';
+import { useGetUserPluginConfig, updateUserPluginConfig } from '@/services';
+import {
+  InputOptions,
+  FormKit,
+  initFormData,
+  mergeFormData,
+} from '@/components/SchemaForm';
+
+const Config = () => {
+  const { t } = useTranslation('translation');
+  const { slug_name } = useParams<{ slug_name: string }>();
+  const { data, mutate: refreshPluginConfig } = useGetUserPluginConfig({
+    plugin_slug_name: slug_name,
+  });
+  const Toast = useToast();
+  const [schema, setSchema] = useState<JSONSchema | null>(null);
+  const [uiSchema, setUISchema] = useState<UISchema>();
+  const required: string[] = [];
+
+  const [formData, setFormData] = useState<Types.FormDataType | null>(null);
+
+  useEffect(() => {
+    if (!data) {
+      return;
+    }
+    const properties: JSONSchema['properties'] = {};
+    const uiConf: UISchema = {};
+    data.config_fields?.forEach((item) => {
+      properties[item.name] = {
+        type: 'string',
+        title: item.title,
+        description: item.description,
+        default: item.value,
+      };
+
+      if (item.options instanceof Array) {
+        properties[item.name].enum = item.options.map((option) => option.value);
+        properties[item.name].enumNames = item.options.map(
+          (option) => option.label,
+        );
+      }
+      uiConf[item.name] = {};
+      uiConf[item.name]['ui:widget'] = item.type;
+      if (item.ui_options) {
+        if ((item.ui_options as InputOptions & { input_type })?.input_type) {
+          (item.ui_options as InputOptions).inputType = (
+            item.ui_options as InputOptions & { input_type }
+          ).input_type;
+        }
+        uiConf[item.name]['ui:options'] = item.ui_options;
+      }
+      if (item.required) {
+        required.push(item.name);
+      }
+    });
+    const result = {
+      title: data?.name || '',
+      required,
+      properties,
+    };
+    setSchema(result);
+    setUISchema(uiConf);
+    setFormData(mergeFormData(formData, initFormData(result)));
+  }, [data?.config_fields]);
+
+  const onSubmit = (evt) => {
+    if (!formData) {
+      return;
+    }
+    evt.preventDefault();
+    evt.stopPropagation();
+    const config_fields = {};
+    Object.keys(formData).forEach((key) => {
+      config_fields[key] = formData[key].value;
+    });
+    const params = {
+      plugin_slug_name: slug_name,
+      config_fields,
+    };
+    updateUserPluginConfig(params).then(() => {
+      Toast.onShow({
+        msg: t('update', { keyPrefix: 'toast' }),
+        variant: 'success',
+      });
+    });
+  };
+  const refreshConfig: FormKit['refreshConfig'] = async () => {
+    refreshPluginConfig();
+  };
+  const handleOnChange = (form) => {
+    setFormData(form);
+  };
+  return (
+    <>
+      <h3 className="mb-4">{data?.name}</h3>
+      <SchemaForm
+        schema={schema}
+        uiSchema={uiSchema}
+        refreshConfig={refreshConfig}
+        formData={formData}
+        onSubmit={onSubmit}
+        onChange={handleOnChange}
+      />
+    </>
+  );
+};
+
+export default Config;
diff --git a/ui/src/pages/Users/Settings/components/Nav/index.tsx b/ui/src/pages/Users/Settings/components/Nav/index.tsx
index d7c84ba0..6e2b0c07 100644
--- a/ui/src/pages/Users/Settings/components/Nav/index.tsx
+++ b/ui/src/pages/Users/Settings/components/Nav/index.tsx
@@ -22,9 +22,13 @@ import { Nav } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { NavLink, useMatch } from 'react-router-dom';
 
+import { useGetUserPluginList } from '@/services';
+
 const Index: FC = () => {
   const { t } = useTranslation('translation', { keyPrefix: 'settings.nav' });
   const settingMatch = useMatch('/users/settings/:setting');
+  const { data } = useGetUserPluginList();
+
   return (
     <Nav variant="pills" className="flex-column">
       <NavLink
@@ -43,6 +47,16 @@ const Index: FC = () => {
       <NavLink className="nav-link" to="/users/settings/interface">
         {t('interface')}
       </NavLink>
+      {data?.map((item) => {
+        return (
+          <NavLink
+            key={item.slug_name}
+            className="nav-link w-100 text-truncate"
+            to={`/users/settings/${item.slug_name}`}>
+            {item.name}
+          </NavLink>
+        );
+      })}
     </Nav>
   );
 };
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index be558746..bab8b34b 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -181,6 +181,10 @@ const routes: RouteNode[] = [
                 path: 'interface',
                 page: 'pages/Users/Settings/Interface',
               },
+              {
+                path: ':slug_name',
+                page: 'pages/Users/Settings/Plugins',
+              },
             ],
           },
           {
diff --git a/ui/src/services/client/settings.ts b/ui/src/services/client/settings.ts
index 51b3a6a1..f80defc1 100644
--- a/ui/src/services/client/settings.ts
+++ b/ui/src/services/client/settings.ts
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import qs from 'qs';
 import useSWR from 'swr';
 
 import request from '@/utils/request';
 import type * as Type from '@/common/interface';
+import type { PluginConfig } from '@/services/admin/plugins';
 
 export const getLanguageConfig = () => {
   return request.get('/answer/api/v1/language/config');
@@ -46,3 +47,28 @@ export const useGetNotificationConfig = () => {
 export const putNotificationConfig = (data: Type.NotificationConfig) => {
   return request.put('/answer/api/v1/user/notification/config', data);
 };
+
+export const useGetUserPluginList = () => {
+  return useSWR<Type.UserPluginsConfigRes[]>(
+    '/answer/api/v1/user/plugin/configs',
+    request.instance.get,
+  );
+};
+
+export const useGetUserPluginConfig = (params) => {
+  const apiUrl = `/answer/api/v1/user/plugin/config?${qs.stringify(params)}`;
+  const { data, error, mutate } = useSWR<PluginConfig, Error>(
+    apiUrl,
+    request.instance.get,
+  );
+  return {
+    data,
+    isLoading: !data && !error,
+    error,
+    mutate,
+  };
+};
+
+export const updateUserPluginConfig = (params) => {
+  return request.put('/answer/api/v1/user/plugin/config', params);
+};