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

Feat#38/change material-ui version to mui 5 #41

Merged
merged 10 commits into from
May 24, 2022

Conversation

MounikaReddy15
Copy link
Collaborator

@MounikaReddy15 MounikaReddy15 commented Mar 14, 2022

Purpose

change material-ui version to mui 5

Ticket number

#38

@MounikaReddy15 MounikaReddy15 added the enhancement New feature or request label Mar 14, 2022
@MounikaReddy15 MounikaReddy15 self-assigned this Mar 14, 2022
@MounikaReddy15 MounikaReddy15 linked an issue Mar 14, 2022 that may be closed by this pull request
Copy link
Contributor

@RadhikaPPatel RadhikaPPatel left a comment

Choose a reason for hiding this comment

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

Please fix the requested things/issues

import CssBaseline from '@material-ui/core/CssBaseline';
import { ThemeProvider } from '@material-ui/core/styles';
import CssBaseline from '@mui/material/CssBaseline';
import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles';
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we need StyledEngineProvider?

Copy link
Collaborator Author

@MounikaReddy15 MounikaReddy15 Mar 22, 2022

Choose a reason for hiding this comment

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

It gives custom styles precedence over MUI

src/utils/mediaQuery.js Outdated Show resolved Hide resolved
src/components/Alert/Alert.js Outdated Show resolved Hide resolved
label="Organization"
select
>
<MenuItem>
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is only None option hard coded here for Super Admin?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Because we don't have any api to fetch all org names

Copy link
Contributor

Choose a reason for hiding this comment

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

There should be an API that we already use in TP as well as Insights code. So it should be similar here as well.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I tried and it was throwing 404 confirmed with BE as well that there's no API in buildly.io to fetch all orgs

Copy link
Contributor

Choose a reason for hiding this comment

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

If we want a global admin filter we need to have a list of organizations. Without it, you cannot create a dropdown for global admin.

</IconButton>
</Link>
<IconButton aria-label="logout" color="inherit" onClick={handleLogoutClick}>
{isSuperAdmin && (
Copy link
Contributor

Choose a reason for hiding this comment

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

Check the placement as well. It is all disturbed.

image

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Radhika can you tell me screen resolution, for me all medium and large screens placement is proper

Copy link
Contributor

Choose a reason for hiding this comment

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

1320 x 1000

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

image

@@ -1,17 +1,22 @@
/* eslint-disable import/no-named-as-default-member */
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove these ignore and resolve the issues in the file.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Tried resolving some are still throwing errors after trying the solution mentioned in the documentation

src/pages/UserManagement/UserManagement.js Outdated Show resolved Hide resolved
@@ -1,19 +1,28 @@
/* eslint-disable import/no-named-as-default-member */
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove these ignores and fix the file issues.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Tried resolving some are still throwing errors after trying the solution mentioned in the documentation

@MounikaReddy15 MounikaReddy15 changed the title Feat#38/show org dropdown for global admin Feat#38/change material-ui version to mui 5 Mar 23, 2022
@RadhikaPPatel RadhikaPPatel self-requested a review May 24, 2022 08:10
Copy link
Contributor

@RadhikaPPatel RadhikaPPatel left a comment

Choose a reason for hiding this comment

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

Looks good

@RadhikaPPatel RadhikaPPatel merged commit 1808eb3 into master May 24, 2022
@patelradhika patelradhika deleted the feat#38/global_admin_filter branch September 25, 2023 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

code format & code clean-up change material-ui version from 4 to mui 5
2 participants