Merge branch 'main' into chore/make-add-known-sdk-version-28934229164

Author: khvn26

api/app_analytics/constants.py

@@ -68,6 +68,7 @@
         "8.0.2",
         "8.1.0",
         "8.1.1",
+        "8.1.2",
         "9.0.0",
     ],
     "flagsmith-php-sdk": [

api/integrations/launch_darkly/services.py

@@ -1106,6 +1106,13 @@ def create_import_request(
 def process_import_request(
     import_request: LaunchDarklyImportRequest,
 ) -> None:
+    if import_request.completed_at is not None:
+        logger.warning(
+            "Ignoring already-completed LaunchDarkly import request %d.",
+            import_request.id,
+        )
+        return
+
     with _complete_import_request(import_request):
         ld_token = _unsign_ld_value(
             import_request.ld_token,

api/segment_membership/tasks.py

@@ -212,10 +212,14 @@ def refresh_project_segment_counts(project_id: int) -> None:
 
     project = Project.objects.select_related("organisation").get(pk=project_id)
     if not is_membership_enabled(project.organisation):
+        deleted, _ = SegmentMembershipCount.objects.filter(
+            segment__project=project
+        ).delete()
         logger.info(
             "refresh.project.skipped",
             project__id=project_id,
             reason="ff_disabled",
+            stale_counts__count=deleted,
         )
         return
 

api/tests/unit/integrations/launch_darkly/test_services.py

@@ -8,6 +8,7 @@
 from common.test_tools import SnapshotFixture
 from django.conf import settings
 from django.core import signing
+from django.utils import timezone
 from flag_engine.segments import constants as segment_constants
 from pytest_mock import MockerFixture
 from requests.exceptions import HTTPError, RequestException, Timeout
@@ -262,6 +263,27 @@ def test_process_import_request__success__expected_status(  # type: ignore[no-un
     [tag.label for tag in tagged_feature.tags.all()] == ["testtag", "testtag2"]
 
 
+@pytest.mark.django_db(transaction=True)
+def test_process_import_request__already_completed__does_not_reprocess(
+    ld_client_class_mock: MagicMock,
+    ld_client_mock: MagicMock,
+    import_request: LaunchDarklyImportRequest,
+) -> None:
+    # Given
+    import_request.status["result"] = "success"
+    import_request.completed_at = timezone.now()
+    import_request.ld_token = ""
+    import_request.save()
+    ld_client_class_mock.reset_mock()
+
+    # When
+    process_import_request(import_request)
+
+    # Then
+    ld_client_class_mock.assert_not_called()
+    ld_client_mock.get_environments.assert_not_called()
+
+
 @pytest.mark.django_db(transaction=True)
 def test_process_import_request__valid_segments__imports_correctly(  # type: ignore[no-untyped-def]
     project: Project,

api/tests/unit/segment_membership/test_unit_segment_membership_tasks.py

@@ -449,23 +449,36 @@ def test_refresh_project_segment_counts__no_clickhouse_creds__skips(
     )
 
 
-def test_refresh_project_segment_counts__ff_disabled__skips(
+def test_refresh_project_segment_counts__ff_disabled__skips_and_purges_stale_counts(
     mocker: MockerFixture,
     settings: SettingsWrapper,
     project: Project,
+    environment: Environment,
+    segment: Segment,
     log: StructuredLogCapture,
 ) -> None:
     # Given
     settings.CLICKHOUSE_ENABLED = True
     spy = mocker.patch.object(tasks, "open_clickhouse_cursor")
+    SegmentMembershipCount.objects.create(
+        segment=segment,
+        environment=environment,
+        count=15,
+        last_synced_at=timezone.now(),
+    )
 
     # When
     refresh_project_segment_counts(project.id)
 
     # Then
     spy.assert_not_called()
+    assert not SegmentMembershipCount.objects.filter(
+        segment=segment, environment=environment
+    ).exists()
     assert any(
-        e["event"] == "refresh.project.skipped" and e["reason"] == "ff_disabled"
+        e["event"] == "refresh.project.skipped"
+        and e["reason"] == "ff_disabled"
+        and e["stale_counts__count"] == 1
         for e in log.events
     )
 

docs/docs/deployment-self-hosting/observability/_events-catalogue.md

@@ -388,7 +388,7 @@ Attributes:
 ### `segment_membership.refresh.project.completed`
 
 Logged at `info` from:
- - `api/segment_membership/tasks.py:262`
+ - `api/segment_membership/tasks.py:266`
 
 Attributes:
  - `membership_counts.count`
@@ -398,7 +398,7 @@ Attributes:
 ### `segment_membership.refresh.project.failed`
 
 Logged at `exception` from:
- - `api/segment_membership/tasks.py:235`
+ - `api/segment_membership/tasks.py:239`
 
 Attributes:
  - `project.id`
@@ -407,11 +407,12 @@ Attributes:
 
 Logged at `info` from:
  - `api/segment_membership/tasks.py:206`
- - `api/segment_membership/tasks.py:215`
+ - `api/segment_membership/tasks.py:218`
 
 Attributes:
  - `project.id`
  - `reason`
+ - `stale_counts.count`
 
 ### `segment_membership.seed.environment.completed`
 

frontend/common/lifecycleEnvironmentSlice.ts

@@ -0,0 +1,26 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+
+type LifecycleEnvironmentState = {
+  // Maps a project id to the environment id selected for lifecycle analysis.
+  byProject: Record<number, number>
+}
+
+const initialState: LifecycleEnvironmentState = {
+  byProject: {},
+}
+
+const lifecycleEnvironmentSlice = createSlice({
+  initialState,
+  name: 'lifecycleEnvironment',
+  reducers: {
+    setLifecycleEnvironment(
+      state,
+      action: PayloadAction<{ projectId: number; environmentId: number }>,
+    ) {
+      state.byProject[action.payload.projectId] = action.payload.environmentId
+    },
+  },
+})
+
+export const { setLifecycleEnvironment } = lifecycleEnvironmentSlice.actions
+export default lifecycleEnvironmentSlice.reducer

frontend/common/services/useProjectFlag.ts

@@ -35,7 +35,13 @@ function recursivePageGet(
 }
 export const projectFlagService = service
   .enhanceEndpoints({
-    addTagTypes: ['ProjectFlag', 'FeatureList', 'FeatureState', 'Environment'],
+    addTagTypes: [
+      'ProjectFlag',
+      'FeatureList',
+      'FeatureState',
+      'Environment',
+      'LifecycleCounts',
+    ],
   })
   .injectEndpoints({
     endpoints: (builder) => ({
@@ -68,6 +74,7 @@ export const projectFlagService = service
         invalidatesTags: [
           { id: 'LIST', type: 'ProjectFlag' },
           { id: 'LIST', type: 'FeatureList' },
+          'LifecycleCounts',
         ],
         query: (query: Req['createProjectFlag']) => ({
           body: query.body,
@@ -132,6 +139,16 @@ export const projectFlagService = service
         }),
       }),
 
+      getLifecycleStatusCounts: builder.query<
+        Res['lifecycleStatusCounts'],
+        Req['getLifecycleStatusCounts']
+      >({
+        providesTags: ['LifecycleCounts'],
+        query: ({ environment }) => ({
+          url: `environments/${environment}/feature-lifecycle-counts/`,
+        }),
+      }),
+
       getProjectFlag: builder.query<Res['projectFlag'], Req['getProjectFlag']>({
         providesTags: (res) => [{ id: res?.id, type: 'ProjectFlag' }],
         query: (query: Req['getProjectFlag']) => ({
@@ -198,6 +215,7 @@ export const projectFlagService = service
           { id: 'LIST', type: 'ProjectFlag' },
           { id: 'LIST', type: 'FeatureList' },
           { id: 'METRICS', type: 'Environment' },
+          'LifecycleCounts',
         ],
         query: ({ flag_id, project_id }) => ({
           method: 'DELETE',
@@ -213,6 +231,7 @@ export const projectFlagService = service
           { id: 'LIST', type: 'ProjectFlag' },
           { id: res?.id, type: 'ProjectFlag' },
           { id: 'LIST', type: 'FeatureList' },
+          'LifecycleCounts',
         ],
         query: (query: Req['updateProjectFlag']) => ({
           body: query.body,
@@ -284,6 +303,7 @@ export const {
   useAddFlagOwnersMutation,
   useCreateProjectFlagMutation,
   useGetFeatureListQuery,
+  useGetLifecycleStatusCountsQuery,
   useGetProjectFlagQuery,
   useGetProjectFlagsQuery,
   useRemoveFlagGroupOwnersMutation,

frontend/common/store.ts

@@ -14,10 +14,12 @@ import storage from 'redux-persist/lib/storage'
 import { Persistor } from 'redux-persist/es/types'
 import { service } from './service'
 import selectedOrganisationReducer from './selectedOrganisationSlice'
+import lifecycleEnvironmentReducer from './lifecycleEnvironmentSlice'
 // END OF IMPORTS
 const createStore = () => {
   const reducer = combineReducers({
     [service.reducerPath]: service.reducer,
+    lifecycleEnvironment: lifecycleEnvironmentReducer,
     selectedOrganisation: selectedOrganisationReducer,
     // END OF REDUCERS
   })
@@ -36,7 +38,7 @@ const createStore = () => {
         key: 'root',
         storage,
         version: 1,
-        whitelist: ['user'],
+        whitelist: ['user', 'lifecycleEnvironment'],
       },
       reducer,
     ),

frontend/common/types/requests.ts

@@ -32,6 +32,7 @@ import {
   FlagsmithValue,
   TagStrategy,
   FeatureType,
+  LifecycleStage,
 } from './responses'
 import { UtmsType } from './utms'
 
@@ -401,6 +402,10 @@ export type Req = {
     group_owners?: number[]
     sort_field?: string
     sort_direction?: SortOrder
+    lifecycle_stage?: LifecycleStage
+  }
+  getLifecycleStatusCounts: {
+    environment: number
   }
   getProjectFlag: { project: number; id: number }
   getRolesPermissionUsers: { organisation_id: number; role_id: number }