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

Jump to bottom

initializes materials used field with formik value #1107

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

initializes materials used field with formik value #1107

wants to merge 5 commits into from

Conversation

brrkrmn
Copy link
Collaborator

@brrkrmn brrkrmn commented Feb 16, 2024

Summary

'materials used' field used to be displayed as empty every time the user tries to edit their activity.

Closes #1106

Changes

  1. The initial value of <ol><li></li></ol> is changed to [ ] so that the field uses the formik value

After

Creating activity for the first time:

  • Now, the field is not initialized with an ordered list and the user should manually start the list with '1.' or tap list icon in the toolbar
Screen.Recording.2024-02-16.at.9.22.15.AM.mov

Editing Activity:

Screen.Recording.2024-02-16.at.9.23.19.AM.mov

@brrkrmn brrkrmn changed the title initializes field with formik value initializes materials used field with formik value Feb 16, 2024
@NdibeRaymond
Copy link
Collaborator

NdibeRaymond commented Feb 26, 2024 •
edited
Loading

can you paste the before video of this so I can compare it with the after @brrkrmn ?
also needs rebase

@brrkrmn
Copy link
Collaborator Author

brrkrmn commented Feb 26, 2024

can you paste the before video of this so I can compare it with the after @brrkrmn ? also needs rebase

@NdibeRaymond the video of 'before' is in the issue here. Rebase is completed now 👍🏻

@github-actions GitHub Actions
Copy link

pre-commit checks failed ❌❌❌
make sure you have pre-commit set up locally (see the README.md for instructions).
If you have set up pre-commit locally, you may need to undo this commit and
run "pre-commit" locally to see what the errors are.

@NdibeRaymond
Copy link
Collaborator

it seems like you are doing a merge commit (git pull origin master) instead of a rebase @brrkrmn, that is likely the reason the pre-commit is complaining. you can squash the commits to 1, in that case you only need to worry about fixing pre-commit errors in your own changes

@NdibeRaymond
Copy link
Collaborator

it seems like you are doing a merge commit (git pull origin master) instead of a rebase @brrkrmn, that is likely the reason the pre-commit is complaining. you can squash the commits to 1, in that case you only need to worry about fixing pre-commit errors in your own changes

thinking maybe I should do this myself, last just squashing will likely not work

@NdibeRaymond
Copy link
Collaborator

@brrkrmn run git rebase -i master, then force push. This should fix the pre-commit errors we are getting for files you did not touch. After that you can focus on fixing the pre-commit errors for the files you did touch

@github-actions GitHub Actions
Copy link

pre-commit checks failed ❌❌❌
make sure you have pre-commit set up locally (see the README.md for instructions).
If you have set up pre-commit locally, you may need to undo this commit and
run "pre-commit" locally to see what the errors are.

@github-actions GitHub Actions
Copy link

All pre-commit checks passed ✅✅✅

brrkrmn and others added 5 commits July 17, 2024 03:25
@brrkrmn
(fix): Creator profile gets margin (#1008)
d1c377e 
* fix creator profile margin
* fix projects section margin
* fix wider project css issues
* fix eslint issues

Closes #1005
Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]>

Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
@brrkrmn
improve project recommendation (#1020)
523c993 
* create views and utils methods to recommend projects
* create api function to receive recommended projects in the frontend
* modify project filtering
* refactor recommend projects function

Issue: #1013

Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]>
Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
@brrkrmn
improve search for non-logged-in users (#1087)
b1b7c8b 
* style page and add login card
* fix misaligned login form in search results
* change styles for creator search
* implement no results found design
* make results one row
* made some major refactors

Issue: #802

Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]>
Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
@yokwejuste
[backend] add activity to admin management (#1093)
c3f4f34 
* minor modifications to the admin model
* add admin models management to admin.py
* implement effective signals to handle
  admin models instances, addition,
  modification and deletion with proper
  cleanup

Issue: #1094

Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]>
Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
@brrkrmn
initializes field with formik value
409e1e2
@NdibeRaymond
Copy link
Collaborator

@tuxology this has been rebased so we can focus on testing before merging to staging

@github-actions GitHub Actions
Copy link

All pre-commit checks passed ✅✅✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NdibeRaymond NdibeRaymond Awaiting requested review from NdibeRaymond NdibeRaymond is a code owner

@tuxology tuxology Awaiting requested review from tuxology tuxology is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

'Materials used' field is always empty in activity edit form
3 participants
@brrkrmn @NdibeRaymond @yokwejuste