From 21a5b4da6c433b518805725032a0f5f6532af127 Mon Sep 17 00:00:00 2001
From: Darcy Ye <darcyye@silverhand.io>
Date: Wed, 27 Sep 2023 15:09:01 +0800
Subject: [PATCH] fix(console): fix AuditLogTable components application
 selector (#4586)

---
 .../src/components/AuditLogTable/index.tsx        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/console/src/components/AuditLogTable/index.tsx b/packages/console/src/components/AuditLogTable/index.tsx
index f5f2d54e1..e70e23f93 100644
--- a/packages/console/src/components/AuditLogTable/index.tsx
+++ b/packages/console/src/components/AuditLogTable/index.tsx
@@ -40,11 +40,13 @@ function AuditLogTable({ applicationId, userId, className }: Props) {
     useSearchParametersWatcher({
       page: 1,
       event: '',
-      ...conditional(applicationId && { applicationId: '' }),
+      // If `applicationId` not specified when init this component, then search parameter of `applicationId` can be accepted.
+      ...conditional(!applicationId && { applicationId: '' }),
     });
 
   // TODO: LOG-7135, revisit this fallback logic and see whether this should be done outside of this component.
-  const searchApplicationId = applicationId ?? applicationIdFromSearch;
+  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+  const searchApplicationId = applicationId || applicationIdFromSearch;
   const { data: specifiedApplication } = useSWR<ApplicationResponse>(
     applicationId && `api/applications/${applicationId}`
   );
@@ -127,9 +129,12 @@ function AuditLogTable({ applicationId, userId, className }: Props) {
           {!applicationId && (
             <div className={styles.applicationSelector}>
               <ApplicationSelector
-                value={applicationId}
-                onChange={(applicationId) => {
-                  updateSearchParameters({ applicationId, page: undefined });
+                value={applicationIdFromSearch}
+                onChange={(applicationIdFromSearch) => {
+                  updateSearchParameters({
+                    applicationId: applicationIdFromSearch,
+                    page: undefined,
+                  });
                 }}
               />
             </div>