Add parser for subscription application #1114

TimothyAsirJeyasing · 2023-12-01T14:38:25Z

Create a generic dashboard object. (right now it is appset specific)
Create two parsers one for subscription, and one for ApplicationSet.
dashboard.tsx will call these two parsers and collect the dashboard objects.
Aggregate these dashboard object and pass it to the dashboard context

packages/mco/components/mco-dashboard/data-policy/dr-dashboard.tsx

packages/mco/components/modals/app-manage-policies/acm-action-callback.tsx

packages/mco/components/modals/app-manage-policies/parsers/applicationset-parser.tsx

packages/mco/components/modals/app-manage-policies/parsers/subscription-parser.tsx

TimothyAsirJeyasing · 2023-12-05T11:23:25Z

packages/mco/components/mco-dashboard/data-policy/application-parser/applicationset-parser.tsx

packages/mco/components/mco-dashboard/data-policy/application-parser/subscription-parser.tsx

packages/mco/components/mco-dashboard/data-policy/dr-dashboard.tsx

GowthamShanmugam · 2023-12-05T14:15:55Z

packages/mco/hooks/subscription.ts

+          applicationDeploymentInfo.push({
+            application,
+            subscriptionGroupInfo,
+            managedClusters: filerManagedClusterUsingDRClusters(


Every subscription will have a different managed cluster, so the managed cluster should be part of subscriptionGroupInfo.

TimothyAsirJeyasing · 2023-12-12T09:59:00Z

GowthamShanmugam · 2023-12-12T10:42:13Z

packages/mco/components/mco-dashboard/data-policy/cluster-app-card/argo-application-set.tsx

@@ -108,6 +107,6 @@ export const SnapshotSection: React.FC<CommonProps> = ({ selectedAppSet }) => {
 };

 type CommonProps = {
-  selectedAppSet: ProtectedAppSetsMap;
+  selectedApp: ProtectedAppMap;


Suggested change

selectedApp: ProtectedAppMap;

selectedApplication: ProtectedApplicationMap;

GowthamShanmugam · 2023-12-12T10:43:50Z

packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster-app-card.tsx

 };

 type AppWiseCardProps = {
  protectedPVCData: ProtectedPVCData[];
-  selectedAppSet: ProtectedAppSetsMap;
+  selectedApp: ProtectedAppMap;


Suggested change

selectedApp: ProtectedAppMap;

selectedApplication: ProtectedApplicationMap;

packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster-app-card.tsx

packages/mco/types/dashboard.ts

TimothyAsirJeyasing · 2023-12-12T10:53:12Z

Sure i will rename all app into application, There are few merge conflicts, i will fix on the next patch update

packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster-app-card.tsx

GowthamShanmugam · 2023-12-12T13:20:05Z

packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster.tsx

          const placementInfo: PlacementInfo =
-            protectedAppSetsMap?.placementInfo?.[0];
+            protectedAppMap?.placementInfo?.[0];


same here, You need to loop through each protectedAppMap?.placementInfo, Fetch syncInterval from each DRPC of the application to find the affected app count. If any one DRPC of application has replication issue then consider the application as affected.

packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx

GowthamShanmugam · 2023-12-12T13:27:37Z

packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx

@@ -61,7 +61,7 @@ export const StatusText: React.FC<StatusTextProps> = ({ children }) => {

 export const VolumeSummarySection: React.FC<VolumeSummarySectionProps> = ({
  protectedPVCData,
-  selectedAppSet,
+  selectedApp,


Suggested change

selectedApp,

selectedApplication,

GowthamShanmugam · 2023-12-12T13:27:48Z

packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx

@@ -153,7 +153,7 @@ const ClusterDropdown: React.FC<Partial<ClusterAppDropdownProps>> = ({
  clusterResources,
  clusterName,
  setCluster,
-  setAppSet,
+  setApp,


Suggested change

setApp,

setApplication,

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx

packages/mco/hooks/subscription.ts

packages/mco/utils/disaster-recovery.tsx

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx

packages/mco/types/dashboard.ts

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx

TimothyAsirJeyasing · 2023-12-14T07:24:38Z

packages/mco/components/mco-dashboard/data-policy/parsers/applicationset-parser.tsx

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx

packages/mco/components/mco-dashboard/data-policy/dr-dashboard.tsx

packages/mco/components/mco-dashboard/data-policy/parsers/applicationset-parser.tsx

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx

SanjalKatiyar · 2023-12-18T06:23:34Z

packages/mco/components/modals/app-manage-policies/parsers/subscription-parser.tsx

+      loaded: true,
+      loadError: '',


why are u always assuming it to be true without any error ??

We are not having the appResource load status, Its already loaded this time and i can make this optional param or Shall i pass !!appResource to the loaded, or Could you please give some light / suggestion ?
appResource received from the callback which invoked by useArgoApplicationSetResourceWatch which uses useK8sWatchResources and that does not return the loaded and loadError state.

For this similar thing it's used like this at line 74 at /home/timothyasir/Project/odf-console/packages/mco/components/modals/app-manage-policies/parsers/application-set-parser.tsx So i used the same way.

appResource received from the callback which invoked by useArgoApplicationSetResourceWatch which uses useK8sWatchResources and that does not return the loaded and loadError state. >> I don't think that's the reason why we don't have any loading/error state here...

useK8sWatchResources always returns loading/error state...

packages/mco/hooks/subscription.ts

packages/mco/utils/disaster-recovery.tsx

Signed-off-by: Timothy Asir Jeyasingh <[email protected]>

TimothyAsirJeyasing · 2023-12-18T12:46:36Z

SanjalKatiyar · 2023-12-18T13:45:55Z

/approve

SanjalKatiyar · 2023-12-18T16:56:14Z

/lgtm

openshift-ci · 2023-12-18T16:56:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: GowthamShanmugam, SanjalKatiyar, TimothyAsirJeyasing

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [SanjalKatiyar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

TimothyAsirJeyasing · 2023-12-19T08:25:38Z

/cherry-pick release-4.15

openshift-cherrypick-robot · 2023-12-19T08:26:17Z

@TimothyAsirJeyasing: #1114 failed to apply on top of branch "release-4.15":

Applying: Add parser for subscription application
Using index info to reconstruct a base tree...
M	locales/en/plugin__odf-console.json
M	packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster.tsx
M	packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx
M	packages/mco/components/mco-dashboard/data-policy/summary-card/summary-card.tsx
Falling back to patching base and 3-way merge...
Auto-merging packages/mco/components/mco-dashboard/data-policy/summary-card/summary-card.tsx
Auto-merging packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx
Auto-merging packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster.tsx
Auto-merging locales/en/plugin__odf-console.json
CONFLICT (content): Merge conflict in locales/en/plugin__odf-console.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add parser for subscription application
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

GowthamShanmugam · 2023-12-19T10:44:21Z

/cherry-pick release-4.15

openshift-cherrypick-robot · 2023-12-19T10:45:02Z

@GowthamShanmugam: new pull request created: #1135

In response to this:

/cherry-pick release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci bot added the do-not-merge/work-in-progress label Dec 1, 2023

TimothyAsirJeyasing changed the title ~~WIP: Add parser for subscription application~~ Add parser for subscription application Dec 4, 2023

openshift-ci bot removed the do-not-merge/work-in-progress label Dec 4, 2023

GowthamShanmugam reviewed Dec 4, 2023

View reviewed changes

TimothyAsirJeyasing force-pushed the parser-for-applications branch from 510f00f to a2a16cb Compare December 5, 2023 10:29

GowthamShanmugam reviewed Dec 5, 2023

View reviewed changes

TimothyAsirJeyasing force-pushed the parser-for-applications branch 2 times, most recently from af9d76c to c3fefff Compare December 12, 2023 09:57

GowthamShanmugam reviewed Dec 12, 2023

View reviewed changes

TimothyAsirJeyasing force-pushed the parser-for-applications branch from c3fefff to a893e44 Compare December 12, 2023 10:51

openshift-merge-robot added the needs-rebase label Dec 12, 2023

GowthamShanmugam reviewed Dec 12, 2023

View reviewed changes

GowthamShanmugam reviewed Dec 13, 2023

View reviewed changes

packages/mco/types/dashboard.ts Outdated Show resolved Hide resolved

GowthamShanmugam reviewed Dec 13, 2023

View reviewed changes

packages/mco/types/dashboard.ts Outdated Show resolved Hide resolved

GowthamShanmugam reviewed Dec 13, 2023

View reviewed changes

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx Outdated Show resolved Hide resolved

GowthamShanmugam reviewed Dec 13, 2023

View reviewed changes

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx Outdated Show resolved Hide resolved

GowthamShanmugam reviewed Dec 13, 2023

View reviewed changes

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx Outdated Show resolved Hide resolved

GowthamShanmugam reviewed Dec 13, 2023

View reviewed changes

packages/mco/components/mco-dashboard/data-policy/parsers/subscription-parser.tsx Outdated Show resolved Hide resolved

TimothyAsirJeyasing force-pushed the parser-for-applications branch from a893e44 to e00b837 Compare December 14, 2023 07:23

TimothyAsirJeyasing force-pushed the parser-for-applications branch from e00b837 to 7ac903b Compare December 14, 2023 08:39

openshift-merge-robot removed the needs-rebase label Dec 14, 2023

GowthamShanmugam reviewed Dec 14, 2023

View reviewed changes

packages/mco/components/mco-dashboard/data-policy/parsers/applicationset-parser.tsx Outdated Show resolved Hide resolved