Address CodeRabbit review: avoid unnecessary full-list walks, evict rejected cache entries, preserve retry state on load failure, drop redundant per-row subscription fetch

Author: PasanT9

portals/devportal/src/main/webapp/source/src/app/components/Applications/Details/SubscriptionTableData.jsx

@@ -37,7 +37,6 @@ import { FormattedMessage } from 'react-intl';
 import { ScopeValidation, resourceMethods, resourcePaths } from 'AppComponents/Shared/ScopeValidation';
 import PropTypes from 'prop-types';
 import CONSTANTS from 'AppData/Constants';
-import Subscription from 'AppData/Subscription';
 import { getBasePath } from 'AppUtils/utils';
 import { mdiOpenInNew } from '@mdi/js';
 import { Icon as MDIcon } from '@mdi/react';
@@ -103,7 +102,7 @@ class SubscriptionTableData extends React.Component {
         this.mounted = true;
         this.checkIfWebhookAPI();
         this.populateAPIData(subscription.apiId);
-        this.checkIfDynamicUsagePolicy(subscription.subscriptionId);
+        this.checkIfDynamicUsagePolicy(subscription.throttlingPolicy);
     }
 
     componentWillUnmount() {
@@ -208,26 +207,19 @@ class SubscriptionTableData extends React.Component {
 
     /**
      * Check if the policy is dynamic usage type
-     * @param {string} subscriptionUUID subscription UUID
+     * @param {string} throttlingPolicy throttling policy name, already available on the subscription
      */
-    checkIfDynamicUsagePolicy(subscriptionUUID) {
-        const client = new Subscription();
-        const promisedSubscription = client.getSubscription(subscriptionUUID);
-        promisedSubscription.then((response) => {
-            if (this.mounted && response && response.body) {
-                const subscriptionData = JSON.parse(response.data);
-                if (subscriptionData.throttlingPolicy) {
-                    const { getSubscriptionPolicyByName } = this.props;
-                    const promisedPolicy = getSubscriptionPolicyByName(subscriptionData.throttlingPolicy);
-                    promisedPolicy.then((policyData) => {
-                        if (this.mounted
-                            && policyData
-                            && policyData.monetizationAttributes
-                            && policyData.monetizationAttributes.billingType === 'DYNAMICRATE') {
-                            this.setState({ isDynamicUsagePolicy: true });
-                        }
-                    });
-                }
+    checkIfDynamicUsagePolicy(throttlingPolicy) {
+        if (!throttlingPolicy) {
+            return;
+        }
+        const { getSubscriptionPolicyByName } = this.props;
+        getSubscriptionPolicyByName(throttlingPolicy).then((policyData) => {
+            if (this.mounted
+                && policyData
+                && policyData.monetizationAttributes
+                && policyData.monetizationAttributes.billingType === 'DYNAMICRATE') {
+                this.setState({ isDynamicUsagePolicy: true });
             }
         });
     }

portals/devportal/src/main/webapp/source/src/app/components/Applications/Details/Subscriptions.jsx

@@ -314,8 +314,11 @@ class SubscriptionsBase extends React.Component {
      */
     componentDidMount() {
         this.mounted = true;
-        this.ensureLoaded(SUBSCRIPTIONS_PER_PAGE, SUBSCRIPTIONS_PER_PAGE)
-            .then(() => this.refreshDerivedState());
+        const { apisAccessible, mcpServersAccessible } = this.props;
+        this.ensureLoaded(
+            apisAccessible ? SUBSCRIPTIONS_PER_PAGE : 0,
+            mcpServersAccessible ? SUBSCRIPTIONS_PER_PAGE : 0,
+        ).then(() => this.refreshDerivedState());
     }
 
     componentWillUnmount() {
@@ -364,15 +367,23 @@ class SubscriptionsBase extends React.Component {
     getAPIById(apiUUID) {
         if (!this.apiDetailsById[apiUUID]) {
             const apiClient = new Api();
-            this.apiDetailsById[apiUUID] = apiClient.getAPIById(apiUUID).then(parseResponseData);
+            this.apiDetailsById[apiUUID] = apiClient.getAPIById(apiUUID).then(parseResponseData)
+                .catch((error) => {
+                    delete this.apiDetailsById[apiUUID];
+                    throw error;
+                });
         }
         return this.apiDetailsById[apiUUID];
     }
 
     getMCPServerById(apiUUID) {
         if (!this.mcpDetailsById[apiUUID]) {
             const mcpClient = new MCPServer();
-            this.mcpDetailsById[apiUUID] = mcpClient.getMCPServerById(apiUUID).then(parseResponseData);
+            this.mcpDetailsById[apiUUID] = mcpClient.getMCPServerById(apiUUID).then(parseResponseData)
+                .catch((error) => {
+                    delete this.mcpDetailsById[apiUUID];
+                    throw error;
+                });
         }
         return this.mcpDetailsById[apiUUID];
     }
@@ -382,7 +393,11 @@ class SubscriptionsBase extends React.Component {
             const apiClient = new Api();
             this.subscriptionPoliciesByName[policyName] = apiClient
                 .getTierByName(policyName, 'subscription')
-                .then(parseResponseData);
+                .then(parseResponseData)
+                .catch((error) => {
+                    delete this.subscriptionPoliciesByName[policyName];
+                    throw error;
+                });
         }
         return this.subscriptionPoliciesByName[policyName];
     }
@@ -445,13 +460,27 @@ class SubscriptionsBase extends React.Component {
                     if (!this.mounted || requestId !== this.subscriptionsRequestId) {
                         return;
                     }
-                    this.fullyLoaded = true;
                     const { status } = error;
                     if (status === 404) {
+                        // The application itself wasn't found — a genuinely terminal state.
+                        this.fullyLoaded = true;
                         this.setState({ subscriptionsNotFound: true, subscriptionsLoaded: true });
-                    } else if (status === 401) {
+                        return;
+                    }
+                    if (status === 401) {
+                        this.fullyLoaded = true;
                         this.setState({ isAuthorize: false });
+                        return;
                     }
+                    // Transient failure (5xx/network) — do not mark the walk complete, so a later
+                    // ensureLoaded call (e.g. the user retrying pagination) resumes from this same
+                    // backendOffset instead of being permanently short-circuited.
+                    this.loadChain = null;
+                    this.setState({ subscriptionsLoaded: true });
+                    Alert.error(this.props.intl.formatMessage({
+                        id: 'Applications.Details.Subscriptions.error.loading.subscriptions',
+                        defaultMessage: 'Error occurred while loading subscriptions',
+                    }));
                 });
         };
 
@@ -557,8 +586,9 @@ class SubscriptionsBase extends React.Component {
         this.subscriptionsRequestId += 1;
         this.resetAccumulation();
         const { apiPage, mcpPage } = this.state;
-        const requiredApi = (apiPage + 1) * SUBSCRIPTIONS_PER_PAGE;
-        const requiredMcp = (mcpPage + 1) * SUBSCRIPTIONS_PER_PAGE;
+        const { apisAccessible, mcpServersAccessible } = this.props;
+        const requiredApi = apisAccessible ? (apiPage + 1) * SUBSCRIPTIONS_PER_PAGE : 0;
+        const requiredMcp = mcpServersAccessible ? (mcpPage + 1) * SUBSCRIPTIONS_PER_PAGE : 0;
         this.ensureLoaded(requiredApi, requiredMcp).then(() => this.refreshDerivedState());
     }