addressing review comments

Author: charithaT07

packages/b2c-cli/src/commands/scapi/replications/list.ts

@@ -41,6 +41,8 @@ const COLUMNS: Record<string, ColumnDef<PublishProcessResponse>> = {
 
 const DEFAULT_COLUMNS = ['id', 'status', 'entityType', 'entityId', 'startTime'];
 
+const tableRenderer = new TableRenderer(COLUMNS);
+
 export default class ReplicationsList extends GranularReplicationsCommand<typeof ReplicationsList> {
   static description = withDocs(
     t('commands.replications.list.description', 'List granular replication processes'),
@@ -99,7 +101,6 @@ export default class ReplicationsList extends GranularReplicationsCommand<typeof
 
     const processes = result.data.data || [];
     const columns = this.getSelectedColumns();
-    const tableRenderer = new TableRenderer(COLUMNS);
     ux.stdout('\n');
     tableRenderer.render(processes, columns);
 
@@ -116,8 +117,13 @@ export default class ReplicationsList extends GranularReplicationsCommand<typeof
     const extended = this.flags.extended;
 
     if (columnsFlag) {
-      // User specified explicit columns
-      return columnsFlag.split(',').map((c) => c.trim());
+      const requested = columnsFlag.split(',').map((c) => c.trim());
+      const valid = tableRenderer.validateColumnKeys(requested);
+      if (valid.length === 0) {
+        this.warn(`No valid columns specified. Available: ${tableRenderer.getColumnKeys().join(', ')}`);
+        return DEFAULT_COLUMNS;
+      }
+      return valid;
     }
 
     if (extended) {

packages/b2c-cli/src/utils/ecdn/base-command.ts

@@ -5,7 +5,7 @@
  */
 import {Command} from '@oclif/core';
 import {OAuthCommand} from '@salesforce/b2c-tooling-sdk/cli';
-import {createCdnZonesClient, toOrganizationId, type CdnZonesClient} from '@salesforce/b2c-tooling-sdk/clients';
+import {createCdnZonesClient, type CdnZonesClient} from '@salesforce/b2c-tooling-sdk/clients';
 import {t} from '../../i18n/index.js';
 
 /**
@@ -82,21 +82,4 @@ export abstract class EcdnCommand<T extends typeof Command> extends OAuthCommand
     }
     return this._cdnZonesRwClient;
   }
-
-  /**
-   * Get the organization ID from resolved config.
-   * @throws Error if tenant ID is not provided through any source
-   */
-  protected getOrganizationId(): string {
-    const {tenantId} = this.resolvedConfig.values;
-    if (!tenantId) {
-      this.error(
-        t(
-          'error.tenantIdRequired',
-          'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
-        ),
-      );
-    }
-    return toOrganizationId(tenantId);
-  }
 }

packages/b2c-cli/src/utils/scapi/replications.ts

@@ -5,11 +5,7 @@
  */
 import {Command} from '@oclif/core';
 import {OAuthCommand} from '@salesforce/b2c-tooling-sdk/cli';
-import {
-  createGranularReplicationsClient,
-  type GranularReplicationsClient,
-  toOrganizationId,
-} from '@salesforce/b2c-tooling-sdk';
+import {createGranularReplicationsClient, type GranularReplicationsClient} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 /**
@@ -24,17 +20,22 @@ export abstract class GranularReplicationsCommand<T extends typeof Command> exte
    * Gets or creates a Granular Replications API client.
    *
    * Requires:
-   * - shortCode configuration (via b2c config:set --short-code <code>)
+   * - short code (--short-code, SFCC_SHORTCODE, or dw.json)
    * - OAuth credentials
-   * - tenantId (from --tenant-id flag or config)
+   * - tenant ID (--tenant-id, SFCC_TENANT_ID, or dw.json)
    */
   protected get granularReplicationsClient(): GranularReplicationsClient {
     if (!this._granularReplicationsClient) {
       const shortCode = this.resolvedConfig.values.shortCode;
-      const tenantId = this.getTenantId();
+      const tenantId = this.requireTenantId();
 
       if (!shortCode) {
-        this.error('shortCode configuration is required. Run: b2c config:set --short-code <code>');
+        this.error(
+          t(
+            'error.shortCodeRequired',
+            'SCAPI short code required. Provide --short-code, set SFCC_SHORTCODE, or configure short-code in dw.json.',
+          ),
+        );
       }
 
       this._granularReplicationsClient = createGranularReplicationsClient(
@@ -44,28 +45,4 @@ export abstract class GranularReplicationsCommand<T extends typeof Command> exte
     }
     return this._granularReplicationsClient;
   }
-
-  /**
-   * Get the organization ID (with f_ecom_ prefix) for API path parameters.
-   */
-  protected getOrganizationId(): string {
-    return toOrganizationId(this.getTenantId());
-  }
-
-  /**
-   * Get the tenant ID from resolved config.
-   * @throws Error if tenant ID is not provided through any source
-   */
-  protected getTenantId(): string {
-    const {tenantId} = this.resolvedConfig.values;
-    if (!tenantId) {
-      this.error(
-        t(
-          'error.tenantIdRequired',
-          'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
-        ),
-      );
-    }
-    return tenantId;
-  }
 }

packages/b2c-cli/src/utils/scapi/schemas.ts

@@ -8,7 +8,6 @@ import {OAuthCommand} from '@salesforce/b2c-tooling-sdk/cli';
 import {
   createScapiSchemasClient,
   getApiErrorMessage,
-  toOrganizationId,
   type ScapiSchemasClient,
 } from '@salesforce/b2c-tooling-sdk/clients';
 import {t} from '../../i18n/index.js';
@@ -25,23 +24,6 @@ export function formatApiError(error: unknown, response: Response): string {
  * Provides common flags and helper methods for interacting with the SCAPI Schemas API.
  */
 export abstract class ScapiSchemasCommand<T extends typeof Command> extends OAuthCommand<T> {
-  /**
-   * Get the organization ID from resolved config.
-   * @throws Error if tenant ID is not provided through any source
-   */
-  protected getOrganizationId(): string {
-    const {tenantId} = this.resolvedConfig.values;
-    if (!tenantId) {
-      this.error(
-        t(
-          'error.tenantIdRequired',
-          'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
-        ),
-      );
-    }
-    return toOrganizationId(tenantId);
-  }
-
   /**
    * Get the SCAPI Schemas client, ensuring short code and tenant ID are configured.
    */

packages/b2c-cli/test/commands/scapi/replications/list.test.ts

@@ -150,4 +150,44 @@ describe('scapi replications list', () => {
       }
     });
   });
+
+  describe('getSelectedColumns', () => {
+    let config: Config;
+
+    beforeEach(async () => {
+      config = await Config.load();
+    });
+
+    afterEach(() => {
+      sinon.restore();
+    });
+
+    it('returns default columns when no flags provided', async () => {
+      const command: any = new ReplicationsList([], config);
+      stubParse(command, {}, {});
+      await command.init();
+
+      expect(command.getSelectedColumns()).to.deep.equal(['id', 'status', 'entityType', 'entityId', 'startTime']);
+    });
+
+    it('filters invalid column names and warns when none valid', async () => {
+      const command: any = new ReplicationsList([], config);
+      stubParse(command, {columns: 'nope,bad'}, {});
+      await command.init();
+
+      const warn = sinon.stub(command, 'warn').returns(void 0);
+      const columns = command.getSelectedColumns();
+
+      expect(columns).to.deep.equal(['id', 'status', 'entityType', 'entityId', 'startTime']);
+      expect(warn.calledOnce).to.equal(true);
+    });
+
+    it('returns only valid columns from --columns', async () => {
+      const command: any = new ReplicationsList([], config);
+      stubParse(command, {columns: 'id,status,bogus'}, {});
+      await command.init();
+
+      expect(command.getSelectedColumns()).to.deep.equal(['id', 'status']);
+    });
+  });
 });

packages/b2c-tooling-sdk/src/cli/oauth-command.ts

@@ -12,7 +12,7 @@ import {OAuthStrategy} from '../auth/oauth.js';
 import {ImplicitOAuthStrategy} from '../auth/oauth-implicit.js';
 import {t} from '../i18n/index.js';
 import {DEFAULT_ACCOUNT_MANAGER_HOST} from '../defaults.js';
-import {normalizeTenantId} from '../clients/custom-apis.js';
+import {normalizeTenantId, toOrganizationId} from '../clients/custom-apis.js';
 
 /**
  * Default OAuth authentication methods array used by getOAuthStrategy.
@@ -225,4 +225,11 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
     }
     return normalizeTenantId(tenantId);
   }
+
+  /**
+   * Organization ID (`f_ecom_*`) for API path parameters from the resolved tenant.
+   */
+  protected getOrganizationId(): string {
+    return toOrganizationId(this.requireTenantId());
+  }
 }

packages/b2c-tooling-sdk/test/cli/oauth-command.test.ts

@@ -37,6 +37,10 @@ class TestOAuthCommand extends OAuthCommand<typeof TestOAuthCommand> {
   public testRequireTenantId() {
     return this.requireTenantId();
   }
+
+  public testGetOrganizationId() {
+    return this.getOrganizationId();
+  }
 }
 
 // Test command with default client ID (simulates AmCommand/OdsCommand behavior)
@@ -166,6 +170,30 @@ describe('cli/oauth-command', () => {
     });
   });
 
+  describe('getOrganizationId', () => {
+    it('returns f_ecom-prefixed org ID from tenant', async () => {
+      stubParse(command, {'client-id': 'test-client', 'tenant-id': 'zzxy_prd'});
+      await command.init();
+
+      expect(command.testGetOrganizationId()).to.equal('f_ecom_zzxy_prd');
+    });
+
+    it('throws when tenant ID missing', async () => {
+      stubParse(command, {'client-id': 'test-client'});
+      await command.init();
+
+      const errorStub = sinon.stub(command, 'error').throws(new Error('Expected error'));
+
+      try {
+        command.testGetOrganizationId();
+      } catch {
+        // Expected
+      }
+
+      expect(errorStub.called).to.be.true;
+    });
+  });
+
   describe('getDefaultClientId', () => {
     it('returns undefined by default (no fallback)', async () => {
       stubParse(command);