Просмотр исходного кода

Revert "Change the method of obtaining auditLogAvailableActionsData"

This reverts commit 1325ca20ebc3f93caf0101a90d6f671e0e58ab63.
Shun Miyazawa 3 лет назад
Родитель
Сommit
96ae919127

+ 1 - 1
packages/app/src/components/Admin/AuditLog/SelectActionDropdown.tsx

@@ -103,7 +103,7 @@ export const SelectActionDropdown: FC<Props> = (props: Props) => {
                       className="form-check-input"
                       id={`checkbox${action}`}
                       onChange={() => { actionCheckboxChangedHandler(action) }}
-                      checked={actionMap.get(action) || false}
+                      checked={actionMap.get(action)}
                     />
                     <label
                       className="form-check-label"

+ 10 - 15
packages/app/src/components/Admin/AuditLogManagement.tsx

@@ -1,5 +1,5 @@
 import React, {
-  FC, useState, useCallback, useEffect, useRef,
+  FC, useState, useCallback, useRef,
 } from 'react';
 
 import { format } from 'date-fns';
@@ -34,6 +34,9 @@ export const AuditLogManagement: FC = () => {
 
   const typeaheadRef = useRef<IClearable>(null);
 
+  const { data: auditLogAvailableActionsData } = useAuditLogAvailableActions();
+  const auditLogAvailableActions = auditLogAvailableActionsData != null ? auditLogAvailableActionsData : [];
+
   /*
    * State
    */
@@ -43,7 +46,9 @@ export const AuditLogManagement: FC = () => {
   const [startDate, setStartDate] = useState<Date | null>(null);
   const [endDate, setEndDate] = useState<Date | null>(null);
   const [selectedUsernames, setSelectedUsernames] = useState<string[]>([]);
-  const [actionMap, setActionMap] = useState(new Map<SupportedActionType, boolean>([]));
+  const [actionMap, setActionMap] = useState(
+    new Map<SupportedActionType, boolean>(auditLogAvailableActions.map(action => [action, true])),
+  );
 
   /*
    * Fetch
@@ -63,13 +68,6 @@ export const AuditLogManagement: FC = () => {
 
   const { data: auditLogEnabled } = useAuditLogEnabled();
 
-  const { data: auditLogAvailableActionsData } = useAuditLogAvailableActions();
-  useEffect(() => {
-    if (auditLogAvailableActionsData != null) {
-      setActionMap(new Map<SupportedActionType, boolean>(auditLogAvailableActionsData.map(action => [action, true])));
-    }
-  }, [auditLogAvailableActionsData]);
-
   /*
    * Functions
    */
@@ -106,11 +104,8 @@ export const AuditLogManagement: FC = () => {
     setEndDate(null);
     typeaheadRef.current?.clear();
     setSelectedUsernames([]);
-
-    if (auditLogAvailableActionsData != null) {
-      setActionMap(new Map<SupportedActionType, boolean>(auditLogAvailableActionsData.map(action => [action, true])));
-    }
-  }, [setActivePage, setStartDate, setEndDate, setSelectedUsernames, setActionMap, auditLogAvailableActionsData]);
+    setActionMap(new Map<SupportedActionType, boolean>(auditLogAvailableActions.map(action => [action, true])));
+  }, [setActivePage, setStartDate, setEndDate, setSelectedUsernames, setActionMap, auditLogAvailableActions]);
 
   const reloadButtonPushedHandler = useCallback(() => {
     setActivePage(1);
@@ -158,7 +153,7 @@ export const AuditLogManagement: FC = () => {
 
             <SelectActionDropdown
               actionMap={actionMap}
-              availableActions={auditLogAvailableActionsData || []}
+              availableActions={auditLogAvailableActions}
               onChangeAction={actionCheckboxChangedHandler}
               onChangeMultipleAction={multipleActionCheckboxChangedHandler}
             />