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

Added loader component for Gitops page #4192

Merged
merged 3 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion chaoscenter/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## Installation steps for Litmus 3.0.0-beta9
# [LitmusChaos 3.0.0](https://docs.litmuschaos.io/)

## Installation steps for Litmus 3.0.0

### Mongo installation via Helm - Bitnami Mongo

Expand Down
31 changes: 20 additions & 11 deletions chaoscenter/web/src/controllers/Gitops/Gitops.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import GitopsView from '@views/Gitops/Gitops';
import { enableGitOps, getGitOpsDetails, updateGitOps } from '@api/core/gitops';
import { getScope } from '@utils';
import { disableGitOps } from '@api/core/gitops/disableGitops';
import Loader from '@components/Loader';

export default function GitopsController(): React.ReactElement {
const scope = getScope();
Expand Down Expand Up @@ -44,17 +45,25 @@ export default function GitopsController(): React.ReactElement {
onError: err => showError(err.message)
});
return (
<GitopsView
gitopsDetails={getGitOpsDetailsData?.getGitOpsDetails}
enableGitops={enableGitopsMutation}
disableGitops={disableGitopsMutation}
updateGitops={updateGitopsMutation}
loading={{
getGitOpsDetailsLoading: getGitOpsDetailsLoading,
disableGitopsMutationLoading: disableGitopsMutationLoading,
updateGitopsMutationLoading: updateGitopsMutationLoading,
enableGitopsMutationLoading: enableGitopsMutationLoading
<Loader
loading={getGitOpsDetailsLoading}
height="fit-content"
style={{
minHeight: getGitOpsDetailsLoading ? 'calc(var(--page-min-height) - var(--spacing-xxlarge))' : 'initial'
}}
/>
>
<GitopsView
gitopsDetails={getGitOpsDetailsData?.getGitOpsDetails}
enableGitops={enableGitopsMutation}
disableGitops={disableGitopsMutation}
updateGitops={updateGitopsMutation}
loading={{
getGitOpsDetailsLoading: getGitOpsDetailsLoading,
disableGitopsMutationLoading: disableGitopsMutationLoading,
updateGitopsMutationLoading: updateGitopsMutationLoading,
enableGitopsMutationLoading: enableGitopsMutationLoading
}}
/>
</Loader>
);
}
2 changes: 1 addition & 1 deletion chaoscenter/web/src/controllers/InviteNewMembers/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export function generateInviteUsersTableContent(userData: Array<User> | undefine
userData && userData.length > 0
? userData.map(user => {
return {
id: user.userID,
userID: user.userID,
username: user.username,
email: user.email ?? '',
name: user.name ?? ''
Expand Down
Binary file modified images/litmus-control-and-execution-plane-overview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion litmus-portal/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## **ChaosCenter**

[Deprecated with the release of Litmus 3.0.0. Visit [here](https://github.com/litmuschaos/litmus/tree/master/chaoscenter) for installation guide.]

ChaosCenter provides console and UI experience for managing, monitoring, and events around chaos workflows. Chaos workflows consist of a sequence of experiments run together to achieve the objective of introducing some kind of fault into an application or the Kubernetes platform.

## **Platforms Support**
Expand Down Expand Up @@ -70,7 +72,6 @@ kubectl apply -f https://raw.githubusercontent.com/litmuschaos/litmus/master/lit

- All environment variables.


#### Retrieving external url to access the litmus portal

##### GKE/Okteto Cloud/EKS
Expand All @@ -97,6 +98,7 @@ ChaosCenter provides console or UI experience for managing, monitoring, and even
View the User Guide <b>[here](https://docs.litmuschaos.io/)</b>

### **Local Development Guide for ChaosCenter**

Local Development Guide for ChaosCenter can be found <b>[here](https://github.com/litmuschaos/litmus/wiki/ChaosCenter-Development-Guide)</b>

### **Upgrade from 3.0.0-beta7 to 3.0.0-beta8**
Expand Down
Loading