Merge pull request #1694 from BLSQ/IA-3301-Add-column-Projects-on-the…

…-left IA-3301: Add column Projects on the left
BLSQ · Oct 10, 2024 · 548d26a · 548d26a
2 parents d83fb79 + 32f3708
commit 548d26a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/hat/assets/js/apps/Iaso/domains/teams/config.tsx b/hat/assets/js/apps/Iaso/domains/teams/config.tsx
@@ -20,6 +20,12 @@ export const teamColumns = (
             accessor: 'id',
             width: 80,
         },
+        {
+            Header: formatMessage(MESSAGES.project),
+            accessor: 'project_details',
+            id: 'project__name',
+            Cell: settings => settings.row.original.project_details.name
+        },
         {
             Header: formatMessage(MESSAGES.name),
             accessor: 'name',

diff --git a/iaso/api/microplanning.py b/iaso/api/microplanning.py
@@ -72,6 +72,7 @@ class Meta:
         fields = [
             "id",
             "project",
+            "project_details",
             "name",
             "description",
             "created_at",
@@ -88,6 +89,7 @@ class Meta:
 
     users_details = NestedUserSerializer(many=True, read_only=True, source="users")
     sub_teams_details = NestedTeamSerializer(many=True, read_only=True, source="sub_teams")
+    project_details = NestedProjectSerializer(many=False, read_only=True, source="project")
 
     def validate_parent(self, value: Team):
         if value is not None and value.type not in (None, TeamType.TEAM_OF_TEAMS):
@@ -239,7 +241,7 @@ class TeamViewSet(AuditMixin, ModelViewSet):
     permission_classes = [ReadOnlyOrHasPermission(permission.TEAMS)]  # type: ignore
     serializer_class = TeamSerializer
     queryset = Team.objects.all()
-    ordering_fields = ["id", "name", "created_at", "updated_at", "type"]
+    ordering_fields = ["id", "project__name", "name", "created_at", "updated_at", "type"]
     filterset_fields = {
         "id": ["in"],
         "name": ["icontains"],