solve conflicts

Author: novakzaballa

api/environments/serializers.py

@@ -86,6 +86,16 @@ def get_project(self, validated_data: dict = None) -> Project:
         )
 
 
+class EnvironmentRetrieveSerializerWithMetadata(EnvironmentSerializerWithMetadata):
+    total_segment_overrides = serializers.IntegerField()
+
+    class Meta(EnvironmentSerializerWithMetadata.Meta):
+        fields = EnvironmentSerializerWithMetadata.Meta.fields + (
+            "total_segment_overrides",
+        )
+        read_only_fields = ("total_segment_overrides",)
+
+
 class CreateUpdateEnvironmentSerializer(
     ReadOnlyIfNotValidPlanMixin, EnvironmentSerializerWithMetadata
 ):

api/environments/views.py

@@ -3,6 +3,7 @@
 
 import logging
 
+from django.db.models import Count
 from django.utils.decorators import method_decorator
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
@@ -41,6 +42,7 @@
     CloneEnvironmentSerializer,
     CreateUpdateEnvironmentSerializer,
     EnvironmentAPIKeySerializer,
+    EnvironmentRetrieveSerializerWithMetadata,
     EnvironmentSerializerWithMetadata,
     WebhookSerializer,
 )
@@ -73,6 +75,8 @@ def get_serializer_class(self):
             return DeleteAllTraitKeysSerializer
         if self.action == "clone":
             return CloneEnvironmentSerializer
+        if self.action == "retrieve":
+            return EnvironmentRetrieveSerializerWithMetadata
         elif self.action in ("create", "update", "partial_update"):
             return CreateUpdateEnvironmentSerializer
         return EnvironmentSerializerWithMetadata
@@ -98,12 +102,20 @@ def get_queryset(self):
                 return (
                     self.request.master_api_key.organisation.projects.environments.all()
                 )
+
             return self.request.user.get_permitted_environments(
                 "VIEW_ENVIRONMENT", project=project
             )
 
         # Permission class handles validation of permissions for other actions
-        return Environment.objects.all()
+        queryset = Environment.objects.all()
+
+        if self.action == "retrieve":
+            queryset = queryset.annotate(
+                total_segment_overrides=Count("feature_segments")
+            )
+
+        return queryset
 
     def perform_create(self, serializer):
         environment = serializer.save()

api/projects/serializers.py

@@ -39,10 +39,8 @@ class Meta:
     def get_migration_status(self, obj: Project) -> str:
         if not settings.PROJECT_METADATA_TABLE_NAME_DYNAMO:
             migration_status = ProjectIdentityMigrationStatus.NOT_APPLICABLE.value
-
         elif obj.is_edge_project_by_default:
             migration_status = ProjectIdentityMigrationStatus.MIGRATION_COMPLETED.value
-
         else:
             migration_status = IdentityMigrator(obj.id).migration_status.value
 

api/projects/tests/test_serializers.py

@@ -4,7 +4,10 @@
 from django.utils import timezone
 
 from environments.dynamodb.types import ProjectIdentityMigrationStatus
-from projects.serializers import ProjectListSerializer
+from projects.serializers import (
+    ProjectListSerializer,
+    ProjectRetrieveSerializer,
+)
 
 
 def test_ProjectListSerializer_get_migration_status_returns_migration_not_applicable_if_not_configured(
@@ -86,3 +89,24 @@ def test_ProjectListSerializer_get_use_edge_identities(
 
     # When/Then
     assert expected is serializer.get_use_edge_identities(project)
+
+
+@pytest.mark.parametrize(
+    "migration_status, expected",
+    [
+        (ProjectIdentityMigrationStatus.MIGRATION_COMPLETED.value, True),
+        (ProjectIdentityMigrationStatus.MIGRATION_IN_PROGRESS.value, False),
+        (ProjectIdentityMigrationStatus.MIGRATION_NOT_STARTED.value, False),
+        (ProjectIdentityMigrationStatus.NOT_APPLICABLE.value, False),
+    ],
+)
+def test_ProjectRetrieveSerializer_get_use_edge_identities(
+    project, migration_status, expected
+):
+    # Given
+    serializer = ProjectRetrieveSerializer(
+        context={"migration_status": migration_status}
+    )
+
+    # When/Then
+    assert expected is serializer.get_use_edge_identities(project)

api/tests/unit/projects/test_unit_projects_views.py

@@ -71,7 +71,6 @@ def test_get_project_data_by_id(client, organisation, project):
 
     # When
     response = client.get(url)
-    print("DEBUG: response:", response.json())
 
     # Then
     assert response.status_code == status.HTTP_200_OK

frontend/web/components/modals/CreateSegment.tsx

@@ -36,6 +36,7 @@ import JSONReference from 'components/JSONReference'
 import { cloneDeep } from 'lodash'
 import ErrorMessage from 'components/ErrorMessage'
 import ProjectStore from 'common/stores/project-store'
+import Icon from 'components/Icon'
 
 type PageType = {
   number: number
@@ -135,20 +136,13 @@ const CreateSegment: FC<CreateSegmentType> = ({
 
   const isError = createError || updateError
   const isLimitReached =
-    ProjectStore.getTotalSegments() >= ProjectStore.getMaxFeaturesAllowed()
+    ProjectStore.getTotalSegments() >= ProjectStore.getMaxSegmentsAllowed()
 
   const THRESHOLD = 90
   const segmentsLimitAlert = Utils.calculateRemainingLimitsPercentage(
     ProjectStore.getTotalSegments(),
-    ProjectStore.getMaxFeaturesAllowed(),
-    THRESHOLD,
-  )
-
-  console.log(
-    'DEBUG: ProjectStore.getTotalSegments()c:',
-    ProjectStore.getTotalSegments(),
-    'ProjectStore.getMaxSegmentsAllowed()c:',
     ProjectStore.getMaxSegmentsAllowed(),
+    THRESHOLD,
   )
 
   const addRule = (type = 'ANY') => {
@@ -526,6 +520,7 @@ const CreateSegment: FC<CreateSegmentType> = ({
                     title='Environment'
                     component={
                       <EnvironmentSelect
+                        projectId={`${projectId}`}
                         value={environmentId}
                         onChange={(environmentId: string) => {
                           setEnvironmentId(environmentId)
@@ -600,17 +595,35 @@ const CreateSegment: FC<CreateSegmentType> = ({
                                 <div className='font-weight-medium'>
                                   {identifier}
                                 </div>
-                                <div
-                                  className={`${
-                                    inSegment
-                                      ? 'font-weight-medium text-primary'
-                                      : 'text-muted fs-small lh-sm'
+                                <Row
+                                  className={`font-weight-medium fs-small lh-sm ${
+                                    inSegment ? 'text-primary' : 'faint'
                                   }`}
                                 >
-                                  {inSegment
-                                    ? 'User in segment'
-                                    : 'Not in segment'}
-                                </div>
+                                  {inSegment ? (
+                                    <>
+                                      <Icon
+                                        name='checkmark-circle'
+                                        width={20}
+                                        fill='#6837FC'
+                                      />
+                                      <span className='ml-1'>
+                                        User in segment
+                                      </span>
+                                    </>
+                                  ) : (
+                                    <>
+                                      <Icon
+                                        name='minus-circle'
+                                        width={20}
+                                        fill='#9DA4AE'
+                                      />
+                                      <span className='ml-1'>
+                                        Not in segment
+                                      </span>
+                                    </>
+                                  )}
+                                </Row>
                               </Row>
                             )
                           }}

frontend/web/components/pages/FeaturesPage.js

@@ -174,7 +174,7 @@ const FeaturesPage = class extends Component {
             const isLoading = !FeatureListStore.hasLoaded
             const THRESHOLD = 90
             const featureLimitAlert = Utils.calculateRemainingLimitsPercentage(
-              100,
+              totalFeatures,
               maxFeaturesAllowed,
               THRESHOLD,
             )

frontend/web/components/pages/SegmentsPage.tsx

@@ -76,12 +76,7 @@ const SegmentsPage: FC<SegmentsPageType> = (props) => {
     ProjectStore.getMaxSegmentsAllowed(),
     THRESHOLD,
   )
-  console.log(
-    'DEBUG: ProjectStore.getTotalSegments():',
-    ProjectStore.getTotalSegments(),
-    'ProjectStore.getMaxSegmentsAllowed():',
-    ProjectStore.getMaxSegmentsAllowed(),
-  )
+
   useEffect(() => {
     API.trackPage(Constants.pages.FEATURES)
   }, [])