Remove notes status emoji

CHANGELOG.md

@@ -6,6 +6,7 @@
 * Disable buttons and menu entries when user does not have permissions
 * Fix save error for user fields
 * Ensure custom fonts are loaded before rendering charts and diagrams
+* Remove status emoji of notes
 
 
 ## v2023.145 - 2023-12-11

api/src/reportcreator_api/archive/import_export/serializers.py

@@ -407,13 +407,12 @@ class Meta:
         model = ProjectNotebookPage
         fields = [
             'id', 'created', 'updated',
-            'title', 'text', 'checked', 'icon_emoji', 'status_emoji', 'assignee',
+            'title', 'text', 'checked', 'icon_emoji', 'assignee',
             'order', 'parent',
         ]
         extra_kwargs = {
             'created': {'read_only': False, 'required': False},
             'icon_emoji': {'required': False},
-            'status_emoji': {'required': False},
             'assignee': {'required': False}
         }
 

api/src/reportcreator_api/pentests/migrations/0047_remove_historicalprojectnotebookpage_status_emoji_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.7 on 2023-12-14 09:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pentests', '0046_history_encryption'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='historicalprojectnotebookpage',
+            name='status_emoji',
+        ),
+        migrations.RemoveField(
+            model_name='projectnotebookpage',
+            name='status_emoji',
+        ),
+        migrations.RemoveField(
+            model_name='usernotebookpage',
+            name='status_emoji',
+        ),
+    ]

api/src/reportcreator_api/pentests/models/notes.py

@@ -18,7 +18,6 @@ class Meta:
     text = EncryptedField(base_field=models.TextField(default=''))
     checked = models.BooleanField(null=True, blank=True)
     icon_emoji = models.CharField(max_length=32, null=True, blank=True)
-    status_emoji = models.CharField(max_length=32, null=True, blank=True)
 
     parent = models.ForeignKey(to='self', on_delete=models.CASCADE, null=True, blank=True)
     order = models.PositiveIntegerField()

api/src/reportcreator_api/pentests/serializers/notes.py

@@ -17,7 +17,7 @@ class NotebookPageSerializerBase(serializers.ModelSerializer):
     class Meta:
         fields = [
             'id', 'created', 'updated', 'lock_info',
-            'title', 'text', 'checked', 'icon_emoji', 'status_emoji',
+            'title', 'text', 'checked', 'icon_emoji',
             'order', 'parent',
         ]
         extra_kwargs = {

api/src/reportcreator_api/tests/mock.py

@@ -188,7 +188,6 @@ def create_usernotebookpage(**kwargs) -> UserNotebookPage:
         'text': 'Note text',
         'checked': random.choice([None, True, False]),
         'icon_emoji': random.choice([None, '🦖']),
-        'status_emoji': random.choice([None, '✔️', '🤡']),
     } | kwargs)
 
 
@@ -198,7 +197,6 @@ def create_projectnotebookpage(**kwargs) -> ProjectNotebookPage:
         'text': 'Note text',
         'checked': random.choice([None, True, False]),
         'icon_emoji': random.choice([None, '🦖']),
-        'status_emoji': random.choice([None, '✔️', '🤡']),
     } | kwargs)
 
 

api/src/reportcreator_api/tests/test_import_export.py

@@ -175,7 +175,7 @@ def test_export_import_project_all(self):
 
         assert p.notes.count() == self.project.notes.count()
         for i, s in zip(p.notes.order_by('note_id'), self.project.notes.order_by('note_id')):
-            assertKeysEqual(i, s, ['note_id', 'created', 'title', 'text', 'checked', 'icon_emoji', 'status_emoji', 'order'])
+            assertKeysEqual(i, s, ['note_id', 'created', 'title', 'text', 'checked', 'icon_emoji', 'order'])
             assert i.parent.note_id == s.parent.note_id if s.parent else i.parent is None
         assert {(f.name, f.file.read()) for f in p.files.all()} == {(f.name, f.file.read()) for f in self.project.files.all()}
 
@@ -373,7 +373,7 @@ def test_copy_project(self):
 
         for p_n, cp_n in zip(p.notes.order_by('note_id'), cp.notes.order_by('note_id')):
             assert p_n != cp_n
-            assertKeysEqual(p_n, cp_n, ['note_id', 'title', 'text', 'checked', 'icon_emoji', 'status_emoji', 'order'])
+            assertKeysEqual(p_n, cp_n, ['note_id', 'title', 'text', 'checked', 'icon_emoji', 'order'])
             assert not cp_f.is_locked
             if p_n.parent:
                 assert p_n.parent.note_id == cp_n.parent.note_id

frontend/src/components/NotesSortableList.vue

@@ -40,11 +40,6 @@
               </span>
             </v-list-item-subtitle>
           </template>
-          <template #append>
-            <div v-if="item.note.status_emoji" class="note-icon">
-              <s-emoji :value="item.note.status_emoji" size="small" class="emoji-icon" />
-            </div>
-          </template>
         </v-list-item>
 
         <v-list v-if="isExpanded(item.note)" density="compact" class="pt-0 pb-0">

frontend/src/pages/notes/personal/[noteId].vue

@@ -29,12 +29,6 @@
                 v-bind="inputFieldAttrs"
                 class="note-title"
               />
-
-              <s-emoji-picker-field
-                v-model="note.status_emoji"
-                :disabled="readonly"
-                density="comfortable"
-              />
             </div>
           </template>
           <template #context-menu>
@@ -81,7 +75,6 @@ const { readonly, toolbarAttrs, fetchLoaderAttrs } = useLockEdit({
   updateInStore: n => userNotesStore.setNote(n!),
   autoSaveOnUpdateData({ oldValue, newValue }): boolean {
     return oldValue!.checked !== newValue!.checked ||
-        oldValue!.status_emoji !== newValue!.status_emoji ||
         oldValue!.icon_emoji !== newValue!.icon_emoji;
   }
 });

frontend/src/pages/projects/[projectId]/notes/[noteId]/history/[historyDate].vue

@@ -29,12 +29,6 @@
                 v-bind="inputFieldAttrs"
                 class="note-title"
               />
-
-              <s-emoji-picker-field
-                v-model="note.status_emoji"
-                :disabled="readonly"
-                density="comfortable"
-              />
             </div>
           </template>
           <template #default>

frontend/src/pages/projects/[projectId]/notes/[noteId]/index.vue

@@ -29,12 +29,6 @@
                 v-bind="inputFieldAttrs"
                 class="note-title"
               />
-
-              <s-emoji-picker-field
-                v-model="note.status_emoji"
-                :disabled="readonly"
-                density="comfortable"
-              />
             </div>
           </template>
           <template #default>
@@ -100,7 +94,6 @@ const { data: note, project, readonly, toolbarAttrs, fetchLoaderAttrs, inputFiel
   updateInStore: projectStore.setNote,
   autoSaveOnUpdateData({ oldValue, newValue }): boolean {
     return oldValue.checked !== newValue.checked ||
-        oldValue.status_emoji !== newValue.status_emoji ||
         oldValue.icon_emoji !== newValue.icon_emoji ||
         oldValue.assignee?.id !== newValue.assignee?.id;
   }

frontend/src/utils/types.ts

@@ -281,7 +281,6 @@ export type UserNote = BaseModel & Lockable & {
   text: string;
   checked: boolean|null;
   icon_emoji: string;
-  status_emoji: string;
 }
 
 export type ProjectNote = UserNote & {