feat: Added account setting screens #4119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…h account screen implementations Signed-off-by: Hrishav <hrishav.kumar@harness.io>
…g swagger file Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
hrishavjha
requested review from
imrajdas,
Saranya-jena,
arkajyotiMukherjee,
S-ayanide,
vanshBhatia-A4k9,
amityt,
Jonsy13,
SarthakJain26 and
SahilKr24
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
SahilKr24
requested changes
Aug 9, 2023
chaoscenter/web/src/views/ProjectInvitations/ProjectInvitations.tsx
Outdated
Show resolved
Hide resolved
chaoscenter/web/src/views/UpdateProjectName/UpdateProjectName.tsx
Outdated
Show resolved
Hide resolved
chaoscenter/web/src/views/UserCreatedProjects/UserCreatedProjects.tsx
Outdated
Show resolved
Hide resolved
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
Saranya-jena
approved these changes
Aug 9, 2023
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
SahilKr24
approved these changes
Aug 9, 2023
arkajyotiMukherjee
requested changes
Aug 10, 2023
| return apolloClient ? <ApolloProvider client={apolloClient}>{children}</ApolloProvider> : <></>; | ||
| return apolloClient ? ( | ||
| <QueryClientProvider client={reactQueryClient}> | ||
| <ApolloProvider client={apolloClient}>{children}</ApolloProvider> |
There was a problem hiding this comment.
apollo client check should wrap this
| services: { | ||
| auth: { | ||
| url: 'https://raw.githubusercontent.com/litmuschaos/litmus/master/mkdocs/docs/auth/v3.0.0/auth-api.json', | ||
| output: 'src/api/auth/index.ts', |
There was a problem hiding this comment.
Suggested change
| output: 'src/api/auth/index.ts', | |
| output: 'src/api/auth', |
Comment on lines
3
to
11
| export interface Member { | ||
| userID: string; | ||
| role: Role; | ||
| invitation: string; | ||
| joinedAt: string; | ||
| } | ||
|
|
||
| export interface Project { | ||
| id: string; |
There was a problem hiding this comment.
delete this file...these types should be auto generated
chaoscenter/web/src/app/App.tsx
Outdated
| @@ -51,7 +32,7 @@ export function AppWithoutAuthentication(): React.ReactElement { | |||
| const userDetails = getUserDetails(); | |||
| return ( | |||
| <StringsContext.Provider value={{ data: strings as StringsMap }}> | |||
| <LitmusAPIProvider config={APIEndpoints} token={userDetails.token}> | |||
| <LitmusAPIProvider config={APIEndpoints} token={userDetails.accessToken}> | |||
There was a problem hiding this comment.
move userDetails.token from getUserDetails to inside LitmusAPIProvider
| ); | ||
| }; | ||
|
|
||
| export default function MainNav(): React.ReactElement { | ||
| const accountScopedPaths = useRouteWithBaseUrl('account'); | ||
| const { getString } = useStrings(); | ||
| const userData = useContext(AppStoreContext); |
There was a problem hiding this comment.
use useAppStoreContext instead
amityt
approved these changes
Aug 10, 2023
Signed-off-by: Hrishav <hrishav.kumar@harness.io>
arkajyotiMukherjee
approved these changes
Aug 10, 2023
arkajyotiMukherjee
merged commit aa8e9a3
into
litmuschaos:master
12 of 14 checks passed
punithnayak
pushed a commit
to punithnayak/litmus
that referenced
this pull request
Aug 17, 2023
* feat: Done with new routing setup for account screens and started with account screen implementations Signed-off-by: Hrishav <hrishav.kumar@harness.io> * feat: Added support for React-Query and automatic API generation using swagger file Signed-off-by: Hrishav <hrishav.kumar@harness.io> * chore: Updated createAt swagger issue Signed-off-by: Hrishav <hrishav.kumar@harness.io> * chore: Updated invitation_state Signed-off-by: Hrishav <hrishav.kumar@harness.io> * chore: Updated invitation_state again Signed-off-by: Hrishav <hrishav.kumar@harness.io> * feat: Added swagger API generation and several account setting screens Signed-off-by: Hrishav <hrishav.kumar@harness.io> * feat: Added user interaction modals in settings overview Signed-off-by: Hrishav <hrishav.kumar@harness.io> * feat: Added new automatic API generations and account setting screens Signed-off-by: Hrishav <hrishav.kumar@harness.io> * chore: updated testUtils Signed-off-by: Hrishav <hrishav.kumar@harness.io> * chore: updated testUtils and fixed errors Signed-off-by: Hrishav <hrishav.kumar@harness.io> * chore: Fixed review comments Signed-off-by: Hrishav <hrishav.kumar@harness.io> * chore: updated user search function Signed-off-by: Hrishav <hrishav.kumar@harness.io> * chore: fixed request comments Signed-off-by: Hrishav <hrishav.kumar@harness.io> --------- Signed-off-by: Hrishav <hrishav.kumar@harness.io> Signed-off-by: punithnayak <punithnayak098@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
AxioswithReact-Queryfor Rest APIs.Screenshots for reference
Admin User
Non-Admin Users
Types of changes
What types of changes does your code introduce to Litmus? Put an
xin the boxes that applyChecklist
Put an
xin the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.Dependency
Special notes for your reviewer: