task/WP-109-remove-unused-django-fields-v2

TACC · Oct 17, 2023 · 8f8c30c · 8f8c30c
1 parent baa2ab4
commit 8f8c30c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/client/src/components/ManageAccount/ManageAccountTables.jsx b/client/src/components/ManageAccount/ManageAccountTables.jsx
@@ -65,8 +65,6 @@ export const ProfileInformation = () => {
       { Header: 'Institution', accessor: 'institution' },
       { Header: 'Country of Residence', accessor: 'country' },
       { Header: 'Country of Citizenship', accessor: 'citizenship' },
-      // { Header: 'Ethnicity', accessor: 'ethnicity' },
-      // { Header: 'Gender', accessor: 'gender' },
     ],
     []
   );

diff --git a/client/src/components/ManageAccount/tests/ManageAccountTables.test.js b/client/src/components/ManageAccount/tests/ManageAccountTables.test.js
@@ -21,12 +21,6 @@ const dummyState = {
   },
   data: {
     demographics: {
-      // ethnicity: 'Asian',
-      // gender: 'Male',
-      // bio: '',
-      // website: 'http://owais.io',
-      // orcid_id: 'test',
-      // professional_level: 'Staff (support, administration, etc)',
       username: 'ojamil',
       email: '[email protected]',
       firstName: 'Owais',
@@ -77,8 +71,6 @@ describe('Profile Information Component', () => {
       'Institution',
       'Country of Residence',
       'Country of Citizenship',
-      // 'Ethnicity',
-      // 'Gender',
     ];
     headings.forEach((heading) => {
       expect(getByText(heading)).toBeInTheDocument();

diff --git a/server/portal/apps/accounts/migrations/0001_initial.py b/server/portal/apps/accounts/migrations/0001_initial.py
@@ -32,8 +32,6 @@ class Migration(migrations.Migration):
             name='PortalProfile',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                # ('ethnicity', models.CharField(max_length=255)),
-                # ('gender', models.CharField(max_length=255)),
                 ('setup_complete', models.BooleanField(default=False)),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)),
             ],

diff --git a/server/portal/apps/accounts/migrations/0006_auto_20231017_2033.py b/server/portal/apps/accounts/migrations/0006_auto_20231017_2033.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.2.20 on 2023-10-17 20:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0005_auto_20210316_1950'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='portalprofile',
+            name='bio',
+        ),
+        migrations.RemoveField(
+            model_name='portalprofile',
+            name='orcid_id',
+        ),
+        migrations.RemoveField(
+            model_name='portalprofile',
+            name='professional_level',
+        ),
+        migrations.RemoveField(
+            model_name='portalprofile',
+            name='website',
+        ),
+    ]
diff --git a/server/portal/apps/accounts/models.py b/server/portal/apps/accounts/models.py
@@ -26,12 +26,6 @@ class PortalProfile(models.Model):
         related_name='profile',
         on_delete=models.CASCADE
     )
-    # ethnicity = models.CharField(max_length=255)
-    # gender = models.CharField(max_length=255)
-    # bio = models.CharField(max_length=4096, default=None, null=True, blank=True)
-    # website = models.CharField(max_length=256, default=None, null=True, blank=True)
-    # orcid_id = models.CharField(max_length=256, default=None, null=True, blank=True)
-    # professional_level = models.CharField(max_length=256, default=None, null=True)
 
     # Default to False. If PORTAL_USER_ACCOUNT_SETUP_STEPS is empty,
     # setup_complete will be set to True on first login