Merge branch 'wso2:main' into main

wso2 · Dec 18, 2023 · f211be8 · f211be8
2 parents 5ec5c98 + 2e1f9c7
commit f211be8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt.ui</groupId>
     <artifactId>apim.ui.apps</artifactId>
     <packaging>pom</packaging>
-    <version>9.0.483-SNAPSHOT</version>
+    <version>9.0.484-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 

diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt.ui</groupId>
         <artifactId>apim.ui.apps</artifactId>
-        <version>9.0.483-SNAPSHOT</version>
+        <version>9.0.484-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt.ui</groupId>
         <artifactId>apim.ui.apps</artifactId>
-        <version>9.0.483-SNAPSHOT</version>
+        <version>9.0.484-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/portals/pom.xml b/portals/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt.ui</groupId>
         <artifactId>apim.ui.apps</artifactId>
-        <version>9.0.483-SNAPSHOT</version>
+        <version>9.0.484-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.0.483-SNAPSHOT</version>
+    <version>9.0.484-SNAPSHOT</version>
     <name>WSO2 API Manager UI Portals - Parent</name>
     <url>https://wso2.org</url>
 

diff --git a/portals/publisher/pom.xml b/portals/publisher/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt.ui</groupId>
         <artifactId>apim.ui.apps</artifactId>
-        <version>9.0.483-SNAPSHOT</version>
+        <version>9.0.484-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/portals/publisher/src/main/webapp/site/public/conf/settings.json b/portals/publisher/src/main/webapp/site/public/conf/settings.json
@@ -85,7 +85,8 @@
         }
       }
     },
-    "maxSubscriptionLimit": 2000
+    "maxSubscriptionLimit": 2000,
+    "maxScopeCount": 2000
   }
 }
 
diff --git a/.../publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/Resources.jsx b/.../publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/Resources.jsx
@@ -504,7 +504,8 @@ export default function Resources(props) {
 
     useEffect(() => {
         if (api.apitype !== 'APIProduct') {
-            API.getAllScopes()
+            const maxScopeLimit = Configurations.apis.maxScopeCount;
+            API.getAllScopes(0, maxScopeLimit)
                 .then((response) => {
                     if (response.body && response.body.list) {
                         const sharedScopesList = [];