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.

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

A modal used to collect demographics information #24956

Merged
merged 9 commits into from
Sep 14, 2020

Conversation

Tj-Tracy
Copy link
Contributor

No description provided.

@Tj-Tracy Tj-Tracy force-pushed the ttracy/demographics_modal branch from 36067f3 to 6ce5e0d Compare September 11, 2020 15:59
Add checkmark to final page (#24957)

Remove themeing to get ready for staging

MICROBA-574 | Dismiss CTA after learner finishes answering modal questions (#24965)

MICROBA-574 | Dismiss CTA after learner finishes answering demographics questions

[MICROBA-574]
- Dismiss CTA after learner finishes answering demographics questions
- Cleanup comments

Add back devstack logging

Remove keys

new line
@Tj-Tracy Tj-Tracy force-pushed the ttracy/demographics_modal branch from 07c7443 to d52e313 Compare September 11, 2020 16:26
Tj-Tracy and others added 2 commits September 11, 2020 12:55
* Various initial bugfixes

- fixes 2 issues with the multiselect dropdown erasing state
- prevents input higher than 255 characters in the self describe
- fixes 400 errors when the user selects a default option
- Removes additional page count section
[MB-312]
- Re-adding deleted JS file. Can't clean this up until after we cutover to using the new Demographics modal
@@ -1,56 +1,196 @@
.modal-open {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is everything left here styling we could not convert to utility classes? Or is the CSS cleanup still something we need to do in a future release?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

CSS cleanup is going to have to happen at some point. There are still things I have not yet transferred over.

/**
* Utils file to support JWT Token Authentication.
*
* Temporarily copied from the edx/frontend-platform
Copy link
Contributor

Choose a reason for hiding this comment

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

"Temporary" caught my eye. Is there any follow up work we need to do here? If so, is it captured in a ticket in the backlog anywhere?

Copy link
Contributor

@justinhynes justinhynes Sep 11, 2020

Choose a reason for hiding this comment

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

HAH! Disregard. I was reviewing this PR from the bottom to the top. I see we added that README above when we pulled this code in. So it sounds like this is taken care of =D

Copy link
Contributor Author

@Tj-Tracy Tj-Tracy Sep 11, 2020

Choose a reason for hiding this comment

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

CC: @staubina

Copy link
Contributor

Choose a reason for hiding this comment

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

Yup. Please see the README.

@Tj-Tracy Tj-Tracy marked this pull request as ready for review September 11, 2020 18:42
Copy link
Contributor

@staubina staubina left a comment

Choose a reason for hiding this comment

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

Some questions, notes, and small changes. Otherwise looks good to me.

</div>
)
} else {
return null;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is null the right response here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, when you don't want to render anything in react, you return null in the render.

@@ -0,0 +1,77 @@
/**
Copy link
Contributor

Choose a reason for hiding this comment

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

Note: Copied file from frontend-platform.

@@ -0,0 +1,124 @@
/**
Copy link
Contributor

Choose a reason for hiding this comment

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

Note: Copied file from frontend-platform with minimal. Please see README.

/**
* Utils file to support JWT Token Authentication.
*
* Temporarily copied from the edx/frontend-platform
Copy link
Contributor

Choose a reason for hiding this comment

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

Yup. Please see the README.

@edx-status-bot
Copy link

Your PR has finished running tests. There were no failures.

@Tj-Tracy Tj-Tracy merged commit 0151b80 into master Sep 14, 2020
@Tj-Tracy Tj-Tracy deleted the ttracy/demographics_modal branch September 14, 2020 13:28
@edx-pipeline-bot
Copy link
Contributor

EdX Release Notice: This PR has been deployed to the staging environment in preparation for a release to production.

@edx-pipeline-bot
Copy link
Contributor

EdX Release Notice: This PR has been deployed to the production environment.

justinhynes added a commit that referenced this pull request Jul 15, 2024
[APER-2823]

Removes React compoents and functionality tied to a private 2U/edx.org-specific Demographics IDA from edx-platform.

This PR attempts to remove everything added from this PR: #24956. This includes the React components created to collect and transmit Demographics data, as well as functionality for managing JWT and CSRF tokens copied from `frontend-platform` to edx-platform when originally implementing the CTA and modal components.
justinhynes added a commit that referenced this pull request Jul 16, 2024
)

[APER-2823]

Removes React compoents and functionality tied to a private 2U/edx.org-specific Demographics IDA from edx-platform.

This PR attempts to remove everything added from this PR: #24956. This includes the React components created to collect and transmit Demographics data, as well as functionality for managing JWT and CSRF tokens copied from `frontend-platform` to edx-platform when originally implementing the CTA and modal components.
mudassir-hafeez pushed a commit to mudassir-hafeez/edx-platform that referenced this pull request Jul 24, 2024
…nedx#35121)

[APER-2823]

Removes React compoents and functionality tied to a private 2U/edx.org-specific Demographics IDA from edx-platform.

This PR attempts to remove everything added from this PR: openedx#24956. This includes the React components created to collect and transmit Demographics data, as well as functionality for managing JWT and CSRF tokens copied from `frontend-platform` to edx-platform when originally implementing the CTA and modal components.
mudassir-hafeez pushed a commit to mudassir-hafeez/edx-platform that referenced this pull request Jul 24, 2024
…nedx#35121)

[APER-2823]

Removes React compoents and functionality tied to a private 2U/edx.org-specific Demographics IDA from edx-platform.

This PR attempts to remove everything added from this PR: openedx#24956. This includes the React components created to collect and transmit Demographics data, as well as functionality for managing JWT and CSRF tokens copied from `frontend-platform` to edx-platform when originally implementing the CTA and modal components.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants