Browse Source

ref(discover) Use the new discover-basic feature flag (#16605)

Update the UI and endpoint checks to use the discover-basic flag instead
of events-v2.
Mark Story 5 years ago
parent
commit
45856f6b6b

+ 1 - 1
src/sentry/api/endpoints/organization_event_details.py

@@ -14,7 +14,7 @@ from sentry.api.serializers import serialize
 
 class OrganizationEventDetailsEndpoint(OrganizationEventsEndpointBase):
     def get(self, request, organization, project_slug, event_id):
-        if not features.has("organizations:events-v2", organization, actor=request.user):
+        if not features.has("organizations:discover-basic", organization, actor=request.user):
             return Response(status=404)
 
         try:

+ 1 - 1
src/sentry/api/endpoints/organization_events.py

@@ -92,7 +92,7 @@ class OrganizationEventsEndpoint(OrganizationEventsEndpointBase):
 
 class OrganizationEventsV2Endpoint(OrganizationEventsEndpointBase):
     def get(self, request, organization):
-        if not features.has("organizations:events-v2", organization, actor=request.user):
+        if not features.has("organizations:discover-basic", organization, actor=request.user):
             return Response(status=404)
 
         try:

+ 1 - 1
src/sentry/api/endpoints/organization_events_facets.py

@@ -13,7 +13,7 @@ from sentry import features, tagstore
 
 class OrganizationEventsFacetsEndpoint(OrganizationEventsEndpointBase):
     def get(self, request, organization):
-        if not features.has("organizations:events-v2", organization, actor=request.user):
+        if not features.has("organizations:discover-basic", organization, actor=request.user):
             return Response(status=404)
         try:
             params = self.get_filter_params(request, organization)

+ 1 - 1
src/sentry/api/endpoints/organization_events_stats.py

@@ -18,7 +18,7 @@ from sentry.utils.dates import parse_stats_period
 
 class OrganizationEventsStatsEndpoint(OrganizationEventsEndpointBase):
     def get(self, request, organization):
-        if not features.has("organizations:events-v2", organization, actor=request.user):
+        if not features.has("organizations:discover-basic", organization, actor=request.user):
             return self.get_v1_results(request, organization)
 
         try:

+ 4 - 0
src/sentry/conf/server.py

@@ -825,6 +825,10 @@ SENTRY_FEATURES = {
     "organizations:events": False,
     # Enable events v2 instead of the events stream
     "organizations:events-v2": False,
+    # Enable discover 2 basic functions
+    "organizations:discover-basic": False,
+    # Enable discover 2 custom queries and saved queries
+    "organizations:discover-query": False,
     # Enable multi project selection
     "organizations:global-views": False,
     # Turns on grouping info.

+ 1 - 1
src/sentry/discover/endpoints/discover_saved_queries.py

@@ -19,7 +19,7 @@ class DiscoverSavedQueriesEndpoint(OrganizationEndpoint):
     def has_feature(self, organization, request):
         return features.has(
             "organizations:discover", organization, actor=request.user
-        ) or features.has("organizations:events-v2", organization, actor=request.user)
+        ) or features.has("organizations:discover-basic", organization, actor=request.user)
 
     def get(self, request, organization):
         """

+ 1 - 1
src/sentry/discover/endpoints/discover_saved_query_detail.py

@@ -16,7 +16,7 @@ class DiscoverSavedQueryDetailEndpoint(OrganizationEndpoint):
     def has_feature(self, organization, request):
         return features.has(
             "organizations:discover", organization, actor=request.user
-        ) or features.has("organizations:events-v2", organization, actor=request.user)
+        ) or features.has("organizations:discover-basic", organization, actor=request.user)
 
     def get(self, request, organization, query_id):
         """

+ 1 - 1
src/sentry/static/sentry/app/components/sidebar/index.jsx

@@ -285,7 +285,7 @@ class Sidebar extends React.Component {
                     />
                   </Feature>
 
-                  <Feature features={['events-v2']} organization={organization}>
+                  <Feature features={['discover-basic']} organization={organization}>
                     <SidebarItem
                       {...sidebarItemProps}
                       onClick={(_id, evt) =>

+ 1 - 1
src/sentry/static/sentry/app/views/eventsV2/index.tsx

@@ -30,7 +30,7 @@ class DiscoverContainer extends React.Component<Props> {
 
     return (
       <Feature
-        features={['events-v2']}
+        features={['discover-basic']}
         organization={organization}
         renderDisabled={this.renderNoAccess}
       >

+ 1 - 1
src/sentry/static/sentry/app/views/incidents/details/body.tsx

@@ -109,7 +109,7 @@ export default class DetailsBody extends React.Component<Props> {
 
               <SideHeader>
                 <span>{t('Query')}</span>
-                <Feature features={['events-v2']}>
+                <Feature features={['discover-basic']}>
                   <Projects slugs={incident && incident.projects} orgId={params.orgId}>
                     {({initiallyLoaded, projects, fetching}) => (
                       <DiscoverLink

Some files were not shown because too many files changed in this diff