refactor: Update Cadence IDLs to use latest active-active design changes

package.json

@@ -2,7 +2,7 @@
   "name": "cadence-web",
   "private": true,
   "config": {
-    "cadence_idl_version": "0e56e57909d9fa738eaa8d7a9561ea16acdf51e4"
+    "cadence_idl_version": "792058c9dbad5787cf8444c5d4bef0763a311b0c"
   },
   "scripts": {
     "dev": "next dev -p ${CADENCE_WEB_PORT:-8088} -H ${CADENCE_WEB_HOSTNAME:-0.0.0.0} | pino-pretty --messageKey message",

src/utils/data-formatters/schema/history-event-schema.ts

@@ -141,12 +141,20 @@ const cronOverlapPolicySchema = z.enum([
   CronOverlapPolicy.CRON_OVERLAP_POLICY_BUFFER_ONE,
 ]);
 
+const clusterAttributeSchema = z.object({
+  scope: z.string(),
+  name: z.string(),
+});
+
+// TODO @adhitya.mamallan - this needs to be removed as part of active-active's redesign
 const activeClusterSelectionStrategySchema = z.enum([
   ActiveClusterSelectionStrategy.ACTIVE_CLUSTER_SELECTION_STRATEGY_INVALID,
   ActiveClusterSelectionStrategy.ACTIVE_CLUSTER_SELECTION_STRATEGY_REGION_STICKY,
   ActiveClusterSelectionStrategy.ACTIVE_CLUSTER_SELECTION_STRATEGY_EXTERNAL_ENTITY,
 ]);
 
+// TODO @adhitya.mamallan - this needs to be modified as part of active-active's redesign,
+// so that we only check for clusterAttributes
 const activeClusterSelectionPolicySchema = z.discriminatedUnion(
   'strategyConfig',
   [
@@ -157,6 +165,7 @@ const activeClusterSelectionPolicySchema = z.discriminatedUnion(
         stickyRegion: z.string(),
       }),
       activeClusterExternalEntityConfig: z.nullable(z.undefined()),
+      clusterAttribute: clusterAttributeSchema.nullable(),
     }),
     z.object({
       strategy: activeClusterSelectionStrategySchema,
@@ -166,6 +175,7 @@ const activeClusterSelectionPolicySchema = z.discriminatedUnion(
         externalEntityType: z.string(),
         externalEntityKey: z.string(),
       }),
+      clusterAttribute: clusterAttributeSchema.nullable(),
     }),
   ]
 );

src/views/domain-page/domain-page-metadata-clusters/__tests__/domain-page-metadata-clusters.test.tsx

@@ -4,19 +4,9 @@ import {
   mockDomainDescription,
   mockDomainDescriptionSingleCluster,
 } from '../../__fixtures__/domain-description';
-import * as isActiveClusterModule from '../../helpers/is-active-cluster';
 import DomainPageMetadataClusters from '../domain-page-metadata-clusters';
 
-jest.mock('../../helpers/is-active-cluster', () => ({
-  __esModule: true,
-  default: jest.fn().mockReturnValue(false),
-}));
-
 describe(DomainPageMetadataClusters.name, () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
   it('renders plain text for single cluster', async () => {
     render(
       <DomainPageMetadataClusters {...mockDomainDescriptionSingleCluster} />
@@ -27,11 +17,6 @@ describe(DomainPageMetadataClusters.name, () => {
   });
 
   it('renders active/passive labels and links for multiple clusters', () => {
-    jest
-      .spyOn(isActiveClusterModule, 'default')
-      .mockReturnValueOnce(true) // cluster_1 is active
-      .mockReturnValueOnce(false); // cluster_2 is passive
-
     const { container } = render(
       <DomainPageMetadataClusters {...mockDomainDescription} />
     );

src/views/domain-page/domain-page-metadata-clusters/domain-page-metadata-clusters.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 import Link from '@/components/link/link';
 
 import { type DomainDescription } from '../domain-page.types';
-import isActiveCluster from '../helpers/is-active-cluster';
 
 import { styled } from './domain-page-metadata-clusters.styles';
 
@@ -18,12 +17,10 @@ export default function DomainPageMetadataClusters(
   return (
     <styled.ClusterTextContainer>
       {domainDescription.clusters.map((cluster, index) => {
-        const replicationStatusLabel = isActiveCluster(
-          domainDescription,
-          cluster.clusterName
-        )
-          ? 'active'
-          : 'passive';
+        const replicationStatusLabel =
+          cluster.clusterName === domainDescription.activeClusterName
+            ? 'active'
+            : 'passive';
 
         return (
           <React.Fragment key={cluster.clusterName}>

src/views/domain-page/domain-page-metadata-failover-version/__tests__/domain-page-metadata-failover-version.test.tsx

@@ -1,17 +1,10 @@
 import { render, screen } from '@/test-utils/rtl';
 
-import { type Props as SublistTableProps } from '@/components/list-table-nested/sublist-table/sublist-table.types';
 import { mockActiveActiveDomain } from '@/views/shared/active-active/__fixtures__/active-active-domain';
 
 import { mockDomainDescription } from '../../__fixtures__/domain-description';
 import DomainPageMetadataFailoverVersion from '../domain-page-metadata-failover-version';
 
-jest.mock('@/components/list-table-nested/sublist-table/sublist-table', () =>
-  jest.fn(({ items }: SublistTableProps) => (
-    <div data-testid="mock-sublist-table">{JSON.stringify(items)}</div>
-  ))
-);
-
 jest.mock('@/views/shared/active-active/helpers/is-active-active-domain');
 
 describe(DomainPageMetadataFailoverVersion.name, () => {
@@ -23,19 +16,12 @@ describe(DomainPageMetadataFailoverVersion.name, () => {
     render(<DomainPageMetadataFailoverVersion {...mockDomainDescription} />);
 
     expect(screen.getByText('123456')).toBeInTheDocument();
-    expect(screen.queryByTestId('mock-sublist-table')).not.toBeInTheDocument();
   });
 
-  it('renders SublistTable for active-active domains', () => {
+  // TODO @adhitya.mamallan: add special rendering for failover versions for different cluster attributes
+  it('temp: renders failover version as text for active-active domains', () => {
     render(<DomainPageMetadataFailoverVersion {...mockActiveActiveDomain} />);
 
-    const sublistTable = screen.getByTestId('mock-sublist-table');
-    expect(sublistTable).toBeInTheDocument();
-    expect(sublistTable).toHaveTextContent(
-      /{"key":"cluster0","label":"cluster0","value":"0"}/
-    );
-    expect(sublistTable).toHaveTextContent(
-      /{"key":"cluster1","label":"cluster1","value":"2"}/
-    );
+    expect(screen.getByText('2')).toBeInTheDocument();
   });
 });

src/views/domain-page/domain-page-metadata-failover-version/domain-page-metadata-failover-version.tsx

@@ -1,4 +1,3 @@
-import SublistTable from '@/components/list-table-nested/sublist-table/sublist-table';
 import isActiveActiveDomain from '@/views/shared/active-active/helpers/is-active-active-domain';
 
 import { type DomainDescription } from '../domain-page.types';
@@ -7,22 +6,8 @@ export default function DomainPageMetadataFailoverVersion(
   domainDescription: DomainDescription
 ) {
   if (isActiveActiveDomain(domainDescription)) {
-    return (
-      <SublistTable
-        items={Object.values(domainDescription.activeClusters.regionToCluster)
-          .sort(
-            (
-              { activeClusterName: clusterA },
-              { activeClusterName: clusterB }
-            ) => (clusterA > clusterB ? 1 : -1)
-          )
-          .map(({ activeClusterName, failoverVersion }) => ({
-            key: activeClusterName,
-            label: activeClusterName,
-            value: failoverVersion,
-          }))}
-      />
-    );
+    // TODO @adhitya.mamallan: add special rendering for failover versions for different cluster attributes
+    return domainDescription.failoverVersion;
   }
 
   return domainDescription.failoverVersion;

src/views/domains-page/domains-table-domain-name-cell/__tests__/domains-table-domain-name-cell.test.tsx

@@ -14,11 +14,8 @@ jest.mock('@/views/shared/domain-status-tag/domain-status-tag', () =>
 );
 
 jest.mock('@/views/shared/active-active/helpers/is-active-active-domain');
-jest.mock(
-  '@/views/shared/active-active/helpers/get-default-cluster-for-active-active-domain'
-);
 
-describe('DomainTableClusterCell', () => {
+describe(DomainsTableDomainNameCell.name, () => {
   it('should render link for domain if domain using the active cluster', async () => {
     render(<DomainsTableDomainNameCell {...globalDomain} />);
     const clusterLinks = await screen.findAllByRole('link');

src/views/domains-page/domains-table-domain-name-cell/domains-table-domain-name-cell.tsx

@@ -7,23 +7,19 @@ import cadenceIcon from '@/assets/cadence-logo.svg';
 import Link from '@/components/link/link';
 import useStyletronClasses from '@/hooks/use-styletron-classes';
 import type { DomainData } from '@/views/domains-page/domains-page.types';
-import getDefaultClusterForActiveActiveDomain from '@/views/shared/active-active/helpers/get-default-cluster-for-active-active-domain';
-import isActiveActiveDomain from '@/views/shared/active-active/helpers/is-active-active-domain';
 import DomainStatusTag from '@/views/shared/domain-status-tag/domain-status-tag';
 
 import { cssStyles } from './domains-table-domain-name-cell.styles';
 
 function DomainsTableDomainNameCell(props: DomainData) {
   const { cls } = useStyletronClasses(cssStyles);
 
-  const clusterName = isActiveActiveDomain(props)
-    ? getDefaultClusterForActiveActiveDomain(props)
-    : props.activeClusterName;
-
   return (
     <div className={cls.domainNameCell}>
       <Image width={16} height={16} alt="Cadence Icon" src={cadenceIcon} />
-      <Link href={`/domains/${props.name}/${clusterName}`}>{props.name}</Link>
+      <Link href={`/domains/${props.name}/${props.activeClusterName}`}>
+        {props.name}
+      </Link>
       {props.status !== 'DOMAIN_STATUS_REGISTERED' && (
         <DomainStatusTag status={props.status} />
       )}

src/views/domains-page/helpers/__tests__/get-unique-domains.test.ts

@@ -6,10 +6,6 @@ import getUniqueDomains from '../get-unique-domains';
 
 jest.mock('@/views/shared/active-active/helpers/is-active-active-domain');
 
-jest.mock(
-  '@/views/shared/active-active/helpers/get-default-cluster-for-active-active-domain'
-);
-
 describe('getUniqueDomains', () => {
   it('should return unique domains based on id-name-activeClusterName', () => {
     const domains: DomainData[] = [

src/views/domains-page/helpers/get-unique-domains.ts

@@ -1,18 +1,12 @@
-import getDefaultClusterForActiveActiveDomain from '@/views/shared/active-active/helpers/get-default-cluster-for-active-active-domain';
-import isActiveActiveDomain from '@/views/shared/active-active/helpers/is-active-active-domain';
-
 import { type DomainData } from '../domains-page.types';
 
 export default function getUniqueDomains(domains: DomainData[]) {
   const allUniqueDomains: Record<string, boolean> = {};
   return domains.filter((d: DomainData) => {
-    const defaultCluster = isActiveActiveDomain(d)
-      ? getDefaultClusterForActiveActiveDomain(d)
-      : d.activeClusterName;
-
-    if (allUniqueDomains[`${d.id}-${d.name}-${defaultCluster}`]) return false;
+    if (allUniqueDomains[`${d.id}-${d.name}-${d.activeClusterName}`])
+      return false;
 
-    allUniqueDomains[`${d.id}-${d.name}-${defaultCluster}`] = true;
+    allUniqueDomains[`${d.id}-${d.name}-${d.activeClusterName}`] = true;
     return true;
   });
 }

src/views/redirect-domain/__tests__/redirect-domain.node.ts

@@ -6,10 +6,6 @@ import RedirectDomain from '../redirect-domain';
 
 jest.mock('@/views/shared/active-active/helpers/is-active-active-domain');
 
-jest.mock(
-  '@/views/shared/active-active/helpers/get-default-cluster-for-active-active-domain'
-);
-
 const MOCK_ALL_DOMAINS: Array<DomainData> = [
   getDomainObj({
     name: 'mock-domain-unique',
@@ -78,7 +74,7 @@ describe(RedirectDomain.name, () => {
       expectedRedirect: '/domains/mock-domain-unique/mock-cluster-1',
     },
     {
-      name: 'should redirect to domain page of default UI cluster for an active-active domain',
+      name: 'should redirect to domain page of active cluster for an active-active domain',
       urlParams: ['mock-domain-active-active'],
       expectedRedirect: '/domains/mock-domain-active-active/cluster0',
     },

src/views/redirect-domain/redirect-domain.tsx

@@ -1,9 +1,6 @@
 import { notFound, redirect } from 'next/navigation';
 import queryString from 'query-string';
 
-import getDefaultClusterForActiveActiveDomain from '@/views/shared/active-active/helpers/get-default-cluster-for-active-active-domain';
-import isActiveActiveDomain from '@/views/shared/active-active/helpers/is-active-active-domain';
-
 import { getCachedAllDomains } from '../domains-page/helpers/get-all-domains';
 
 import { type Props } from './redirect-domain.types';
@@ -36,11 +33,8 @@ export default async function RedirectDomain(props: Props) {
       })
     );
   }
-  const clusterToRedirectTo = isActiveActiveDomain(domainDetails)
-    ? getDefaultClusterForActiveActiveDomain(domainDetails)
-    : domainDetails.activeClusterName;
 
-  const baseUrl = `/domains/${encodeURIComponent(domain)}/${encodeURIComponent(clusterToRedirectTo)}`;
+  const baseUrl = `/domains/${encodeURIComponent(domain)}/${encodeURIComponent(domainDetails.activeClusterName)}`;
 
   redirect(
     queryString.stringifyUrl({