feat/gitops/image-registry: Added revamped UI screens for Gitops and image registry #4135

Saranya-jena · 2023-08-17T17:27:27Z

Proposed changes

Summarize your changes here to communicate with the maintainers and make sure to put the link of that issue

updated the APIs with new schema
updated the UI screens

Types of changes

What types of changes does your code introduce to Litmus? Put an x in the boxes that apply

New feature (non-breaking change which adds functionality)
Bugfix (non-breaking change which fixes an issue)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Documentation Update (if none of the other choices applies)

Checklist

Put an x in 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.

I have read the CONTRIBUTING doc
I have signed the commit for DCO to be passed.
Lint and unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works (if appropriate)
I have added necessary documentation (if appropriate)

Dependency

Please add the links to the dependent PR need to be merged before this (if any).

Special notes for your reviewer:

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

hrishavjha · 2023-08-22T05:35:27Z

chaoscenter/web/src/controllers/Gitops/Gitops.tsx

+  });
+  const [enableGitopsMutation, { loading: enableGitopsMutationLoading }] = enableGitOps({
+    onCompleted: () => {
+      showSuccess('Gitops enabled successfully');


hrishavjha · 2023-08-22T05:36:55Z

chaoscenter/web/src/controllers/ImageRegistry/ImageRegistry.tsx

+
+  const [addImageRegistryMutation, { loading: addImageRegistryMutationLoading }] = addImageRegistry({
+    onCompleted: () => {
+      showSuccess('Image Registry added successfully');


hrishavjha · 2023-08-22T05:38:34Z

chaoscenter/web/src/controllers/ImageRegistry/ImageRegistry.tsx

+    onError: err => showError(err.message)
+  });
+  return (
+    <Loader loading={getImageRegistryLoading}>


we're following practice of controllers calling just views, you can put this loader inside the view.

hrishavjha · 2023-08-22T05:40:32Z

chaoscenter/web/src/views/Gitops/Gitops.tsx

+                      label: (
+                        <Layout.Vertical style={{ gap: '1rem' }}>
+                          <Text font={{ variation: FontVariation.BODY2_SEMI, weight: 'semi-bold' }} color={Color.BLACK}>
+                            Locally in Litmus


strings, check the entire file

hrishavjha · 2023-08-22T05:43:42Z

chaoscenter/web/src/views/Gitops/Gitops.tsx

+                                      rightElement={
+                                        (
+                                          <Container
+                                            flex={{ justifyContent: 'center', alignItems: 'center' }}
+                                            height="100%"
+                                          >
+                                            <CopyButton stringToCopy={sshPublicKey} />
+                                          </Container>
+                                        ) as any
+                                      }


is this working? since rightElement takes iconName only 😕

yes it's working :)

hrishavjha · 2023-08-22T05:45:51Z

chaoscenter/web/src/views/ImageRegistry/ImageRegistry.tsx

+        height="100%"
+        style={{ overflowY: 'auto' }}
+      >
+        {/* <Loader


commented code.

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

SahilKr24 · 2023-08-23T12:23:57Z

chaoscenter/web/src/controllers/ImageRegistry/ImageRegistry.tsx

+
+  const [updateImageRegistryMutation, { loading: updateImageRegistryMutationLoading }] = updateImageRegistry({
+    onCompleted: () => {
+      showSuccess('Image Registry updated successfully');


SahilKr24 · 2023-08-23T12:24:16Z

chaoscenter/web/src/routes/RouteDefinitions.ts

@@ -57,6 +59,9 @@ export const paths: UseRouteDefinitionsProps = {
  toKubernetesChaosInfrastructures: ({ environmentID }) => `/environments/${environmentID}/kubernetes`,
  toKubernetesChaosInfrastructureDetails: ({ chaosInfrastructureID, environmentID }) =>
    `/environments/${environmentID}/kubernetes/${chaosInfrastructureID}`,
+  // chaos image registry routes
+  toImageRegistry: () => `/image-registry/`,


remove trailing /

SahilKr24 · 2023-08-23T12:24:33Z

chaoscenter/web/src/strings/strings.en.yaml

@@ -14,6 +14,8 @@ aboutChaosCTL: >-
  infrastructure:
 acceptInvitation: Accept Invitation
 accessToAllNamespaces: Access to all namespaces
+accessToken: Access Token
+accessTokenPlaceholder: Enter your Personal Acess Token


Suggested change

accessTokenPlaceholder: Enter your Personal Acess Token

accessTokenPlaceholder: Enter your Personal Access Token

SahilKr24 · 2023-08-23T12:24:47Z

chaoscenter/web/src/strings/strings.en.yaml

 customLabel: Custom
+customRepo: Custom Repo
+customValueText: All YAML files use the custom values.


Suggested change

customValueText: All YAML files use the custom values.

customValueText: All YAML files will use the custom values.

SahilKr24 · 2023-08-23T12:25:19Z

chaoscenter/web/src/strings/strings.en.yaml

 daily: Daily
 dailyMessage: Your chaos experiment will run daily at your chosen time.
 dateExecuted: Date Executed
 dayOfMonthLabel: Day of month
 dayOfWeekLabel: Day of week
 declineInvitation: Decline Invitation
 declineInvitationDescription: Are you sure you want to decline the invitation?
+defaultValueOption: Use Default Values
+defaultValueText: >-
+  All YAML files use these default values provided by Litmus. The values cannot


Suggested change

All YAML files use these default values provided by Litmus. The values cannot

All YAML files use these default values provided by Litmus. These values cannot

SahilKr24 · 2023-08-23T12:27:32Z

chaoscenter/web/src/views/Gitops/Gitops.tsx

+        enableGitops({
+          variables: {
+            projectID: projectID,
+            configurations: {
+              branch: values.branch ?? '',
+              repoURL: values.repoURL ?? '',
+              authType: values.authType,
+              token: values.token ?? '',
+              sshPrivateKey: values.sshPrivateKey ?? '',
+              userName: values.userName ?? '',
+              password: values.password ?? ''
+            }


call mutation only when values are present/defined

SahilKr24 · 2023-08-23T12:30:36Z

chaoscenter/web/src/views/Gitops/Gitops.tsx

+                                            >
+                                              <CopyButton stringToCopy={sshPublicKey} />
+                                            </Container>
+                                          ) as any


why as any?

SahilKr24 · 2023-08-23T12:31:44Z

chaoscenter/web/src/views/ImageRegistry/ImageRegistry.tsx

+import Loader from '@components/Loader';
+import css from './ImageRegistry.module.scss';
+
+enum ImageRegistryValues {


shift to models

SahilKr24 · 2023-08-23T12:32:25Z

chaoscenter/web/src/views/ImageRegistry/ImageRegistry.tsx

+    imageRegistryName: !getImageRegistryData?.imageRegistryInfo.isDefault
+      ? getImageRegistryData?.imageRegistryInfo.imageRegistryName
+      : '',


Suggested change

imageRegistryName: !getImageRegistryData?.imageRegistryInfo.isDefault

? getImageRegistryData?.imageRegistryInfo.imageRegistryName

: '',

imageRegistryName: defaultTo(getImageRegistryData.imageRegistryInfo.isDefault, ''),

replace all ternary with this

SahilKr24 · 2023-08-23T12:33:00Z

chaoscenter/web/src/views/ImageRegistry/ImageRegistry.tsx

+      imageRegistryName: values.imageRegistryName
+        ? imageRegValueType === ImageRegistryValues.DEFAULT
+          ? 'docker.io'
+          : values.imageRegistryName
+        : '',
+      imageRepoName: values.imageRegistryRepo
+        ? imageRegValueType === ImageRegistryValues.DEFAULT
+          ? 'litmuschaos'
+          : values.imageRegistryRepo
+        : '',
+      imageRegistryType: values.registryType
+        ? imageRegValueType === ImageRegistryValues.DEFAULT
+          ? ImageRegistryType.PRIVATE
+          : values.registryType
+        : ImageRegistryType.PUBLIC,
+      secretName: values.secretName ? (imageRegValueType === ImageRegistryValues.DEFAULT ? '' : values.secretName) : '',
+      secretNamespace: values.imageRegistryName
+        ? imageRegValueType === ImageRegistryValues.DEFAULT
+          ? ''
+          : values.imageRegistryName
+        : '',
+      enableRegistry: imageRegValueType === ImageRegistryValues.DEFAULT ? false : true,
+      isDefault: imageRegValueType === ImageRegistryValues.DEFAULT ? true : false
+    };


use defaultTo

chaoscenter/graphql/server/pkg/database/mongodb/init.go

chaoscenter/graphql/server/pkg/image_registry/service.go

chaoscenter/graphql/server/pkg/projects/project_handler.go

chaoscenter/graphql/server/pkg/database/mongodb/init.go

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

….0.0/image-registry Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Saranya-jena added 8 commits July 24, 2023 12:40

Added image registry screens

5438901

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Update getImageRegistry API to fetch on projectID

2df6458

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added gitops screens

44502f8

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

updated branch

a5a65a0

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added API integration for image-registry

c469091

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added api integration for image registry

8187f76

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added api integration for gitops

a92e881

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

updated gitops to schema to follow convention

47ca60e

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Saranya-jena requested review from hrishavjha, arkajyotiMukherjee, amityt and SahilKr24 August 17, 2023 17:27

Saranya-jena self-assigned this Aug 17, 2023

Saranya-jena requested a review from gdsoumya August 21, 2023 14:21

hrishavjha approved these changes Aug 22, 2023

View reviewed changes

Saranya-jena added 3 commits August 22, 2023 12:07

updated branch

b5a2ca4

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added strings for image registry n gitops

9195a18

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

resolved review comments

17f5071

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

SahilKr24 requested changes Aug 23, 2023

View reviewed changes

SarthakJain26 requested changes Aug 24, 2023

View reviewed changes

chaoscenter/graphql/server/pkg/database/mongodb/init.go Outdated Show resolved Hide resolved

Saranya-jena added 3 commits August 24, 2023 18:49

Resolved review comments

7eef996

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Merge branch 'master' of https://github.com/litmuschaos/litmus into 3…

1f84619

….0.0/image-registry Signed-off-by: Saranya-jena <saranya.jena@harness.io>

resolved comments

02a14b1

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

SahilKr24 approved these changes Sep 5, 2023

View reviewed changes

fixed imports

b693e83

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

SarthakJain26 approved these changes Sep 5, 2023

View reviewed changes

Saranya-jena merged commit 2d18956 into litmuschaos:master Sep 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat/gitops/image-registry: Added revamped UI screens for Gitops and image registry #4135

feat/gitops/image-registry: Added revamped UI screens for Gitops and image registry #4135

Saranya-jena commented Aug 17, 2023 •

edited

Loading

hrishavjha Aug 22, 2023

hrishavjha Aug 22, 2023

hrishavjha Aug 22, 2023

hrishavjha Aug 22, 2023

hrishavjha Aug 22, 2023

Saranya-jena Aug 22, 2023

hrishavjha Aug 22, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

SahilKr24 Aug 23, 2023

	accessTokenPlaceholder: Enter your Personal Acess Token
	accessTokenPlaceholder: Enter your Personal Access Token

	customValueText: All YAML files use the custom values.
	customValueText: All YAML files will use the custom values.

	All YAML files use these default values provided by Litmus. The values cannot
	All YAML files use these default values provided by Litmus. These values cannot

feat/gitops/image-registry: Added revamped UI screens for Gitops and image registry #4135

feat/gitops/image-registry: Added revamped UI screens for Gitops and image registry #4135

Conversation

Saranya-jena commented Aug 17, 2023 • edited Loading

Proposed changes

Types of changes

Checklist

Dependency

Special notes for your reviewer:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Saranya-jena commented Aug 17, 2023 •

edited

Loading