Shun Miyazawa 4 سال پیش
والد
کامیت
066cb0721f

+ 7 - 7
packages/app/src/components/Admin/AuditLog/SelectQueryDropdown.tsx

@@ -6,23 +6,23 @@ import { useTranslation } from 'react-i18next';
 type Props = {
 type Props = {
   dropdownLabel: string
   dropdownLabel: string
   dropdownItemList: string[]
   dropdownItemList: string[]
-  onSetQuery: (query: string | undefined) => void
+  onSelectItem: (item: string | undefined) => void
 }
 }
 
 
 export const SelectQueryDropdown: FC<Props> = (props: Props) => {
 export const SelectQueryDropdown: FC<Props> = (props: Props) => {
   const { t } = useTranslation();
   const { t } = useTranslation();
 
 
-  const { dropdownLabel, dropdownItemList, onSetQuery } = props;
+  const { dropdownLabel, dropdownItemList, onSelectItem } = props;
 
 
   const [selectedItem, setSelectedItem] = useState<string | undefined>(undefined);
   const [selectedItem, setSelectedItem] = useState<string | undefined>(undefined);
 
 
-  const onClickItemButton = useCallback((item) => {
-    if (onSetQuery == null) {
+  const onClickItemButton = useCallback((selectedItem) => {
+    if (onSelectItem == null) {
       return;
       return;
     }
     }
-    onSetQuery(item);
-    setSelectedItem(item);
-  }, [onSetQuery, setSelectedItem]);
+    onSelectItem(selectedItem);
+    setSelectedItem(selectedItem);
+  }, [onSelectItem, setSelectedItem]);
 
 
   return (
   return (
     <div className="btn-group mr-2 mb-3">
     <div className="btn-group mr-2 mb-3">

+ 5 - 5
packages/app/src/components/Admin/AuditLogManagement.tsx

@@ -21,13 +21,13 @@ export const AuditLogManagement: FC = () => {
    */
    */
   const [activePage, setActivePage] = useState<number>(1);
   const [activePage, setActivePage] = useState<number>(1);
   const offset = (activePage - 1) * PAGING_LIMIT;
   const offset = (activePage - 1) * PAGING_LIMIT;
-  const [actionQuery, setActionQuery] = useState<string | undefined>(undefined);
+  const [actionName, setActionName] = useState<string | undefined>(undefined);
 
 
   /*
   /*
    * Fetch
    * Fetch
    */
    */
   const query = {
   const query = {
-    action: actionQuery,
+    action: actionName,
   };
   };
   const { data: activityListData, error } = useSWRxActivityList(PAGING_LIMIT, offset, query);
   const { data: activityListData, error } = useSWRxActivityList(PAGING_LIMIT, offset, query);
   const activityList = activityListData?.docs != null ? activityListData.docs : [];
   const activityList = activityListData?.docs != null ? activityListData.docs : [];
@@ -41,9 +41,9 @@ export const AuditLogManagement: FC = () => {
     setActivePage(selectedPageNum);
     setActivePage(selectedPageNum);
   }, []);
   }, []);
 
 
-  const setActionQueryHandler = useCallback((query) => {
-    setActionQuery(query);
+  const selectActionNameHandler = useCallback((selectedActionName) => {
     setActivePage(1);
     setActivePage(1);
+    setActionName(selectedActionName);
   }, []);
   }, []);
 
 
   return (
   return (
@@ -53,7 +53,7 @@ export const AuditLogManagement: FC = () => {
       <SelectQueryDropdown
       <SelectQueryDropdown
         dropdownLabel="select_action"
         dropdownLabel="select_action"
         dropdownItemList={AllSupportedActionType}
         dropdownItemList={AllSupportedActionType}
-        onSetQuery={setActionQueryHandler}
+        onSelectItem={selectActionNameHandler}
       />
       />
 
 
       { isLoading
       { isLoading