Merge pull request #575 from intuitem/567_show_filesize

567: show evidences file size
intuitem · Jul 19, 2024 · c98b0f8 · c98b0f8
2 parents 5fe56a4 + 8cf72c1
commit c98b0f8
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 11 deletions.
diff --git a/backend/core/models.py b/backend/core/models.py
@@ -1087,6 +1087,18 @@ def get_folder(self):
     def filename(self):
         return os.path.basename(self.attachment.name)
 
+    def get_size(self):
+        if not self.attachment:
+            return None
+        # get the attachment size with the correct unit
+        size = self.attachment.size
+        if size < 1024:
+            return f"{size} B"
+        elif size < 1024 * 1024:
+            return f"{size / 1024:.1f} KB"
+        else:
+            return f"{size / 1024 / 1024:.1f} MB"
+
 
 class AppliedControl(NameDescriptionMixin, FolderMixin, PublishInRootFolderMixin):
     class Status(models.TextChoices):

diff --git a/backend/core/serializers.py b/backend/core/serializers.py
@@ -445,6 +445,7 @@ class RequirementNodeWriteSerializer(RequirementNodeReadSerializer):
 
 class EvidenceReadSerializer(BaseModelSerializer):
     attachment = serializers.CharField(source="filename")
+    size = serializers.CharField(source="get_size")
     folder = FieldsRelatedField()
     applied_controls = FieldsRelatedField(many=True)
     requirement_assessments = FieldsRelatedField(many=True)

diff --git a/frontend/messages/ar.json b/frontend/messages/ar.json
@@ -613,5 +613,6 @@
 	"ssoSettings": "إعدادات تسجيل الدخول الموحد",
 	"ssoSettingsDescription": "قم بتكوين إعدادات تسجيل الدخول الموحد هنا.",
 	"sso": "SSO",
-	"isSso": "هل هو SSO"
+	"isSso": "هل هو SSO",
+	"size": "الحجم"
 }
diff --git a/frontend/messages/de.json b/frontend/messages/de.json
@@ -613,5 +613,6 @@
 	"progress": "Fortschreiten",
 	"back": "Zurückkehren",
 	"duplicate": "Duplikat",
-	"duplicateRiskAssessment": "Duplizieren Sie die Risikobewertung"
+	"duplicateRiskAssessment": "Duplizieren Sie die Risikobewertung",
+	"size": "Größe"
 }
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
@@ -654,5 +654,6 @@
 	"progress": "Progress",
 	"back": "Back",
 	"duplicate": "Duplicate",
-	"duplicateRiskAssessment": "Duplicate the risk assessment"
+	"duplicateRiskAssessment": "Duplicate the risk assessment",
+	"size": "Size"
 }
diff --git a/frontend/messages/es.json b/frontend/messages/es.json
@@ -613,5 +613,6 @@
 	"progress": "Progresión",
 	"back": "Devolver",
 	"duplicate": "Duplicar",
-	"duplicateRiskAssessment": "Duplicar la evaluación de riesgo"
+	"duplicateRiskAssessment": "Duplicar la evaluación de riesgo",
+	"size": "Tamaño"
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
@@ -613,5 +613,6 @@
 	"progress": "Progression",
 	"back": "Retour",
 	"duplicate": "Dupliquer",
-	"duplicateRiskAssessment": "Dupliquer l’évaluation de risque"
+	"duplicateRiskAssessment": "Dupliquer l’évaluation de risque",
+	"size": "Taille"
 }
diff --git a/frontend/messages/it.json b/frontend/messages/it.json
@@ -613,5 +613,6 @@
 	"progress": "Progressione",
 	"back": "Ritorno",
 	"duplicate": "Duplicare",
-	"duplicateRiskAssessment": "Duplicare la valutazione del rischio"
+	"duplicateRiskAssessment": "Duplicare la valutazione del rischio",
+	"size": "Dimensione"
 }
diff --git a/frontend/messages/nl.json b/frontend/messages/nl.json
@@ -613,5 +613,6 @@
 	"progress": "Progressie",
 	"back": "Opbrengst",
 	"duplicate": "Duplicaat",
-	"duplicateRiskAssessment": "Dupliceer de risicobeoordeling"
+	"duplicateRiskAssessment": "Dupliceer de risicobeoordeling",
+	"size": "Grootte"
 }
diff --git a/frontend/messages/pl.json b/frontend/messages/pl.json
@@ -650,5 +650,6 @@
 	"progress": "Postęp",
 	"back": "Powrót",
 	"duplicate": "Duplikować",
-	"duplicateRiskAssessment": "Powielić ocenę ryzyka"
+	"duplicateRiskAssessment": "Powielić ocenę ryzyka",
+	"size": "Rozmiar"
 }
diff --git a/frontend/messages/pt.json b/frontend/messages/pt.json
@@ -613,5 +613,6 @@
 	"progress": "Progressão",
 	"back": "Retornar",
 	"duplicate": "Duplicado",
-	"duplicateRiskAssessment": "Duplicar a avaliação de risco"
+	"duplicateRiskAssessment": "Duplicar a avaliação de risco",
+	"size": "Tamanho"
 }
diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts
@@ -374,8 +374,8 @@ export const listViewFields: ListViewFieldsConfig = {
 		breadcrumb_link_disabled: true
 	},
 	evidences: {
-		head: ['name', 'file', 'description'],
-		body: ['name', 'attachment', 'description'],
+		head: ['name', 'file', 'size', 'description'],
+		body: ['name', 'attachment', 'size', 'description'],
 		filters: {
 			folder: { ...DOMAIN_FILTER_FROM_META, alwaysDisplay: true } // This filter should also be displayed even without alwaysDisplay
 		}