chore(widget-builder): Remove organization props (#81248)

These aren't necessary since we can just use hooks and get the org.

Author: narsaynorath

static/app/views/dashboards/datasetConfig/base.tsx

@@ -33,7 +33,6 @@ export type WidgetBuilderSearchBarProps = {
   getFilterWarning: SearchBarProps['getFilterWarning'];
   onClose: SearchBarProps['onClose'];
   onSearch: SearchBarProps['onSearch'];
-  organization: Organization;
   pageFilters: PageFilters;
   widgetQuery: WidgetQuery;
   dataset?: DiscoverDatasets;

static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/index.tsx

@@ -1,9 +1,9 @@
 import ExternalLink from 'sentry/components/links/externalLink';
 import {t, tct} from 'sentry/locale';
 import type {TagCollection} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
+import useOrganization from 'sentry/utils/useOrganization';
 import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import type {DisplayType, WidgetQuery, WidgetType} from 'sentry/views/dashboards/types';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
@@ -20,7 +20,6 @@ interface Props {
   handleColumnFieldChange: (newFields: QueryFieldValue[]) => void;
   isOnDemandWidget: boolean;
   onQueryChange: (queryIndex: number, newQuery: WidgetQuery) => void;
-  organization: Organization;
   tags: TagCollection;
   widgetType: WidgetType;
   queryErrors?: Record<string, any>[];
@@ -29,14 +28,14 @@ interface Props {
 export function ColumnsStep({
   dataSet,
   displayType,
-  organization,
   widgetType,
   handleColumnFieldChange,
   queryErrors,
   explodedFields,
   tags,
   isOnDemandWidget,
 }: Props) {
+  const organization = useOrganization();
   const {customMeasurements} = useCustomMeasurements();
   const datasetConfig = getDatasetConfig(widgetType);
 

static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.tsx

@@ -1,28 +1,22 @@
 import type {SearchBarProps} from 'sentry/components/events/searchBar';
 import type {PageFilters} from 'sentry/types/core';
-import type {Organization} from 'sentry/types/organization';
 import {generateAggregateFields} from 'sentry/utils/discover/fields';
 import type {DiscoverDatasets} from 'sentry/utils/discover/types';
 import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
+import useOrganization from 'sentry/utils/useOrganization';
 import type {WidgetQuery} from 'sentry/views/dashboards/types';
 import {eventViewFromWidget, hasDatasetSelector} from 'sentry/views/dashboards/utils';
 import ResultsSearchQueryBuilder from 'sentry/views/discover/resultsSearchQueryBuilder';
 
 interface Props {
   onClose: SearchBarProps['onClose'];
-  organization: Organization;
   pageFilters: PageFilters;
   widgetQuery: WidgetQuery;
   dataset?: DiscoverDatasets;
 }
 
-export function EventsSearchBar({
-  organization,
-  pageFilters,
-  onClose,
-  widgetQuery,
-  dataset,
-}: Props) {
+export function EventsSearchBar({pageFilters, onClose, widgetQuery, dataset}: Props) {
+  const organization = useOrganization();
   const {customMeasurements} = useCustomMeasurements();
   const eventView = eventViewFromWidget('', widgetQuery, pageFilters);
   const fields = eventView.hasAggregateField()

static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx

@@ -14,7 +14,6 @@ import {IconAdd, IconDelete} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {PageFilters} from 'sentry/types/core';
-import type {Organization} from 'sentry/types/organization';
 import {
   createOnDemandFilterWarning,
   isOnDemandQueryString,
@@ -48,7 +47,6 @@ interface Props {
   onQueryChange: (queryIndex: number, newQuery: WidgetQuery) => void;
   onQueryConditionChange: (isQueryConditionValid: boolean) => void;
   onQueryRemove: (queryIndex: number) => void;
-  organization: Organization;
   queries: WidgetQuery[];
   selection: PageFilters;
   validatedWidgetResponse: UseApiQueryResult<ValidateWidgetResponse, RequestError>;
@@ -66,14 +64,14 @@ export function FilterResultsStep({
   onQueryRemove,
   onAddSearchConditions,
   onQueryChange,
-  organization,
   hideLegendAlias,
   queryErrors,
   widgetType,
   selection,
   onQueryConditionChange,
   validatedWidgetResponse,
 }: Props) {
+  const organization = useOrganization();
   const [queryConditionValidity, setQueryConditionValidity] = useState<boolean[]>([]);
 
   const handleSearch = useCallback(
@@ -174,7 +172,6 @@ export function FilterResultsStep({
                       ? getOnDemandFilterWarning
                       : undefined
                   }
-                  organization={organization}
                   pageFilters={selection}
                   onClose={handleClose(queryIndex)}
                   onSearch={handleSearch(queryIndex)}

static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/issuesSearchBar.tsx

@@ -4,17 +4,17 @@ import styled from '@emotion/styled';
 import type {SearchBarProps} from 'sentry/components/events/searchBar';
 import type {SearchQueryBuilderProps} from 'sentry/components/searchQueryBuilder';
 import {t} from 'sentry/locale';
-import type {Organization} from 'sentry/types/organization';
+import useOrganization from 'sentry/utils/useOrganization';
 import type {WidgetQuery} from 'sentry/views/dashboards/types';
 import IssueListSearchBar from 'sentry/views/issueList/searchBar';
 
 interface Props {
   onClose: SearchBarProps['onClose'];
-  organization: Organization;
   widgetQuery: WidgetQuery;
 }
 
-function IssuesSearchBar({onClose, widgetQuery, organization}: Props) {
+function IssuesSearchBar({onClose, widgetQuery}: Props) {
+  const organization = useOrganization();
   const onChange = useCallback<NonNullable<SearchQueryBuilderProps['onChange']>>(
     (query, state) => {
       onClose?.(query, {validSearch: state.queryIsValid});

static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/releaseSearchBar.tsx

@@ -7,8 +7,8 @@ import {t} from 'sentry/locale';
 import type {PageFilters} from 'sentry/types/core';
 import type {Tag, TagValue} from 'sentry/types/group';
 import {SavedSearchType} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
 import type {WidgetQuery} from 'sentry/views/dashboards/types';
 
 import {SESSION_STATUSES, SESSIONS_FILTER_TAGS} from '../../releaseWidget/fields';
@@ -31,17 +31,12 @@ const invalidMessages = {
 
 interface Props {
   onClose: SearchBarProps['onClose'];
-  organization: Organization;
   pageFilters: PageFilters;
   widgetQuery: WidgetQuery;
 }
 
-export function ReleaseSearchBar({
-  organization,
-  pageFilters,
-  widgetQuery,
-  onClose,
-}: Props) {
+export function ReleaseSearchBar({pageFilters, widgetQuery, onClose}: Props) {
+  const organization = useOrganization();
   const orgSlug = organization.slug;
   const projectIds = pageFilters.projects;
 

static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/index.tsx

@@ -1,9 +1,9 @@
 import {t} from 'sentry/locale';
 import type {TagCollection} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import type {UseApiQueryResult} from 'sentry/utils/queryClient';
 import type RequestError from 'sentry/utils/requestError/requestError';
+import useOrganization from 'sentry/utils/useOrganization';
 import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import type {ValidateWidgetResponse} from 'sentry/views/dashboards/types';
 
@@ -17,7 +17,6 @@ interface Props {
   columns: QueryFieldValue[];
   dataSet: DataSet;
   onGroupByChange: (newFields: QueryFieldValue[]) => void;
-  organization: Organization;
   tags: TagCollection;
   validatedWidgetResponse: UseApiQueryResult<ValidateWidgetResponse, RequestError>;
 }
@@ -26,10 +25,10 @@ export function GroupByStep({
   dataSet,
   columns,
   onGroupByChange,
-  organization,
   tags,
   validatedWidgetResponse,
 }: Props) {
+  const organization = useOrganization();
   const datasetConfig = getDatasetConfig(DATA_SET_TO_WIDGET_TYPE[dataSet]);
 
   const groupByOptions = datasetConfig.getGroupByFieldOptions

static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx

@@ -9,7 +9,6 @@ import {t, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {SelectValue} from 'sentry/types/core';
 import type {TagCollection} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import type {WidgetQuery, WidgetType} from 'sentry/views/dashboards/types';
 import {DisplayType} from 'sentry/views/dashboards/types';
@@ -30,7 +29,6 @@ interface Props {
   displayType: DisplayType;
   onLimitChange: (newLimit: number) => void;
   onSortByChange: (newSortBy: string) => void;
-  organization: Organization;
   queries: WidgetQuery[];
   tags: TagCollection;
   widgetType: WidgetType;

static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.spec.tsx

@@ -321,7 +321,6 @@ describe('VisualizationStep', function () {
       <MEPSettingProvider>
         <DashboardsMEPProvider>
           <VisualizationStep
-            organization={organization}
             pageFilters={PageFiltersFixture()}
             displayType={DisplayType.TABLE}
             error={undefined}

static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.tsx

@@ -14,8 +14,8 @@ import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {PageFilters, SelectValue} from 'sentry/types/core';
-import type {Organization} from 'sentry/types/organization';
 import type {TableDataWithTitle} from 'sentry/utils/discover/discoverQuery';
+import useOrganization from 'sentry/utils/useOrganization';
 import usePrevious from 'sentry/utils/usePrevious';
 import type {DashboardFilters, Widget, WidgetType} from 'sentry/views/dashboards/types';
 import {DisplayType} from 'sentry/views/dashboards/types';
@@ -34,7 +34,6 @@ interface Props {
   isWidgetInvalid: boolean;
   location: Location;
   onChange: (displayType: DisplayType) => void;
-  organization: Organization;
   pageFilters: PageFilters;
   widget: Widget;
   widgetLegendState: WidgetLegendSelectionState;
@@ -45,7 +44,6 @@ interface Props {
 }
 
 export function VisualizationStep({
-  organization,
   pageFilters,
   displayType,
   error,
@@ -58,6 +56,7 @@ export function VisualizationStep({
   onWidgetSplitDecision,
   widgetLegendState,
 }: Props) {
+  const organization = useOrganization();
   const [debouncedWidget, setDebouncedWidget] = useState(widget);
 
   const previousWidget = usePrevious(widget);

static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/index.tsx

@@ -1,6 +1,5 @@
 import {t} from 'sentry/locale';
 import type {TagCollection} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import type {WidgetType} from 'sentry/views/dashboards/types';
 import {DisplayType} from 'sentry/views/dashboards/types';
@@ -15,7 +14,6 @@ interface Props {
   dataSet: DataSet;
   displayType: DisplayType;
   onYAxisChange: (newFields: QueryFieldValue[], newSelectedAggregate?: number) => void;
-  organization: Organization;
   tags: TagCollection;
   widgetType: WidgetType;
   queryErrors?: Record<string, any>[];

static/app/views/dashboards/widgetBuilder/index.tsx

@@ -10,8 +10,7 @@ import WidgetLegendSelectionState from '../widgetLegendSelectionState';
 
 import WidgetBuilder from './widgetBuilder';
 
-interface WidgetBuilderProps
-  extends Omit<React.ComponentProps<typeof WidgetBuilder>, 'organization'> {}
+interface WidgetBuilderProps extends React.ComponentProps<typeof WidgetBuilder> {}
 
 function WidgetBuilderContainer(props: WidgetBuilderProps) {
   const organization = useOrganization();
@@ -32,7 +31,6 @@ function WidgetBuilderContainer(props: WidgetBuilderProps) {
       >
         <WidgetBuilder
           {...props}
-          organization={organization}
           widgetLegendState={
             new WidgetLegendSelectionState({
               location: props.location,