Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Publisher] Add a new page for API sharing #898

Merged
merged 7 commits into from
Feb 13, 2025
Merged

[Publisher] Add a new page for API sharing #898

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8882bfc
Add a new page for API sharing
SavinduDimal Feb 12, 2025
476b03b
Refactor code
SavinduDimal Feb 12, 2025
b0c56ca
Remove organization related UI from old pages
SavinduDimal Feb 12, 2025
a0f9c96
Refactor code
SavinduDimal Feb 13, 2025
269e8a2
Add key word "none" for organization sharing
SavinduDimal Feb 13, 2025
ed1bca0
Fix subscription policy fetching for async APIs
SavinduDimal Feb 13, 2025
8a3ccda
Add reviewed changes
SavinduDimal Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions ...main/webapp/source/src/app/components/Apis/Details/Configuration/DesignConfigurations.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ import StoreVisibility from './components/StoreVisibility';
import Tags from './components/Tags';
import Social from './components/Social';
import APICategories from './components/APICategories';
import SharedOrganizations from './components/SharedOrganizations';

const PREFIX = 'DesignConfigurations';

Expand Down Expand Up @@ -818,16 +817,6 @@ export default function DesignConfigurations() {
/>
)}
</Box>
{ api.apiType !== API.CONSTS.APIProduct
&& settings && settings.orgAccessControlEnabled && (
<Box py={1}>
<SharedOrganizations
api={apiConfig}
configDispatcher={configDispatcher}
organizations={api.visibleOrganizations}
/>
</Box>
)}
{ settings && !settings.portalConfigurationOnlyModeEnabled && (
<Box py={1}>
<DefaultVersion
Expand Down
189 changes: 0 additions & 189 deletions ...p/source/src/app/components/Apis/Details/Configuration/components/SharedOrganizations.jsx
View file
Open in desktop

This file was deleted.

33 changes: 25 additions & 8 deletions ...rganizationSubscriptionPoliciesManage.jsx → ...rganizationSubscriptionPoliciesManage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* under the License.
*/

import React, { useEffect, useState } from 'react';
import React, { useEffect, useState, useMemo } from 'react';
import { styled } from '@mui/material/styles';
import Checkbox from '@mui/material/Checkbox';
import Typography from '@mui/material/Typography';
Expand Down Expand Up @@ -79,14 +79,25 @@ const Root = styled('div')((
* @returns {JSX.Element} The rendered component
*/
function OrganizationSubscriptionPoliciesManage(props) {
const { api, organizations, visibleOrganizations, organizationPolicies, setOrganizationPolicies } = props;
const { api, organizations, visibleOrganizations,
organizationPolicies, setOrganizationPolicies, selectionMode } = props;
const [filteredOrganizations, setFilteredOrganizations] = useState([]);
const [subscriptionPolicies, setSubscriptionPolicies] = useState([]);

const isAsyncAPI = useMemo(() =>
['WS', 'WEBSUB', 'SSE', 'ASYNC'].includes(api.type), [api.type]
);

useEffect(() => {
const limit = Configurations.app.subscriptionPolicyLimit;
const isAiApi = api?.subtypeConfiguration?.subtype?.toLowerCase().includes('aiapi') ?? false;
const policyPromise = API.policies('subscription', limit || undefined, isAiApi);
let policyPromise;

if (isAsyncAPI) {
policyPromise = API.asyncAPIPolicies();
} else {
policyPromise = API.policies('subscription', limit || undefined, isAiApi);
}

policyPromise
.then((res) => {
Expand All @@ -96,12 +107,18 @@ function OrganizationSubscriptionPoliciesManage(props) {
console.error(error);
});

if (visibleOrganizations.includes('all')) {
setFilteredOrganizations(organizations);
let updatedOrganizations = [];
if (selectionMode === 'all') {
updatedOrganizations = [
{ organizationId: 'all', displayName: 'All Organizations' },
];
} else {
setFilteredOrganizations(organizations.filter(org => visibleOrganizations.includes(org.organizationId)));
updatedOrganizations = organizations.filter(org => visibleOrganizations.includes(org.organizationId));
}
}, [organizations, visibleOrganizations]);

setFilteredOrganizations(updatedOrganizations);

}, [organizations, visibleOrganizations, selectionMode]);

const handlePolicyChange = (organizationId, selectedPolicies) => {
const selectedPolicyNames = selectedPolicies.map(policy => policy.name);
Expand Down Expand Up @@ -160,7 +177,7 @@ function OrganizationSubscriptionPoliciesManage(props) {
<Root>
<div className={classes.heading}>
<Typography variant='h6' style={{ marginTop: '20px' }}>
Business Plans for Shared Organizations
Business Plans
</Typography>
</div>
<Paper>
Expand Down
Loading
Loading