Revert "fix(domains) Remove usage or params.orgId in search (#43205)"

This reverts commit 262099c.

Co-authored-by: markstory <[email protected]>

Author: getsentry-bot

static/app/components/search/list.tsx

@@ -120,7 +120,7 @@ const ResultRow = memo(
     ...renderItemProps
   }: SearchItemProps) => {
     const {item, index} = renderItemProps;
-    useEffect(() => registerVisibleItem(index, item), [registerVisibleItem, index, item]);
+    useEffect(() => registerVisibleItem(index, item), [registerVisibleItem, item]);
 
     const itemProps = useMemo(
       () => getItemProps({item, index}),

static/app/components/search/searchResult.tsx

@@ -8,7 +8,7 @@ import {IconInput, IconLink, IconSettings} from 'sentry/icons';
 import PluginIcon from 'sentry/plugins/components/pluginIcon';
 import space from 'sentry/styles/space';
 import highlightFuseMatches from 'sentry/utils/highlightFuseMatches';
-import useOrganization from 'sentry/utils/useOrganization';
+import {useParams} from 'sentry/utils/useParams';
 
 import {Result} from './sources/types';
 
@@ -38,7 +38,7 @@ function renderResultType({resultType, model}: Result['item']) {
 }
 
 function SearchResult({item, matches, highlighted}: Props) {
-  const organization = useOrganization();
+  const params = useParams<{orgId: string}>();
 
   const {sourceType, model, extra} = item;
 
@@ -73,7 +73,7 @@ function SearchResult({item, matches, highlighted}: Props) {
         displayEmail: DescriptionNode,
         description: DescriptionNode,
         useLink: false,
-        orgId: organization.slug,
+        orgId: params.orgId,
         avatarSize: 32,
         [sourceType]: model,
       };

static/app/components/search/sources/apiSource.spec.tsx

@@ -21,7 +21,7 @@ describe('ApiSource', function () {
     router,
     location: router.location,
     routes: [],
-    params: {},
+    params: {orgId: org.slug},
     children: jest.fn().mockReturnValue(null),
   };
 

static/app/components/search/sources/apiSource.tsx

@@ -271,7 +271,7 @@ async function createEventIdLookupResult(
   };
 }
 
-type Props = WithRouterProps<{}> & {
+type Props = WithRouterProps<{orgId: string}> & {
   children: (props: ChildProps) => React.ReactElement;
   /**
    * search term
@@ -330,8 +330,8 @@ class ApiSource extends Component<Props, State> {
 
   // Debounced method to handle querying all API endpoints (when necessary)
   doSearch = debounce((query: string) => {
-    const {organization} = this.props;
-    const orgId = organization?.slug;
+    const {params, organization} = this.props;
+    const orgId = (params && params.orgId) || (organization && organization.slug);
 
     let searchUrls = ['/organizations/'];
     let directUrls: (string | null)[] = [];
@@ -458,10 +458,9 @@ class ApiSource extends Component<Props, State> {
   }
 
   // Process API requests that create result objects that should be searchable
-  async getSearchableResults(requests: Promise<any>[]) {
-    const {organization} = this.props;
-    const orgId = organization?.slug;
-
+  async getSearchableResults(requests) {
+    const {params, organization} = this.props;
+    const orgId = (params && params.orgId) || (organization && organization.slug);
     const [
       organizations,
       projects,

static/app/components/search/sources/formSource.tsx

@@ -11,7 +11,7 @@ import withSentryRouter from 'sentry/utils/withSentryRouter';
 import {ChildProps, Result, ResultItem} from './types';
 import {strGetFn} from './utils';
 
-type Props = WithRouterProps<{}> & {
+type Props = WithRouterProps<{orgId: string}> & {
   children: (props: ChildProps) => React.ReactElement;
   /**
    * search term