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

Manage Button UI Fixed #1388

Merged
merged 7 commits into from
Jan 10, 2024
Merged

Conversation

duplixx
Copy link
Member

@duplixx duplixx commented Jan 6, 2024

What kind of change does this PR introduce?

Bugfix

Issue Number:

Fixes #1374

Did you add tests for your changes?

No

Snapshots/Videos:

Recording.2024-01-06.190918.mp4

If relevant, did you update the documentation?

Summary

Does this PR introduce a breaking change?

Other information

Have you read the contributing guide?

Copy link

github-actions bot commented Jan 6, 2024

Our Pull Request Approval Process

We have these basic policies to make the approval process smoother for our volunteer team.

Testing Your Code

Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:

  1. The overall code coverage drops below the target threshold of the repository
  2. Any file in the pull request has code coverage levels below the repository threshold
  3. Merge conflicts

The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

Reviewers

When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

  1. arbitrators of future discussions with other contributors about the validity of your changes
  2. point of contact for evaluating the validity of your work
  3. person who verifies matching issues by others that should be closed.
  4. person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

  1. PRs with issues not assigned to you will be closed by the reviewer
  2. Fix the first comment in the PR so that each issue listed automatically closes

Other

  1. 🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
  2. Read the CONTRIBUTING.md file make

Copy link

codecov bot commented Jan 6, 2024

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (655b6b3) 92.77% compared to head (175b578) 97.45%.
Report is 91 commits behind head on develop.

Files Patch % Lines
...rgProfileFieldSettings/OrgProfileFieldSettings.tsx 90.00% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1388      +/-   ##
===========================================
+ Coverage    92.77%   97.45%   +4.67%     
===========================================
  Files          134      138       +4     
  Lines         3238     3690     +452     
  Branches       904     1079     +175     
===========================================
+ Hits          3004     3596     +592     
+ Misses         225       89     -136     
+ Partials         9        5       -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@rishav-jha-mech rishav-jha-mech left a comment

Choose a reason for hiding this comment

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

@duplixx if i am not wrong, creating sample organization is just for Testing purposes, that is why it had a Flask icon, you should fix the Manage Button layout without removing the flask icon

@duplixx
Copy link
Member Author

duplixx commented Jan 6, 2024

@duplixx if i am not wrong, creating sample organization is just for Testing purposes, that is why it had a Flask icon, you should fix the Manage Button layout without removing the flask icon

yeah @rishav-jha-mech previous implementation using conditional rendering
<Button onClick={handleClick} data-testid="manageBtn" className={styles.manageBtn} > {data && data?.isSampleOrganization && ( <FlaskIcon fill="var(--bs-white)" width={20} title={t('sampleOrganization')} /> )} {' '} {t('manage')} </Button>

If you insist on fixing the styling by adding the Flask icon, I can proceed with this approach. Should I proceed this way?

@rishav-jha-mech
Copy link
Contributor

@duplixx yes you have to add that flask icon, or it will be difficult for the developers to differentiate b/w sample organizations and the ones created by them

@duplixx
Copy link
Member Author

duplixx commented Jan 6, 2024

@rishav-jha-mech Yeah, totally agreed! Thanks. I'll make the changes.

@duplixx
Copy link
Member Author

duplixx commented Jan 6, 2024

image
image

@rishav-jha-mech does this layout looks good??

@duplixx
Copy link
Member Author

duplixx commented Jan 6, 2024

Talawa.Organizations.-.Google.Chrome.2024-01-07.01-05-43.mp4

here is the final preview @rishav-jha-mech

@rishav-jha-mech
Copy link
Contributor

@duplixx the flask icon should be almost the same size of manage text, and on smaller screens the button should be of full width

@duplixx
Copy link
Member Author

duplixx commented Jan 7, 2024

image
@rishav-jha-mech have a look !!

@rishav-jha-mech
Copy link
Contributor

@duplixx push the changes for code review

@duplixx
Copy link
Member Author

duplixx commented Jan 7, 2024

@rishav-jha-mech added changes !!

@duplixx
Copy link
Member Author

duplixx commented Jan 10, 2024

issues resolved @rishav-jha-mech !!

@palisadoes palisadoes merged commit 59dae2c into PalisadoesFoundation:develop Jan 10, 2024
9 checks passed
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.

3 participants