Merge remote-tracking branch 'origin' into feat/deeplink-sessions-events

frontend/src/scenes/persons/PersonsTable.tsx

@@ -110,10 +110,10 @@ export function PersonsTable({
                 <>
                     <Link
                         to={deepLinkToPersonSessions(person)}
-                        data-attr={'goto-person-arrow-' + index}
+                        data-attr={`goto-person-arrow-${index}`}
                         data-test-goto-person
                     >
-                        <ArrowRightOutlined />
+                        <ArrowRightOutlined style={{ float: 'right' }} />
                         {allColumns ? ' view' : ''}
                     </Link>
                 </>

frontend/src/scenes/persons/personsLogic.ts

@@ -203,7 +203,7 @@ export const personsLogic = kea<personsLogicType<PersonPaginatedResponse>>({
         },
         '/person/*': (
             {
-                _,
+                _: person,
             }: {
                 _: string
             },
@@ -213,7 +213,9 @@ export const personsLogic = kea<personsLogicType<PersonPaginatedResponse>>({
             if (activeTab && values.activeTab !== activeTab) {
                 actions.navigateToTab(activeTab as PersonsTabType)
             }
-            actions.loadPerson(_) // underscore contains the wildcard
+            if (person) {
+                actions.loadPerson(person) // underscore contains the wildcard
+            }
         },
     }),
 })

frontend/src/scenes/trends/PersonModal.tsx

@@ -8,7 +8,8 @@ import { PersonsTable } from 'scenes/persons/PersonsTable'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { ViewType } from 'scenes/insights/insightLogic'
 import { EntityTypes, EventPropertyFilter, FilterType, SessionsPropertyFilter } from '~/types'
-import { ACTION_TYPE, EVENT_TYPE } from 'lib/constants'
+import { ACTION_TYPE, EVENT_TYPE, FEATURE_FLAGS } from 'lib/constants'
+import { personsModalLogic } from './personsModalLogic'
 
 // Utility function to handle filter conversion required for deeplinking to person -> sessions
 const convertToSessionFilters = (people: TrendPeople, filters: Partial<FilterType>): SessionsPropertyFilter[] => {
@@ -49,7 +50,10 @@ export function PersonModal({ visible, view, onSaveCohort }: Props): JSX.Element
             : filters.display === 'ActionsBarValue' || filters.display === 'ActionsPie'
             ? `"${people?.label}"`
             : `"${people?.label}" on ${people?.day ? dayjs(people.day).format('ll') : '...'}`
-    const closeModal = (): void => setShowingPeople(false)
+    const closeModal = (): void => {
+        setShowingPeople(false)
+        setSearchTerm('')
+    }
 
     return (
         <Modal