Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

task/WP-109-remove-unused-django-fields #887

Merged
merged 7 commits into from
Oct 24, 2023
Merged

task/WP-109-remove-unused-django-fields #887

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad63630
task/WP-109-remove-unused-django-fields-v1
Oct 16, 2023
baa2ab4
Merge branch 'main' into task/WP-109-remove-unused-django-fields
tjgrafft Oct 17, 2023
8f8c30c
task/WP-109-remove-unused-django-fields-v2
Oct 17, 2023
bc205f1
Merge branch 'main' into task/WP-109-remove-unused-django-fields
tjgrafft Oct 18, 2023
89c4b29
task/WP-109-remove-unused-django-fields-v3
Oct 18, 2023
5dee19a
task/WP-109-remove-unused-django-fields-v4
Oct 18, 2023
1c30780
Merge branch 'main' into task/WP-109-remove-unused-django-fields
rstijerina Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/src/components/ManageAccount/ManageAccountTables.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ 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' },
// { Header: 'Ethnicity', accessor: 'ethnicity' },
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we remove these instead of commenting them oout

// { Header: 'Gender', accessor: 'gender' },
],
[]
);
Expand Down
16 changes: 8 additions & 8 deletions client/src/components/ManageAccount/tests/ManageAccountTables.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ const dummyState = {
},
data: {
demographics: {
ethnicity: 'Asian',
gender: 'Male',
bio: '',
website: 'http://owais.io',
orcid_id: 'test',
professional_level: 'Staff (support, administration, etc)',
// ethnicity: 'Asian',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, delete this unused code

Copy link
Collaborator Author

@tjgrafft tjgrafft Oct 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, I believe those values (on https://accounts.tacc.utexas.edu/profile) are different than the values that we're deleting on the backend. I say this because when I look at the api response on https://cep.test/accounts/api/profile/data/, those values are either empty strings or null for my profile, whereas on https://accounts.tacc.utexas.edu/profile, they are filled out. So my guess is this is separate from the PortalProfile data.

// gender: 'Male',
// bio: '',
// website: 'http://owais.io',
// orcid_id: 'test',
// professional_level: 'Staff (support, administration, etc)',
username: 'ojamil',
email: 'ojamil@tacc.utexas.edu',
firstName: 'Owais',
Expand Down Expand Up @@ -77,8 +77,8 @@ describe('Profile Information Component', () => {
'Institution',
'Country of Residence',
'Country of Citizenship',
'Ethnicity',
'Gender',
// 'Ethnicity',
// 'Gender',
];
headings.forEach((heading) => {
expect(getByText(heading)).toBeInTheDocument();
Expand Down
4 changes: 2 additions & 2 deletions server/portal/apps/accounts/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ 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)),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to keep old migrations unaltered, and rather all our future changes can be handled by additional migrations

# ('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)),
],
Expand Down
12 changes: 6 additions & 6 deletions server/portal/apps/accounts/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ 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)
# 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
Expand Down
12 changes: 3 additions & 9 deletions server/portal/fixtures/accounts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,21 @@
"model": "accounts.portalprofile",
"pk": 1,
"fields": {
"user": 1,
"ethnicity": "",
"gender": ""
"user": 1
}
},
{
"model": "accounts.portalprofile",
"pk": 2,
"fields": {
"user": 2,
"ethnicity": "",
"gender": ""
"user": 2
}
},
{
"model": "accounts.portalprofile",
"pk": 3,
"fields": {
"user": 3,
"ethnicity": "",
"gender": ""
"user": 3
}
},
{
Expand Down
6 changes: 0 additions & 6 deletions server/portal/fixtures/users.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@
"pk": 1,
"fields": {
"user": 1,
"ethnicity": "",
"gender": "",
"bio": null,
"website": null,
"orcid_id": null,
"professional_level": null,
"setup_complete": true
}
}
Expand Down