From fc170572f801b76aa92475115392018e34a333b0 Mon Sep 17 00:00:00 2001
From: BLasan <benuraab@gmail.com>
Date: Thu, 11 Jan 2024 08:57:09 +0530
Subject: [PATCH 01/42] Improve: Validation for API Context

---
 .../src/main/webapp/source/src/app/data/APIValidation.js    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/data/APIValidation.js b/portals/publisher/src/main/webapp/source/src/app/data/APIValidation.js
index 7bef690a934..0cbb107ebd8 100644
--- a/portals/publisher/src/main/webapp/source/src/app/data/APIValidation.js
+++ b/portals/publisher/src/main/webapp/source/src/app/data/APIValidation.js
@@ -134,7 +134,11 @@ const definition = {
         });
         return tmpErrors;
     }),
-    apiContext: Joi.string().max(200).regex(/(?!.*\/t\/.*|.*\/t$)^[^~!@#:%^&*+=|\\<>"',&\s[\]]*$/).required()
+    apiContext: Joi.string().max(200).regex(/(?!.*\/t\/.*|.*\/t$)^[^`~!@#?:%^&*+=|\\<>"',&\s[\]]*$/).required()
+        .error((errors) => {
+            return errors.map((error) => ({ ...error, message: 'Context ' + getMessage(error.type, 200) }));
+        }),
+    apiContextWithoutKeyWords: Joi.string().max(200).regex(/^[^{}]*$/).required()
         .error((errors) => {
             return errors.map((error) => ({ ...error, message: 'Context ' + getMessage(error.type, 200) }));
         }),

From 5d65e7fe0760985178c28315c242aaa4487af214 Mon Sep 17 00:00:00 2001
From: Sahan Randika <shnrndk@gmail.com>
Date: Tue, 5 Mar 2024 15:29:11 +0530
Subject: [PATCH 02/42] fix policies button align issue

---
 .../source/src/app/components/CommonPolicies/DeletePolicy.jsx    | 1 +
 .../webapp/source/src/app/components/CommonPolicies/Listing.jsx  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/CommonPolicies/DeletePolicy.jsx b/portals/publisher/src/main/webapp/source/src/app/components/CommonPolicies/DeletePolicy.jsx
index 8e543291803..3e8040f3221 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/CommonPolicies/DeletePolicy.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/CommonPolicies/DeletePolicy.jsx
@@ -67,6 +67,7 @@ const DeletePolicy = ({ policyId, policyName, fetchCommonPolicies }) => {
         <>
             <Button
                 onClick={toggleOpen}
+                sx={{width:100}}
                 disabled={
                     isRestricted([
                         'apim:api_create',
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/CommonPolicies/Listing.jsx b/portals/publisher/src/main/webapp/source/src/app/components/CommonPolicies/Listing.jsx
index 1d6fc1681dc..45523972769 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/CommonPolicies/Listing.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/CommonPolicies/Listing.jsx
@@ -258,6 +258,7 @@ const Listing = () => {
                         return (
                             <Box display='flex' flexDirection='row'>
                                 <Button
+                                    sx={{width:100}}
                                     disabled={isRestricted([
                                         'apim:api_view',
                                         'apim:api_manage',

From fed6f2e7b4238d55bab59534790c3595559f56b7 Mon Sep 17 00:00:00 2001
From: Sahan Randika <shnrndk@gmail.com>
Date: Wed, 6 Mar 2024 10:17:50 +0530
Subject: [PATCH 03/42] change policyconfiguringdrawer zindex

---
 .../Apis/Details/Policies/PolicyConfigurationEditDrawer.tsx      | 1 +
 .../components/Apis/Details/Policies/PolicyConfiguringDrawer.tsx | 1 +
 .../GlobalSpecificComponents/PolicyConfigurationEditDrawer.tsx   | 1 +
 .../GlobalSpecificComponents/PolicyConfiguringDrawer.tsx         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Policies/PolicyConfigurationEditDrawer.tsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Policies/PolicyConfigurationEditDrawer.tsx
index e2416464ad2..6d4e881072a 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Policies/PolicyConfigurationEditDrawer.tsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Policies/PolicyConfigurationEditDrawer.tsx
@@ -135,6 +135,7 @@ const PolicyConfigurationEditDrawer: FC<PolicyConfigurationEditDrawerProps> = ({
             open={drawerOpen}
             onClose={handleDrawerClose}
             classes={{ paper: classes.drawerPaper }}
+            sx={{ zIndex: 1300}}
         >
             <Box role='presentation'>
                 <List>
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Policies/PolicyConfiguringDrawer.tsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Policies/PolicyConfiguringDrawer.tsx
index 504bebcfaa5..f297c341876 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Policies/PolicyConfiguringDrawer.tsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Policies/PolicyConfiguringDrawer.tsx
@@ -131,6 +131,7 @@ const PolicyConfiguringDrawer: FC<PolicyConfiguringDrawerProps> = ({
             open={drawerOpen}
             onClose={handleDrawerClose}
             classes={{ paper: classes.drawerPaper }}
+            sx={{ zIndex: 1300}}
         >
             <Box role='presentation'>
                 <List>
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Policies/GlobalSpecificComponents/PolicyConfigurationEditDrawer.tsx b/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Policies/GlobalSpecificComponents/PolicyConfigurationEditDrawer.tsx
index bb401daaa80..1c2e26df844 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Policies/GlobalSpecificComponents/PolicyConfigurationEditDrawer.tsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Policies/GlobalSpecificComponents/PolicyConfigurationEditDrawer.tsx
@@ -124,6 +124,7 @@ const PolicyConfigurationEditDrawer: FC<PolicyConfigurationEditDrawerProps> = ({
             open={drawerOpen}
             onClose={handleDrawerClose}
             classes={{ paper: classes.drawerPaper }}
+            sx={{ zIndex: 1300}}
         >
             <Box role='presentation'>
                 <List>
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Policies/GlobalSpecificComponents/PolicyConfiguringDrawer.tsx b/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Policies/GlobalSpecificComponents/PolicyConfiguringDrawer.tsx
index 7afee05edee..5a07a8d17f2 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Policies/GlobalSpecificComponents/PolicyConfiguringDrawer.tsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Policies/GlobalSpecificComponents/PolicyConfiguringDrawer.tsx
@@ -138,6 +138,7 @@ const PolicyConfiguringDrawer: FC<PolicyConfiguringDrawerProps> = ({
             open={drawerOpen}
             onClose={handleDrawerClose}
             classes={{ paper: classes.drawerPaper }}
+            sx={{ zIndex: 1300}}
         >
             <Box role='presentation'>
                 <List>

From d405acbf0f3adb5830fb2f23f45e6293a571f81a Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Wed, 13 Mar 2024 13:19:29 +0530
Subject: [PATCH 04/42] Fix https://github.com/wso2/api-manager/issues/2579

---
 .../Apis/Details/Subscriptions/TenantAutocomplete.jsx  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Subscriptions/TenantAutocomplete.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Subscriptions/TenantAutocomplete.jsx
index be34445a44b..3cf52aeff03 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Subscriptions/TenantAutocomplete.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Subscriptions/TenantAutocomplete.jsx
@@ -39,14 +39,9 @@ const classes = {
     divider: `${PREFIX}-divider`
 };
 
-const Root = styled('div')((
-    {
-        theme
-    }
-) => ({
+const Root = styled('div')(({ theme }) => ({
     [`& .${classes.root}`]: {
         flexGrow: 1,
-        height: 250,
     },
 
     [`&.${classes.container}`]: {
@@ -217,6 +212,7 @@ function DownshiftMultiple(props) {
                 inputValue: inputValue2,
                 tenantList: tenantList2,
                 highlightedIndex,
+                getRootProps,
             }) => {
                 const {
                     onBlur, onChange, onFocus, ...inputProps
@@ -226,7 +222,7 @@ function DownshiftMultiple(props) {
                 });
 
                 return (
-                    <Root className={classes.container}>
+                    <Root className={classes.container} {...getRootProps({ }, { suppressRefError: true })}>
                         {renderInput({
                             fullWidth: true,
                             classes,

From fe11e45646e678f76ca9cec7157229ee8bef62a0 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Wed, 13 Mar 2024 13:40:39 +0530
Subject: [PATCH 05/42] Fix https://github.com/wso2/api-manager/issues/2626

---
 .../GlobalPolicies/Listing/Listing.tsx        | 164 +++++++++---------
 1 file changed, 83 insertions(+), 81 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Listing/Listing.tsx b/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Listing/Listing.tsx
index bd181579e43..20901861c9b 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Listing/Listing.tsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/GlobalPolicies/Listing/Listing.tsx
@@ -17,7 +17,6 @@
 */
 
 /* eslint-disable react/jsx-props-no-spreading */
-
 import React, { useState, useEffect } from 'react';
 import { styled } from '@mui/material/styles';
 import {
@@ -74,6 +73,9 @@ const classes = {
 };
 
 const Root = styled('div')(({ theme }: { theme: Theme }) => ({
+    '&': {
+        padding: `${theme.spacing(1)} ${theme.spacing(3)}`,
+    },
     [`& .${classes.table}`]: {
         marginLeft: 'auto',
         marginRight: 'auto',
@@ -714,20 +716,18 @@ const Listing: React.FC = () => {
                 customBodyRender: (value: string, tableMeta: any) => {        
                     const policyDescription = tableMeta.rowData[3];          
                     return (
-                        <Root>
-                            <Grid container alignItems='center'>
-                                <Grid item>
-                                    {value}
-                                </Grid>
-                                <Grid item>
-                                    <Tooltip title={policyDescription}>       
-                                        <IconButton size='small' aria-label='description-text'>
-                                            <InfoOutlinedIcon/>
-                                        </IconButton>
-                                    </Tooltip>
-                                </Grid>
+                        <Grid container alignItems='center'>
+                            <Grid item>
+                                {value}
+                            </Grid>
+                            <Grid item>
+                                <Tooltip title={policyDescription}>       
+                                    <IconButton size='small' aria-label='description-text'>
+                                        <InfoOutlinedIcon/>
+                                    </IconButton>
+                                </Tooltip>
                             </Grid>
-                        </Root>
+                        </Grid>
                     );
                 }
             }      
@@ -1101,78 +1101,80 @@ const Listing: React.FC = () => {
      * MUI Table for the policies.
      */
     return (
-        <div className={classes.heading}>
-            <Grid
-                className={classes.titleWrapper}
-                xs={12}
-                sm={12}
-                md={11}
-                lg={11}
-                item
-            >
-                <Typography
-                    variant='h4'
-                    align='left'
-                    component='h1'
-                    className={classes.mainTitle}
+        <Root>
+            <div className={classes.heading}>
+                <Grid
+                    className={classes.titleWrapper}
+                    xs={12}
+                    sm={12}
+                    md={11}
+                    lg={11}
+                    item
                 >
-                    <FormattedMessage
-                        id='GlobalPolicies.Listing.policies.title.name'
-                        defaultMessage='Global Policies'
-                    />
-                </Typography>
-                <Tooltip
-                    title={
+                    <Typography
+                        variant='h4'
+                        align='left'
+                        component='h1'
+                        className={classes.mainTitle}
+                    >
                         <FormattedMessage
-                            id='GlobalPolicies.Listing.policies.title.tooltip'
-                            defaultMessage={
-                                'This will add policies globally to the gateways. ' +
-                                'Please navigate to the Policies tab under any desired API ' +
-                                'if you want to add API / operation level policies'
-                            }
+                            id='GlobalPolicies.Listing.policies.title.name'
+                            defaultMessage='Global Policies'
                         />
-                    }
-                    placement='bottom-start'
-                >
-                    <IconButton size='small' aria-label='Policy-helper-text'>
-                        <HelpOutlineIcon fontSize='small' />
-                    </IconButton>
-                </Tooltip>
-                {!isRestricted(['apim:gateway_policy_manage']) 
-                    ? <Box pl={1}>
-                        <Button 
-                            color='primary' 
-                            variant='outlined' 
-                            size='small' 
-                            data-testid='add-new-global-policy'
-                            component={Link}
-                            to='/global-policies/create'
-                        >
-                            <AddCircle className={classes.buttonIcon} />
+                    </Typography>
+                    <Tooltip
+                        title={
                             <FormattedMessage
-                                id='GlobalPolicies.Listing.policies.title.add.new.policy'
-                                defaultMessage='Add new global policy'
+                                id='GlobalPolicies.Listing.policies.title.tooltip'
+                                defaultMessage={
+                                    'This will add policies globally to the gateways. ' +
+                                    'Please navigate to the Policies tab under any desired API ' +
+                                    'if you want to add API / operation level policies'
+                                }
                             />
-                        </Button>
-                    </Box>  
-                    :null}
-            </Grid>
-            <Grid
-                className={classes.table}
-                xs={12}
-                sm={12}
-                md={11}
-                lg={11}
-                item
-            >
-                <MUIDataTable
-                    title={false}
-                    data={policiesList}
-                    columns={columns}
-                    options={options}
-                />
-            </Grid>
-        </div>
+                        }
+                        placement='bottom-start'
+                    >
+                        <IconButton size='small' aria-label='Policy-helper-text'>
+                            <HelpOutlineIcon fontSize='small' />
+                        </IconButton>
+                    </Tooltip>
+                    {!isRestricted(['apim:gateway_policy_manage']) 
+                        ? <Box pl={1}>
+                            <Button 
+                                color='primary' 
+                                variant='outlined' 
+                                size='small' 
+                                data-testid='add-new-global-policy'
+                                component={Link}
+                                to='/global-policies/create'
+                            >
+                                <AddCircle className={classes.buttonIcon} />
+                                <FormattedMessage
+                                    id='GlobalPolicies.Listing.policies.title.add.new.policy'
+                                    defaultMessage='Add new global policy'
+                                />
+                            </Button>
+                        </Box>  
+                        :null}
+                </Grid>
+                <Grid
+                    className={classes.table}
+                    xs={12}
+                    sm={12}
+                    md={11}
+                    lg={11}
+                    item
+                >
+                    <MUIDataTable
+                        title={false}
+                        data={policiesList}
+                        columns={columns}
+                        options={options}
+                    />
+                </Grid>
+            </div>
+        </Root>
     );
 };
 

From 6a1b4b474f07d5729580e0be60f428b6b3a93d19 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Wed, 13 Mar 2024 14:55:50 +0530
Subject: [PATCH 06/42] Fix https://github.com/wso2/api-manager/issues/2593

---
 .../app/components/Apis/Listing/Landing/Menus/RestAPIMenu.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Listing/Landing/Menus/RestAPIMenu.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Listing/Landing/Menus/RestAPIMenu.jsx
index 105ae542a55..037145bc07c 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Listing/Landing/Menus/RestAPIMenu.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Listing/Landing/Menus/RestAPIMenu.jsx
@@ -100,7 +100,7 @@ const RestAPIMenu = (props) => {
             {(!isCreateMenu || (isCreateMenu && alwaysShowDeploySampleButton)) && showSampleDeploy &&
                 !apkGatewayType && (
                 <>
-                    <Box width={1} sx={{ pt: '16px' }}>
+                    <Box width={1} sx={{ pt: '16px' , ml: '16px'}}>
                         <Divider light variant='middle' />
                     </Box>
                     <SampleAPI dense={dense} />

From 82a490dc269df8925b1180477eb6bcedd6b9295b Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Wed, 13 Mar 2024 15:28:17 +0530
Subject: [PATCH 07/42] Fix https://github.com/wso2/api-manager/issues/2568

---
 .../Apis/Details/Configuration/components/Tags.jsx        | 2 +-
 .../webapp/source/src/app/components/Shared/ChipInput.js  | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/Tags.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/Tags.jsx
index a95d43bf470..3435e19ed4e 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/Tags.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/Tags.jsx
@@ -116,8 +116,8 @@ export default function Tags(props) {
                         }}
                         style={{
                             backgroundColor: (regexPattern.test(value) || value.length > 30) ? red[300] : null,
-                            margin: '0 8px 12px 0',
                             float: 'left',
+                            marginRight: '8px',
                         }}
                     />
                 )}
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Shared/ChipInput.js b/portals/publisher/src/main/webapp/source/src/app/components/Shared/ChipInput.js
index c77c41e854f..371f0272d3a 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Shared/ChipInput.js
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Shared/ChipInput.js
@@ -81,9 +81,6 @@ const StyledFormControl = styled(FormControl)(({ theme }) => {
       }
     },
     [`& .${classes.outlined}`]: {
-      '& input': {
-        padding: theme.spacing(2),
-      }
     },
     [`& .${classes.standard}`]: {},
     [`& .${classes.filled}`]: {
@@ -181,9 +178,6 @@ const StyledFormControl = styled(FormControl)(({ theme }) => {
       float: 'left'
     },
     [`& .${classes.marginDense}`]: {},
-    [`& .MuiChip-root`]: {
-      margin: '0 !important',
-    },
   };
 });
 
@@ -763,7 +757,7 @@ export const defaultChipRenderer = ({ value, text, isFocused, isDisabled, isRead
     className={className}
     style={{
       pointerEvents: isDisabled || isReadOnly ? 'none' : undefined,
-      backgroundColor: isFocused ? blue[300] : undefined
+      backgroundColor: isFocused ? blue[300] : undefined,
     }}
     onClick={handleClick}
     onDelete={handleDelete}

From 860b00587c0e612dfb26fe0a4c65eeeb5d440524 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Wed, 13 Mar 2024 15:56:54 +0530
Subject: [PATCH 08/42] Fix https://github.com/wso2/api-manager/issues/2567

---
 .../src/app/components/Scopes/EditScope.jsx   |   5 +-
 .../app/components/Scopes/Listing/Listing.jsx | 107 +++++++++---------
 2 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Scopes/EditScope.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Scopes/EditScope.jsx
index d9d18538c5e..d2b0eac3b65 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Scopes/EditScope.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Scopes/EditScope.jsx
@@ -389,15 +389,14 @@ class EditScope extends React.Component {
             return <Progress />;
         }
         return (
-            <StyledGrid container spacing={3}>
-                <Grid item sm={12} md={12} />
+            <StyledGrid container>
                 {/*
             Following two grids control the placement of whole create page
             For centering the content better use `container` props, but instead used an empty grid item for flexibility
              */}
                 <Grid item sm={0} md={0} lg={2} />
                 <Grid item sm={12} md={12} lg={8}>
-                    <Grid container spacing={5} className={classes.titleGrid}>
+                    <Grid container className={classes.titleGrid}  sx={{ pt: 2 }}>
                         <Grid item md={12}>
                             <div className={classes.titleWrapper}>
                                 <Link to={url} className={classes.titleLink}>
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Scopes/Listing/Listing.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Scopes/Listing/Listing.jsx
index f2027ecc38c..2ee3ddd0b36 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Scopes/Listing/Listing.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Scopes/Listing/Listing.jsx
@@ -62,11 +62,10 @@ const classes = {
     buttonLeft: `${PREFIX}-buttonLeft`
 };
 
-const Root = styled('div')((
-    {
-        theme
-    }
-) => ({
+const Root = styled('div')(({ theme }) => ({
+    '&': {
+        padding: `${theme.spacing(1)} ${theme.spacing(3)}`,
+    },
     [`& .${classes.contentInside}`]: {
         padding: theme.spacing(3),
         paddingTop: theme.spacing(2),
@@ -196,9 +195,7 @@ function ScopeTablePagination(props) {
     }
 
     return (
-        <Root
-            style={{ display: 'flex' }}
-        >
+        <div style={{ display: 'flex' }}>
             <IconButton onClick={handleFirstPageButtonClick} disabled={page === 0} size='large'>
                 <FirstPageIcon />
             </IconButton>
@@ -217,7 +214,7 @@ function ScopeTablePagination(props) {
                 size='large'>
                 <LastPageIcon />
             </IconButton>
-        </Root>
+        </div>
     );
 }
 
@@ -445,55 +442,57 @@ class Listing extends React.Component {
         }
 
         return (
-            <div className={classes.heading}>
-                <Grid
-                    className={classes.titleWrapper}
-                    xs={12}
-                    sm={12}
-                    md={11}
-                    lg={11}
-                    item
-                >
-                    <Typography variant='h4' align='left' component='h1' className={classes.mainTitle}>
-                        <FormattedMessage
-                            id='Scopes.Listing.Listing.heading.scope.heading'
-                            defaultMessage='Scopes'
-                        />
-                    </Typography>
-                    <Box pl={1}>
-                        <Button
-                            color='primary'
-                            variant='outlined'
-                            size='small'
-                            disabled={isRestricted(['apim:shared_scope_manage'])}
-                            component={Link}
-                            to={!isRestricted(['apim:shared_scope_manage']) && url}
-                        >
-                            <AddCircle className={classes.buttonIcon} />
+            <Root>
+                <div className={classes.heading}>
+                    <Grid
+                        className={classes.titleWrapper}
+                        xs={12}
+                        sm={12}
+                        md={11}
+                        lg={11}
+                        item
+                    >
+                        <Typography variant='h4' align='left' component='h1' className={classes.mainTitle}>
                             <FormattedMessage
-                                id='Scopes.Listing.Listing.heading.scope.add_new'
-                                defaultMessage='Add New Scope'
+                                id='Scopes.Listing.Listing.heading.scope.heading'
+                                defaultMessage='Scopes'
                             />
-                        </Button>
-                    </Box>
-                    {isRestricted(['apim:shared_scope_manage']) && (
-                        <Grid item>
-                            <Typography variant='body2' color='primary'>
+                        </Typography>
+                        <Box pl={1}>
+                            <Button
+                                color='primary'
+                                variant='outlined'
+                                size='small'
+                                disabled={isRestricted(['apim:shared_scope_manage'])}
+                                component={Link}
+                                to={!isRestricted(['apim:shared_scope_manage']) && url}
+                            >
+                                <AddCircle className={classes.buttonIcon} />
                                 <FormattedMessage
-                                    id='Scopes.Listing.Listing.update.not.allowed'
-                                    defaultMessage={
-                                        '*You are not authorized to update scopes of'
-                                        + ' the API due to insufficient permissions'
-                                    }
+                                    id='Scopes.Listing.Listing.heading.scope.add_new'
+                                    defaultMessage='Add New Scope'
                                 />
-                            </Typography>
-                        </Grid>
-                    )}
-                </Grid>
-                <Grid className={classes.table} xs={12} sm={12} md={11} lg={11} item>
-                    <MUIDataTable title={false} data={scopesList} columns={columns} options={options} />
-                </Grid>
-            </div>
+                            </Button>
+                        </Box>
+                        {isRestricted(['apim:shared_scope_manage']) && (
+                            <Grid item>
+                                <Typography variant='body2' color='primary'>
+                                    <FormattedMessage
+                                        id='Scopes.Listing.Listing.update.not.allowed'
+                                        defaultMessage={
+                                            '*You are not authorized to update scopes of'
+                                            + ' the API due to insufficient permissions'
+                                        }
+                                    />
+                                </Typography>
+                            </Grid>
+                        )}
+                    </Grid>
+                    <Grid className={classes.table} xs={12} sm={12} md={11} lg={11} item>
+                        <MUIDataTable title={false} data={scopesList} columns={columns} options={options} />
+                    </Grid>
+                </div>
+            </Root>
         );
     }
 }

From 02efe7fa9c19cfe984fbe69793d384d65a5b84bb Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Fri, 15 Mar 2024 14:39:41 +0530
Subject: [PATCH 09/42] Fix https://github.com/wso2/api-manager/issues/2622

---
 .../Configuration/components/DescriptionEditor.jsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/DescriptionEditor.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/DescriptionEditor.jsx
index 08df3c30404..1738f928471 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/DescriptionEditor.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/DescriptionEditor.jsx
@@ -58,7 +58,7 @@ const classes = {
 };
 
 
-const Root = styled('div')(() => ({
+const StyledDialog = styled(Dialog)(({ theme }) => ({
     [`& .${classes.flex}`]: {
         flex: 1,
     },
@@ -72,7 +72,6 @@ const Root = styled('div')(() => ({
     [`& .${classes.splitWrapper}`]: {
         padding: 0,
         paddingTop: 2,
-        border: '1px solid #red',
     },
 
     [`& .${classes.editorHeader}`]: {
@@ -83,6 +82,7 @@ const Root = styled('div')(() => ({
     [`& .${classes.markdownViewWrapper}`]: {
         height: '100vh',
         overflowY: 'auto',
+        padding: theme.spacing(2),
     },
 
     [`& .${classes.appBar}`]: {
@@ -169,7 +169,7 @@ export default function DescriptionEditor(props) {
     const markdownWithApiData = addApiContent(content);
 
     return (
-        <Root>
+        <div>
             <Button
                 variant='outlined'
                 color='primary'
@@ -181,7 +181,7 @@ export default function DescriptionEditor(props) {
                     defaultMessage='Edit description'
                 />
             </Button>
-            <Dialog fullScreen open={open} onClose={toggleOpen} TransitionComponent={Transition}>
+            <StyledDialog fullScreen open={open} onClose={toggleOpen} TransitionComponent={Transition}>
                 <AppBar color='inherit' className={classes.appBar}>
                     <Toolbar variant='dense'>
                         <Grid
@@ -279,7 +279,7 @@ export default function DescriptionEditor(props) {
                     </Toolbar>
                 </AppBar>
                 <div className={classes.splitWrapper}>
-                    <Grid container sx={{ pt: 5 }}>
+                    <Grid container>
                         { descriptionType === CONSTS.DESCRIPTION_TYPES.DESCRIPTION
                             ? (
                                 <Grid item xs={12}>
@@ -347,8 +347,8 @@ export default function DescriptionEditor(props) {
                             )}
                     </Grid>
                 </div>
-            </Dialog>
-        </Root>
+            </StyledDialog>
+        </div>
     );
 }
 

From c079db2aaa36c619d718f1b4d29ea8057d874bec Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Fri, 15 Mar 2024 14:49:21 +0530
Subject: [PATCH 10/42] Fix https://github.com/wso2/api-manager/issues/2608

---
 .../Apis/Details/Documents/MarkdownEditor.jsx          | 10 +++++-----
 .../components/Apis/Details/Documents/TextEditor.jsx   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/MarkdownEditor.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/MarkdownEditor.jsx
index f66e51da3e1..fe4bad2741f 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/MarkdownEditor.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/MarkdownEditor.jsx
@@ -50,7 +50,7 @@ const classes = {
     button: `${PREFIX}-button`
 };
 
-const Root = styled('div')({
+const StyledDialog = styled(Dialog)({
     [`& .${classes.appBar}`]: {
         position: 'relative',
     },
@@ -175,7 +175,7 @@ function MarkdownEditor(props) {
 
     const {  docName } = props;
     return (
-        <Root>
+        <div>
             <Button onClick={toggleOpen} disabled={api.isRevision}  aria-label={'Edit Content of ' + docName}>
                 <Icon>code</Icon>
                 <FormattedMessage
@@ -183,7 +183,7 @@ function MarkdownEditor(props) {
                     defaultMessage="Edit Content"
                 />
             </Button>
-            <Dialog fullScreen open={open} onClose={toggleOpen} TransitionComponent={Transition}>
+            <StyledDialog fullScreen open={open} onClose={toggleOpen} TransitionComponent={Transition}>
                 <Paper square className={classes.popupHeader}>
                     <IconButton color="inherit" onClick={toggleOpen} aria-label="Close" size='large'>
                         <Icon>close</Icon>
@@ -257,8 +257,8 @@ function MarkdownEditor(props) {
                         </Grid>
                     </Grid>
                 </div>
-            </Dialog>
-        </Root>
+            </StyledDialog>
+        </div>
     );
 }
 
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/TextEditor.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/TextEditor.jsx
index 8e230b6381a..740a4377a26 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/TextEditor.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/TextEditor.jsx
@@ -50,7 +50,7 @@ const classes = {
     button: `${PREFIX}-button`
 };
 
-const Root = styled('div')({
+const StyledDialog = styled(Dialog)({
     [`& .${classes.appBar}`]: {
         position: 'relative',
     },
@@ -154,7 +154,7 @@ function TextEditor(props) {
 
     const {  docName } = props;
     return (
-        <Root>
+        <div>
             <Button
                 onClick={toggleOpen} disabled={isRestricted(['apim:api_create', 'apim:api_publish'], api) || api.isRevision}
                 aria-label={'Edit Content of ' + docName}
@@ -162,7 +162,7 @@ function TextEditor(props) {
                 <Icon>description</Icon>
                 <FormattedMessage id='Apis.Details.Documents.TextEditor.edit.content' defaultMessage='Edit Content' />
             </Button>
-            <Dialog fullScreen open={open} onClose={toggleOpen} TransitionComponent={Transition}>
+            <StyledDialog fullScreen open={open} onClose={toggleOpen} TransitionComponent={Transition}>
                 <Paper square className={classes.popupHeader}>
                     <IconButton color='inherit' onClick={toggleOpen} aria-label='Close' size='large'>
                         <Icon>close</Icon>
@@ -196,8 +196,8 @@ function TextEditor(props) {
                         onEditorStateChange={onEditorStateChange}
                     />
                 </div>
-            </Dialog>
-        </Root>
+            </StyledDialog>
+        </div>
     );
 }
 

From d6a8f06c6afae43f1fd6c4a0d9ab6cb77c30a671 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Fri, 15 Mar 2024 15:27:27 +0530
Subject: [PATCH 11/42] Fix document edit metadata UI

---
 .../components/Apis/Details/Documents/Edit.jsx    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/Edit.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/Edit.jsx
index 665d37ee7cb..e3f76ef509c 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/Edit.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/Edit.jsx
@@ -45,7 +45,7 @@ const classes = {
     editMetaButton: `${PREFIX}-editMetaButton`
 };
 
-const Root = styled('div')({
+const StyledDialog = styled(Dialog)({
     [`& .${classes.appBar}`]: {
         position: 'relative',
     },
@@ -68,9 +68,6 @@ const Root = styled('div')({
         height: 30,
         marginLeft: 30,
     },
-    [`& .${classes.editMetaButton}`]: {
-        whiteSpace: 'nowrap',
-    },
 });
 
 function Transition(props) {
@@ -138,11 +135,11 @@ function Edit(props) {
 
     const {  docId, apiId, docName } = props;
     return (
-        <Root>
+        <div>
             <Button
                 onClick={toggleOpen}
                 disabled={isRestricted(['apim:api_create', 'apim:api_publish'], api) || api.isRevision}
-                className={classes.editMetaButton}
+                sx={{ whiteSpace: 'nowrap' }}
                 aria-label={'Edit Meta Data of ' + docName}
             >
                 <Icon>edit</Icon>
@@ -151,7 +148,7 @@ function Edit(props) {
                     defaultMessage='Edit Meta Data'
                 />
             </Button>
-            <Dialog open={open} onClose={toggleOpen} TransitionComponent={Transition} fullScreen>
+            <StyledDialog open={open} onClose={toggleOpen} TransitionComponent={Transition} fullScreen>
                 <Paper square className={classes.popupHeader}>
                     <IconButton color='inherit' onClick={toggleOpen} aria-label='Close' size='large'>
                         <Icon>close</Icon>
@@ -188,8 +185,8 @@ function Edit(props) {
                         setSaveDisabled={setSaveDisabled}
                     />
                 </div>
-            </Dialog>
-        </Root>
+            </StyledDialog>
+        </div>
     );
 }
 Edit.propTypes = {

From 03e486f6ef78d924df574e4bc7a92078d61ab20f Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Mon, 18 Mar 2024 10:06:25 +0530
Subject: [PATCH 12/42] Fix https://github.com/wso2/api-manager/issues/2598

---
 .../Details/Environments/Environments.jsx     | 81 +++++++------------
 1 file changed, 31 insertions(+), 50 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
index 1507a0cdbe8..8b18511be72 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
@@ -16,6 +16,7 @@
  * under the License.
  */
 
+/* eslint-disable */
 import React, { useContext, useEffect, useState } from 'react';
 import { styled } from '@mui/material/styles';
 import { APIContext } from 'AppComponents/Apis/Details/components/ApiContext';
@@ -1224,36 +1225,30 @@ export default function Environments() {
                     />
                     <Popover
                         id='mouse-over-popover'
-                        className={classes.popover}
-                        classes={{
-                            paper: classes.paper,
-
-                        }}
+                        sx={{ pointerEvents: 'none' }}
                         open={openPopover}
                         anchorEl={anchorEl}
                         anchorOrigin={{
-                            vertical: 'top',
-                            horizontal: 'right',
+                            vertical: 'bottom',
+                            horizontal: 'left',
                         }}
                         transformOrigin={{
-                            vertical: 'bottom',
+                            vertical: 'top',
                             horizontal: 'left',
                         }}
                         onClose={handlePopoverClose}
                         disableRestoreFocus
                     >
-                        <div>
-                            <Typography variant='body1'>
+                        <div style={{ padding: '8px' }}>
+                            <Typography variant='body1' sx={{ mb: 0.5 }}>
                                 <b>{revName}</b>
                             </Typography>
-                            <Typography variant='body2'>
+                            <Typography variant='body2' sx={{ mb: 1}}>
                                 {revDescription}
                             </Typography>
-                            <div className={classes.timePaddingStyle}>
-                                <Typography variant='caption'>
-                                    <span>{moment(revCreatedTime).fromNow()}</span>
-                                </Typography>
-                            </div>
+                            <Typography variant='caption'>
+                                <span>{moment(revCreatedTime).fromNow()}</span>
+                            </Typography>
                         </div>
                     </Popover>
                 </Grid>
@@ -1366,15 +1361,12 @@ export default function Environments() {
                     />
                     <Popover
                         id='mouse-over-popover'
-                        className={classes.popover}
-                        classes={{
-                            paper: classes.paper,
-                        }}
+                        sx={{ pointerEvents: 'none' }}
                         open={openPopover}
                         anchorEl={anchorEl1}
                         anchorOrigin={{
                             vertical: 'bottom',
-                            horizontal: 'right',
+                            horizontal: 'left',
                         }}
                         transformOrigin={{
                             vertical: 'top',
@@ -1383,18 +1375,16 @@ export default function Environments() {
                         onClose={handlePopoverClose}
                         disableRestoreFocus
                     >
-                        <div>
-                            <Typography variant='body1'>
+                        <div style={{ padding: '8px' }}>
+                            <Typography variant='body1' sx={{ mb: 0.5 }}>
                                 <b>{revName}</b>
                             </Typography>
-                            <Typography variant='body2'>
+                            <Typography variant='body2' sx={{ mb: 1}}>
                                 {revDescription}
                             </Typography>
-                            <div className={classes.timePaddingStyle}>
-                                <Typography variant='caption'>
-                                    <span>{moment(revCreatedTime).fromNow()}</span>
-                                </Typography>
-                            </div>
+                            <Typography variant='caption'>
+                                <span>{moment(revCreatedTime).fromNow()}</span>
+                            </Typography>
                         </div>
                     </Popover>
                 </Grid>
@@ -1429,29 +1419,21 @@ export default function Environments() {
                 />
                 <Popover
                     id='mouse-over-popover'
-                    className={classes.popover}
-                    classes={{
-                        paper: classes.paper,
-
-                    }}
+                    sx={{ pointerEvents: 'none' }}
                     open={openPopover}
                     anchorEl={anchorEl}
                     anchorOrigin={{
-                        vertical: 'top',
-                        horizontal: 'right',
+                        vertical: 'bottom',
+                        horizontal: 'left',
                     }}
                     transformOrigin={{
-                        vertical: 'bottom',
+                        vertical: 'top',
                         horizontal: 'left',
                     }}
                     onClose={handlePopoverClose}
                     disableRestoreFocus
                 >
-                    <div>
-                        <Typography variant='body2'>
-                            {revDescription}
-                        </Typography>
-                    </div>
+                    <Typography sx={{ p: 1 }}>{revDescription}</Typography>
                 </Popover>
             </>
 
@@ -1478,15 +1460,14 @@ export default function Environments() {
                             {item1}
                             <Grid className={classes.textShape2}>
                                 {allRevisions[revision].displayName}
-                                {allRevisions[revision].description && <>
-                                    <ReturnInfoIconItem
-                                        revDescription={allRevisions[revision].description}
-                                    />
-                                    {infoIconItem}
-                                </>
-                                }
+                                {allRevisions[revision].description && (
+                                    <>
+                                        <ReturnInfoIconItem revDescription={allRevisions[revision].description} />
+                                        {infoIconItem}
+                                    </>
+                                )}
                             </Grid>
-                            <Grid style={{display:'flex',flexDirection:'row'}}>
+                            <Grid style={{display:'flex', flexDirection:'row'}}>
                                 <Button
                                     className={classes.textShape3}
                                     onClick={() => toggleOpenConfirmRestore(

From 7e998f233dac4d90831995f2a65eec7d6b5458df Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Mon, 18 Mar 2024 11:07:27 +0530
Subject: [PATCH 13/42] Fix https://github.com/wso2/api-manager/issues/2566

---
 .../Details/Environments/Environments.jsx     | 28 ++-----------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
index 8b18511be72..df72f5caa90 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
@@ -133,11 +133,7 @@ const classes = {
 };
 
 
-const Root = styled('div')((
-    {
-        theme
-    }
-) => ({
+const Root = styled('div')(({ theme }) => ({
     [`& .${classes.root}`]: {
         display: 'flex',
         flexWrap: 'wrap',
@@ -2048,7 +2044,7 @@ export default function Environments() {
                     </DialogTitle>
                     <DialogContent className={classes.dialogContent}>
                         { allRevisions && allRevisions.length === revisionCount && (
-                            <Typography variant='body' align='left' className={classes.warningText}>
+                            <Typography align='left' className={classes.warningText}>
                                 <FormattedMessage
                                     id='Apis.Details.Environments.Environments.select.rev.warning'
                                     defaultMessage={'Please delete a revision as '
@@ -2070,15 +2066,6 @@ export default function Environments() {
                                             defaultMessage='Revision to delete'
                                         />
                                     )}
-                                    SelectProps={{
-                                        MenuProps: {
-                                            anchorOrigin: {
-                                                vertical: 'bottom',
-                                                horizontal: 'left',
-                                            },
-                                            getContentAnchorEl: null,
-                                        },
-                                    }}
                                     name='extraRevisionToDelete'
                                     onChange={handleDeleteSelect}
                                     helperText={allRevisions && allRevisions.filter(
@@ -2531,7 +2518,7 @@ export default function Environments() {
                     </DialogTitle>
                     <DialogContent className={classes.dialogContent}>
                         { allRevisions && allRevisions.length === revisionCount && (
-                            <Typography variant='body' align='left' className={classes.warningText}>
+                            <Typography align='left' className={classes.warningText}>
                                 <FormattedMessage
                                     id='Apis.Details.Environments.Environments.select.rev.warning'
                                     defaultMessage={'Please delete a revision as '
@@ -2553,15 +2540,6 @@ export default function Environments() {
                                             defaultMessage='Revision to delete'
                                         />
                                     )}
-                                    SelectProps={{
-                                        MenuProps: {
-                                            anchorOrigin: {
-                                                vertical: 'bottom',
-                                                horizontal: 'left',
-                                            },
-                                            getContentAnchorEl: null,
-                                        },
-                                    }}
                                     name='extraRevisionToDelete'
                                     onChange={handleDeleteSelect}
                                     helperText={allRevisions && allRevisions.filter(

From af3cf8af3efa3f8e3efc79f7f0c36fb354134ece Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Mon, 18 Mar 2024 14:03:53 +0530
Subject: [PATCH 14/42] Fix https://github.com/wso2/api-manager/issues/2660

---
 .../src/main/webapp/package-lock.json         | 847 +++++++++++-------
 .../publisher/src/main/webapp/package.json    |   4 +-
 .../Details/APIDefinition/APIDefinition.jsx   |   6 +-
 .../APIDefinition/asyncApiUI/AsyncApiUI.jsx   |  34 +-
 .../Apis/Details/NewOverview/Topics.jsx       |   2 +-
 .../src/app/components/Apis/Details/index.jsx |   6 +-
 6 files changed, 585 insertions(+), 314 deletions(-)

diff --git a/portals/publisher/src/main/webapp/package-lock.json b/portals/publisher/src/main/webapp/package-lock.json
index 802f38fa198..8f9374771f2 100644
--- a/portals/publisher/src/main/webapp/package-lock.json
+++ b/portals/publisher/src/main/webapp/package-lock.json
@@ -11,8 +11,8 @@
             "dependencies": {
                 "@apidevtools/json-schema-ref-parser": "^9.1.0",
                 "@apidevtools/swagger-parser": "^10.1.0",
-                "@asyncapi/parser": "1.17.2",
-                "@asyncapi/react-component": "^0.24.23",
+                "@asyncapi/parser": "^3.0.10",
+                "@asyncapi/react-component": "^1.4.0",
                 "@dnd-kit/core": "^6.0.8",
                 "@dnd-kit/sortable": "^7.0.2",
                 "@dnd-kit/utilities": "^3.2.1",
@@ -251,160 +251,176 @@
             }
         },
         "node_modules/@asyncapi/avro-schema-parser": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-1.1.0.tgz",
-            "integrity": "sha512-7J7pzSw0/jF2bXy/Mf+80VKJfXRRfyLTJz413MkKLbLXbbz9rV4sVpYfp31ofqXgyZ9bhfmHJzunbi0Bt7Jcww==",
+            "version": "3.0.18",
+            "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-3.0.18.tgz",
+            "integrity": "sha512-2w8cq10apV7Kc+mBPIaIhmErj1oJF8cERpTZKjFti1uoQCXX3oZ9H0wQCajlYNOANuh/a0F4JMEd2R/lM0PFXw==",
             "dependencies": {
-                "avsc": "^5.7.3"
+                "@asyncapi/parser": "^3.0.10",
+                "@types/json-schema": "^7.0.11",
+                "avsc": "^5.7.6"
             }
         },
         "node_modules/@asyncapi/openapi-schema-parser": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@asyncapi/openapi-schema-parser/-/openapi-schema-parser-2.0.3.tgz",
-            "integrity": "sha512-o9fvibjx2n3L2SKNlWUQ59CxO2x2BKhbHxh81U39NMLgowN/avk1wfxkMvzL3G9pg4FlgCdcayDhu4+TzDX47A==",
+            "version": "3.0.18",
+            "resolved": "https://registry.npmjs.org/@asyncapi/openapi-schema-parser/-/openapi-schema-parser-3.0.18.tgz",
+            "integrity": "sha512-azKEwm9wel7QS/Fz0y1C9eCUIfUEZE/JrQlGybPmQKHS213RKyo5Rjpzo9nqGc4VT7o1URDIMaYTnYdgfMitew==",
             "dependencies": {
+                "@asyncapi/parser": "^3.0.10",
                 "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0",
-                "conventional-changelog-conventionalcommits": "^5.0.0"
+                "ajv": "^8.11.0",
+                "ajv-errors": "^3.0.0",
+                "ajv-formats": "^2.1.1"
             }
         },
         "node_modules/@asyncapi/parser": {
-            "version": "1.17.2",
-            "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.17.2.tgz",
-            "integrity": "sha512-xI9GShIuQVfBz5IZ2c9h6cxcPTnfzI1fch6kYL+nF68Q3U669Un0K0TSeyEa57EfhTap53UIRTj7gFIM9QZTNQ==",
-            "dependencies": {
-                "@apidevtools/json-schema-ref-parser": "^9.0.6",
-                "@asyncapi/specs": "^4.0.1",
-                "@fmvilas/pseudo-yaml-ast": "^0.3.1",
-                "ajv": "^6.10.1",
-                "js-yaml": "^3.13.1",
-                "json-to-ast": "^2.1.0",
-                "lodash.clonedeep": "^4.5.0",
-                "node-fetch": "^2.6.0",
-                "tiny-merge-patch": "^0.1.2"
+            "version": "3.0.10",
+            "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.10.tgz",
+            "integrity": "sha512-x9qo7SHGzPWbC1XCRyilcI+Z6UZsWZ9uRl05h9j4G/v+3IjNG3krwngiAbt59nbLlYZD/nBS7Hc03GayoocnQw==",
+            "dependencies": {
+                "@asyncapi/specs": "^6.5.3",
+                "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0",
+                "@stoplight/json": "^3.20.2",
+                "@stoplight/json-ref-readers": "^1.2.2",
+                "@stoplight/json-ref-resolver": "^3.1.5",
+                "@stoplight/spectral-core": "^1.16.1",
+                "@stoplight/spectral-functions": "^1.7.2",
+                "@stoplight/spectral-parsers": "^1.0.2",
+                "@stoplight/spectral-ref-resolver": "^1.0.3",
+                "@stoplight/types": "^13.12.0",
+                "@types/json-schema": "^7.0.11",
+                "@types/urijs": "^1.19.19",
+                "ajv": "^8.11.0",
+                "ajv-errors": "^3.0.0",
+                "ajv-formats": "^2.1.1",
+                "avsc": "^5.7.5",
+                "js-yaml": "^4.1.0",
+                "jsonpath-plus": "^7.2.0",
+                "node-fetch": "2.6.7"
             }
         },
-        "node_modules/@asyncapi/parser/node_modules/ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "node_modules/@asyncapi/parser/node_modules/@asyncapi/specs": {
+            "version": "6.5.3",
+            "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz",
+            "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==",
             "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
+                "@types/json-schema": "^7.0.11"
             }
         },
-        "node_modules/@asyncapi/parser/node_modules/json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "node_modules/@asyncapi/react-component": {
-            "version": "0.24.23",
-            "resolved": "https://registry.npmjs.org/@asyncapi/react-component/-/react-component-0.24.23.tgz",
-            "integrity": "sha512-2Jd3/ITP7TMQJ+QKJgnB5cR6pQssT88zhn2wd0fFT/D5kCudj5kIJqgPvxOalKEwxVaBp8NvvnUZG5fCaBCMzQ==",
-            "dependencies": {
-                "@asyncapi/avro-schema-parser": "^1.0.0",
-                "@asyncapi/openapi-schema-parser": "^2.0.1",
-                "@asyncapi/parser": "^1.15.1",
-                "constate": "^1.2.0",
-                "dompurify": "^2.1.1",
-                "markdown-it": "^12.3.2",
-                "merge": "^2.1.0",
-                "openapi-sampler": "1.2.1",
-                "react-use": "^12.2.0"
-            }
-        },
-        "node_modules/@asyncapi/react-component/node_modules/constate": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/constate/-/constate-1.3.2.tgz",
-            "integrity": "sha512-aaILV4vXwGTUZaQZHS5F1xBV8wRCR0Ow1505fdkS5/BPg6hbQrhNqdHL4wgxWgaDeEj43mu/Fb+LhqOKTMcrgQ==",
-            "peerDependencies": {
-                "react": "^16.8.0"
+        "node_modules/@asyncapi/parser/node_modules/@stoplight/types": {
+            "version": "13.20.0",
+            "resolved": "https://registry.npmjs.org/@stoplight/types/-/types-13.20.0.tgz",
+            "integrity": "sha512-2FNTv05If7ib79VPDA/r9eUet76jewXFH2y2K5vuge6SXbRHtWBhcaRmu+6QpF4/WRNoJj5XYRSwLGXDxysBGA==",
+            "dependencies": {
+                "@types/json-schema": "^7.0.4",
+                "utility-types": "^3.10.0"
+            },
+            "engines": {
+                "node": "^12.20 || >=14.13"
             }
         },
-        "node_modules/@asyncapi/react-component/node_modules/react": {
-            "version": "16.14.0",
-            "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
-            "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
-            "peer": true,
+        "node_modules/@asyncapi/parser/node_modules/argparse": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        },
+        "node_modules/@asyncapi/parser/node_modules/js-yaml": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
             "dependencies": {
-                "loose-envify": "^1.1.0",
-                "object-assign": "^4.1.1",
-                "prop-types": "^15.6.2"
+                "argparse": "^2.0.1"
             },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/@asyncapi/parser/node_modules/jsonpath-plus": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-7.2.0.tgz",
+            "integrity": "sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==",
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=12.0.0"
             }
         },
-        "node_modules/@asyncapi/react-component/node_modules/react-dom": {
-            "version": "16.14.0",
-            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
-            "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
-            "peer": true,
+        "node_modules/@asyncapi/parser/node_modules/node-fetch": {
+            "version": "2.6.7",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+            "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
             "dependencies": {
-                "loose-envify": "^1.1.0",
-                "object-assign": "^4.1.1",
-                "prop-types": "^15.6.2",
-                "scheduler": "^0.19.1"
+                "whatwg-url": "^5.0.0"
+            },
+            "engines": {
+                "node": "4.x || >=6.0.0"
             },
             "peerDependencies": {
-                "react": "^16.14.0"
+                "encoding": "^0.1.0"
+            },
+            "peerDependenciesMeta": {
+                "encoding": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/@asyncapi/react-component/node_modules/react-fast-compare": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz",
-            "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw=="
-        },
-        "node_modules/@asyncapi/react-component/node_modules/react-use": {
-            "version": "12.13.0",
-            "resolved": "https://registry.npmjs.org/react-use/-/react-use-12.13.0.tgz",
-            "integrity": "sha512-Kh0m9ezIn9xfRycx4jdAgvsYGstGfjTBO2ecIM3+G0RqrpMxTIL5jjYraHYfUzjGBHf7dUhNYBzm5vw5LItVZA==",
-            "dependencies": {
-                "@types/react-wait": "^0.3.0",
-                "copy-to-clipboard": "^3.1.0",
-                "nano-css": "^5.1.0",
-                "react-fast-compare": "^2.0.4",
-                "react-wait": "^0.3.0",
-                "resize-observer-polyfill": "^1.5.1",
-                "screenfull": "^5.0.0",
-                "set-harmonic-interval": "^1.0.1",
-                "throttle-debounce": "^2.0.1",
-                "ts-easing": "^0.2.0",
-                "tslib": "^1.10.0"
-            },
-            "peerDependencies": {
-                "react": "^16.8.0",
-                "react-dom": "^16.8.0"
+        "node_modules/@asyncapi/parser/node_modules/tr46": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+        },
+        "node_modules/@asyncapi/parser/node_modules/webidl-conversions": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+        },
+        "node_modules/@asyncapi/parser/node_modules/whatwg-url": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+            "dependencies": {
+                "tr46": "~0.0.3",
+                "webidl-conversions": "^3.0.0"
             }
         },
-        "node_modules/@asyncapi/react-component/node_modules/scheduler": {
-            "version": "0.19.1",
-            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
-            "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
-            "peer": true,
+        "node_modules/@asyncapi/protobuf-schema-parser": {
+            "version": "3.2.8",
+            "resolved": "https://registry.npmjs.org/@asyncapi/protobuf-schema-parser/-/protobuf-schema-parser-3.2.8.tgz",
+            "integrity": "sha512-qYKutNQTkMNrf8BB9d6o2JS/4LC+r6Fkugvg46gW66kN9dKMU2nguHWM+MdcG89nk5keM2Olz4IN8AvWqX9iew==",
             "dependencies": {
-                "loose-envify": "^1.1.0",
-                "object-assign": "^4.1.1"
+                "@asyncapi/parser": "^3.0.10",
+                "@types/protocol-buffers-schema": "^3.4.1",
+                "protobufjs": "^7.2.6"
             }
         },
-        "node_modules/@asyncapi/react-component/node_modules/throttle-debounce": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
-            "integrity": "sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==",
-            "engines": {
-                "node": ">=8"
+        "node_modules/@asyncapi/react-component": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/@asyncapi/react-component/-/react-component-1.4.0.tgz",
+            "integrity": "sha512-Kj88y3sxdpPYGJewk0bF/eFF6hjxrjmde7ZUqOV5GUlbjf+Uy56nm6KWyUbBm6Si+NM+QnxQInbRgGhtd5tq7g==",
+            "dependencies": {
+                "@asyncapi/avro-schema-parser": "^3.0.18",
+                "@asyncapi/openapi-schema-parser": "^3.0.18",
+                "@asyncapi/parser": "^3.0.10",
+                "@asyncapi/protobuf-schema-parser": "^3.2.8",
+                "highlight.js": "^10.7.2",
+                "isomorphic-dompurify": "^0.13.0",
+                "marked": "^4.0.14",
+                "openapi-sampler": "^1.2.1",
+                "use-resize-observer": "^8.0.0"
+            },
+            "peerDependencies": {
+                "react": ">=16.8.0",
+                "react-dom": ">=16.8.0"
             }
         },
-        "node_modules/@asyncapi/react-component/node_modules/tslib": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        "node_modules/@asyncapi/react-component/node_modules/use-resize-observer": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/use-resize-observer/-/use-resize-observer-8.0.0.tgz",
+            "integrity": "sha512-n0iKSeiQpJCyaFh5JA0qsVLBIovsF4EIIR1G6XiBwKJN66ZrD4Oj62bjcuTAATPKiSp6an/2UZZxCf/67fk3sQ==",
+            "dependencies": {
+                "@juggle/resize-observer": "^3.3.1"
+            },
+            "peerDependencies": {
+                "react": ">=16.8.0",
+                "react-dom": ">=16.8.0"
+            }
         },
         "node_modules/@asyncapi/specs": {
             "version": "4.3.1",
@@ -2708,14 +2724,6 @@
             "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz",
             "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q=="
         },
-        "node_modules/@fmvilas/pseudo-yaml-ast": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@fmvilas/pseudo-yaml-ast/-/pseudo-yaml-ast-0.3.1.tgz",
-            "integrity": "sha512-8OAB74W2a9M3k9bjYD8AjVXkX+qO8c0SqNT5HlgOqx7AxSw8xdksEcZp7gFtfi+4njSxT6+76ZR+1ubjAwQHOg==",
-            "dependencies": {
-                "yaml-ast-parser": "0.0.43"
-            }
-        },
         "node_modules/@formatjs/cli": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-3.2.0.tgz",
@@ -5136,6 +5144,60 @@
                 "url": "https://opencollective.com/popperjs"
             }
         },
+        "node_modules/@protobufjs/aspromise": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+            "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+        },
+        "node_modules/@protobufjs/base64": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+            "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+        },
+        "node_modules/@protobufjs/codegen": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+            "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+        },
+        "node_modules/@protobufjs/eventemitter": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+            "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+        },
+        "node_modules/@protobufjs/fetch": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+            "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+            "dependencies": {
+                "@protobufjs/aspromise": "^1.1.1",
+                "@protobufjs/inquire": "^1.1.0"
+            }
+        },
+        "node_modules/@protobufjs/float": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+            "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+        },
+        "node_modules/@protobufjs/inquire": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+            "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+        },
+        "node_modules/@protobufjs/path": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+            "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+        },
+        "node_modules/@protobufjs/pool": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+            "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+        },
+        "node_modules/@protobufjs/utf8": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+            "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+        },
         "node_modules/@react-dnd/asap": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
@@ -7755,6 +7817,14 @@
                 "@types/ms": "*"
             }
         },
+        "node_modules/@types/dompurify": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.4.0.tgz",
+            "integrity": "sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==",
+            "dependencies": {
+                "@types/trusted-types": "*"
+            }
+        },
         "node_modules/@types/es-aggregate-error": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.6.tgz",
@@ -8048,6 +8118,14 @@
             "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
             "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
         },
+        "node_modules/@types/protocol-buffers-schema": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/@types/protocol-buffers-schema/-/protocol-buffers-schema-3.4.3.tgz",
+            "integrity": "sha512-8cCg6BiIj4jS0LXUFq3sndmd46yyPLYqMzvXLcTM1MRubh3sfZlQiehoCjGDxSHTqGSjjx8EtVNryIAl0njQWg==",
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
         "node_modules/@types/ramda": {
             "version": "0.29.10",
             "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.29.10.tgz",
@@ -8103,14 +8181,6 @@
                 "@types/react": "*"
             }
         },
-        "node_modules/@types/react-wait": {
-            "version": "0.3.6",
-            "resolved": "https://registry.npmjs.org/@types/react-wait/-/react-wait-0.3.6.tgz",
-            "integrity": "sha512-85d0CwgMtD1R71PTIDl93VXtrrB8Qcad8fTBKWUkJyXs6RreCkY4j1ciEwv48lShtO9yPAP8N1WN2/O1QUNniw==",
-            "dependencies": {
-                "@types/react": "*"
-            }
-        },
         "node_modules/@types/scheduler": {
             "version": "0.16.8",
             "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
@@ -8185,6 +8255,11 @@
             "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
             "dev": true
         },
+        "node_modules/@types/trusted-types": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+            "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
+        },
         "node_modules/@types/type-is": {
             "version": "1.6.6",
             "resolved": "https://registry.npmjs.org/@types/type-is/-/type-is-1.6.6.tgz",
@@ -8775,8 +8850,7 @@
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
             "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-            "deprecated": "Use your platform's native atob() and btoa() methods instead",
-            "dev": true
+            "deprecated": "Use your platform's native atob() and btoa() methods instead"
         },
         "node_modules/abort-controller": {
             "version": "3.0.0",
@@ -8864,7 +8938,6 @@
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
             "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "dev": true,
             "dependencies": {
                 "debug": "4"
             },
@@ -9100,11 +9173,6 @@
             "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
             "dev": true
         },
-        "node_modules/array-ify": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
-            "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng=="
-        },
         "node_modules/array-includes": {
             "version": "3.1.7",
             "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
@@ -10267,6 +10335,11 @@
             "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
             "dev": true
         },
+        "node_modules/browser-process-hrtime": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+            "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+        },
         "node_modules/browserify-aes": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
@@ -10915,14 +10988,6 @@
                 "node": ">= 0.12.0"
             }
         },
-        "node_modules/code-error-fragment": {
-            "version": "0.0.230",
-            "resolved": "https://registry.npmjs.org/code-error-fragment/-/code-error-fragment-0.0.230.tgz",
-            "integrity": "sha512-cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw==",
-            "engines": {
-                "node": ">= 4"
-            }
-        },
         "node_modules/collect-v8-coverage": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
@@ -10996,15 +11061,6 @@
             "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
             "dev": true
         },
-        "node_modules/compare-func": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
-            "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
-            "dependencies": {
-                "array-ify": "^1.0.0",
-                "dot-prop": "^5.1.0"
-            }
-        },
         "node_modules/component-emitter": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
@@ -11239,19 +11295,6 @@
                 "node": ">= 0.6"
             }
         },
-        "node_modules/conventional-changelog-conventionalcommits": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz",
-            "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==",
-            "dependencies": {
-                "compare-func": "^2.0.0",
-                "lodash": "^4.17.15",
-                "q": "^1.5.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/convert-source-map": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -11866,7 +11909,6 @@
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
             "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-            "dev": true,
             "dependencies": {
                 "cssom": "~0.3.6"
             },
@@ -11877,8 +11919,7 @@
         "node_modules/cssstyle/node_modules/cssom": {
             "version": "0.3.8",
             "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-            "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-            "dev": true
+            "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
         },
         "node_modules/csstype": {
             "version": "3.1.3",
@@ -11993,8 +12034,7 @@
         "node_modules/decimal.js": {
             "version": "10.4.3",
             "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-            "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-            "dev": true
+            "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
         },
         "node_modules/decode-named-character-reference": {
             "version": "1.0.2",
@@ -12603,17 +12643,6 @@
                 "tslib": "^2.0.3"
             }
         },
-        "node_modules/dot-prop": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-            "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-            "dependencies": {
-                "is-obj": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/downshift": {
             "version": "6.1.12",
             "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.12.tgz",
@@ -13083,7 +13112,6 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
             "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-            "dev": true,
             "dependencies": {
                 "esprima": "^4.0.1",
                 "estraverse": "^5.2.0",
@@ -13104,7 +13132,6 @@
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
             "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
             "optional": true,
             "engines": {
                 "node": ">=0.10.0"
@@ -13842,7 +13869,6 @@
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
             "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -15217,11 +15243,6 @@
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
             "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
         },
-        "node_modules/grapheme-splitter": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-            "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
-        },
         "node_modules/graphql": {
             "version": "15.8.0",
             "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz",
@@ -16123,7 +16144,6 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
             "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-            "dev": true,
             "dependencies": {
                 "agent-base": "6",
                 "debug": "4"
@@ -16163,7 +16183,6 @@
             "version": "0.4.24",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
             "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-            "dev": true,
             "dependencies": {
                 "safer-buffer": ">= 2.1.2 < 3"
             },
@@ -16937,14 +16956,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-obj": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-            "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/is-path-cwd": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -17001,8 +17012,7 @@
         "node_modules/is-potential-custom-element-name": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-            "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-            "dev": true
+            "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
         },
         "node_modules/is-regex": {
             "version": "1.1.4",
@@ -17200,6 +17210,275 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/isomorphic-dompurify": {
+            "version": "0.13.0",
+            "resolved": "https://registry.npmjs.org/isomorphic-dompurify/-/isomorphic-dompurify-0.13.0.tgz",
+            "integrity": "sha512-j2/kt/PGbxvfeEm1uiRLlttZkQdn3hFe1rMr/wm3qFnMXSIw0Nmqu79k+TIoSj+KOwO98Sz9TbuNHU7ejv7IZA==",
+            "dependencies": {
+                "@types/dompurify": "^2.1.0",
+                "dompurify": "^2.2.7",
+                "jsdom": "^16.5.2"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/@tootallnate/once": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/acorn": {
+            "version": "8.11.3",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+            "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/acorn-globals": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+            "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+            "dependencies": {
+                "acorn": "^7.1.1",
+                "acorn-walk": "^7.1.1"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/acorn-globals/node_modules/acorn": {
+            "version": "7.4.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/acorn-walk": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+            "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/cssom": {
+            "version": "0.4.4",
+            "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+            "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+        },
+        "node_modules/isomorphic-dompurify/node_modules/data-urls": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+            "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+            "dependencies": {
+                "abab": "^2.0.3",
+                "whatwg-mimetype": "^2.3.0",
+                "whatwg-url": "^8.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/domexception": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+            "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+            "deprecated": "Use your platform's native DOMException instead",
+            "dependencies": {
+                "webidl-conversions": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/domexception/node_modules/webidl-conversions": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+            "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/form-data": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+            "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/html-encoding-sniffer": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+            "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+            "dependencies": {
+                "whatwg-encoding": "^1.0.5"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/http-proxy-agent": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+            "dependencies": {
+                "@tootallnate/once": "1",
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/jsdom": {
+            "version": "16.7.0",
+            "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+            "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+            "dependencies": {
+                "abab": "^2.0.5",
+                "acorn": "^8.2.4",
+                "acorn-globals": "^6.0.0",
+                "cssom": "^0.4.4",
+                "cssstyle": "^2.3.0",
+                "data-urls": "^2.0.0",
+                "decimal.js": "^10.2.1",
+                "domexception": "^2.0.1",
+                "escodegen": "^2.0.0",
+                "form-data": "^3.0.0",
+                "html-encoding-sniffer": "^2.0.1",
+                "http-proxy-agent": "^4.0.1",
+                "https-proxy-agent": "^5.0.0",
+                "is-potential-custom-element-name": "^1.0.1",
+                "nwsapi": "^2.2.0",
+                "parse5": "6.0.1",
+                "saxes": "^5.0.1",
+                "symbol-tree": "^3.2.4",
+                "tough-cookie": "^4.0.0",
+                "w3c-hr-time": "^1.0.2",
+                "w3c-xmlserializer": "^2.0.0",
+                "webidl-conversions": "^6.1.0",
+                "whatwg-encoding": "^1.0.5",
+                "whatwg-mimetype": "^2.3.0",
+                "whatwg-url": "^8.5.0",
+                "ws": "^7.4.6",
+                "xml-name-validator": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "canvas": "^2.5.0"
+            },
+            "peerDependenciesMeta": {
+                "canvas": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/saxes": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+            "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+            "dependencies": {
+                "xmlchars": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/tr46": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+            "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+            "dependencies": {
+                "punycode": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/w3c-xmlserializer": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+            "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+            "dependencies": {
+                "xml-name-validator": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/webidl-conversions": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+            "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+            "engines": {
+                "node": ">=10.4"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/whatwg-encoding": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+            "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+            "dependencies": {
+                "iconv-lite": "0.4.24"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/whatwg-mimetype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+            "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+        },
+        "node_modules/isomorphic-dompurify/node_modules/whatwg-url": {
+            "version": "8.7.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+            "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+            "dependencies": {
+                "lodash": "^4.7.0",
+                "tr46": "^2.1.0",
+                "webidl-conversions": "^6.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/ws": {
+            "version": "7.5.9",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+            "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+            "engines": {
+                "node": ">=8.3.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": "^5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/isomorphic-dompurify/node_modules/xml-name-validator": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+            "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+        },
         "node_modules/isomorphic-fetch": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
@@ -21151,18 +21430,6 @@
             "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
             "dev": true
         },
-        "node_modules/json-to-ast": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/json-to-ast/-/json-to-ast-2.1.0.tgz",
-            "integrity": "sha512-W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ==",
-            "dependencies": {
-                "code-error-fragment": "0.0.230",
-                "grapheme-splitter": "^1.0.4"
-            },
-            "engines": {
-                "node": ">= 4"
-            }
-        },
         "node_modules/json5": {
             "version": "2.2.3",
             "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -21382,14 +21649,6 @@
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
             "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
         },
-        "node_modules/linkify-it": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-            "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-            "dependencies": {
-                "uc.micro": "^1.0.1"
-            }
-        },
         "node_modules/liquid-json": {
             "version": "0.3.1",
             "resolved": "https://registry.npmjs.org/liquid-json/-/liquid-json-0.3.1.tgz",
@@ -21684,6 +21943,11 @@
                 "url": "https://tidelift.com/funding/github/npm/loglevel"
             }
         },
+        "node_modules/long": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+            "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
+        },
         "node_modules/longest-streak": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
@@ -21829,34 +22093,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/markdown-it": {
-            "version": "12.3.2",
-            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-            "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-            "dependencies": {
-                "argparse": "^2.0.1",
-                "entities": "~2.1.0",
-                "linkify-it": "^3.0.1",
-                "mdurl": "^1.0.1",
-                "uc.micro": "^1.0.5"
-            },
-            "bin": {
-                "markdown-it": "bin/markdown-it.js"
-            }
-        },
-        "node_modules/markdown-it/node_modules/argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "node_modules/markdown-it/node_modules/entities": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-            "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
-            }
-        },
         "node_modules/markdown-table": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.3.tgz",
@@ -21866,6 +22102,17 @@
                 "url": "https://github.com/sponsors/wooorm"
             }
         },
+        "node_modules/marked": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+            "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+            "bin": {
+                "marked": "bin/marked.js"
+            },
+            "engines": {
+                "node": ">= 12"
+            }
+        },
         "node_modules/match-sorter": {
             "version": "6.3.4",
             "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.4.tgz",
@@ -22232,11 +22479,6 @@
                 "safe-buffer": "~5.1.0"
             }
         },
-        "node_modules/merge": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
-            "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
-        },
         "node_modules/merge-descriptors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -23707,8 +23949,7 @@
         "node_modules/nwsapi": {
             "version": "2.2.7",
             "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-            "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
-            "dev": true
+            "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
         },
         "node_modules/oauth-sign": {
             "version": "0.9.0",
@@ -25642,6 +25883,29 @@
                 "url": "https://github.com/sponsors/wooorm"
             }
         },
+        "node_modules/protobufjs": {
+            "version": "7.2.6",
+            "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz",
+            "integrity": "sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@protobufjs/aspromise": "^1.1.2",
+                "@protobufjs/base64": "^1.1.2",
+                "@protobufjs/codegen": "^2.0.4",
+                "@protobufjs/eventemitter": "^1.1.0",
+                "@protobufjs/fetch": "^1.1.0",
+                "@protobufjs/float": "^1.0.2",
+                "@protobufjs/inquire": "^1.1.0",
+                "@protobufjs/path": "^1.1.2",
+                "@protobufjs/pool": "^1.1.0",
+                "@protobufjs/utf8": "^1.1.0",
+                "@types/node": ">=13.7.0",
+                "long": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
         "node_modules/proxy-addr": {
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -25669,8 +25933,7 @@
         "node_modules/psl": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-            "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-            "dev": true
+            "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
         },
         "node_modules/public-encrypt": {
             "version": "4.0.3",
@@ -25726,15 +25989,6 @@
                 }
             ]
         },
-        "node_modules/q": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-            "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
-            "engines": {
-                "node": ">=0.6.0",
-                "teleport": ">=0.2.0"
-            }
-        },
         "node_modules/qs": {
             "version": "6.11.2",
             "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
@@ -26786,14 +27040,6 @@
                 "csstype": "^3.0.2"
             }
         },
-        "node_modules/react-wait": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/react-wait/-/react-wait-0.3.0.tgz",
-            "integrity": "sha512-kB5x/kMKWcn0uVr9gBdNz21/oGbQwEQnF3P9p6E9yLfJ9DRcKS0fagbgYMFI0YFOoyKDj+2q6Rwax0kTYJF37g==",
-            "peerDependencies": {
-                "react": ">=16.7.0-alpha"
-            }
-        },
         "node_modules/readable-stream": {
             "version": "3.6.2",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -29716,8 +29962,7 @@
         "node_modules/symbol-tree": {
             "version": "3.2.4",
             "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-            "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-            "dev": true
+            "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
         },
         "node_modules/tabbable": {
             "version": "6.2.0",
@@ -29965,11 +30210,6 @@
             "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
             "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="
         },
-        "node_modules/tiny-merge-patch": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/tiny-merge-patch/-/tiny-merge-patch-0.1.2.tgz",
-            "integrity": "sha512-NLoA//tTMBPTr0oGdq+fxnvVR0tDa8tOcG9ZGbuovGzROadZ404qOV4g01jeWa5S8MC9nAOvu5bQgCW7s8tlWQ=="
-        },
         "node_modules/tiny-warning": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
@@ -30083,7 +30323,6 @@
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
             "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-            "dev": true,
             "dependencies": {
                 "psl": "^1.1.33",
                 "punycode": "^2.1.1",
@@ -30098,7 +30337,6 @@
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
             "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-            "dev": true,
             "engines": {
                 "node": ">= 4.0.0"
             }
@@ -31362,6 +31600,15 @@
                 "url": "https://opencollective.com/unified"
             }
         },
+        "node_modules/w3c-hr-time": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+            "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+            "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+            "dependencies": {
+                "browser-process-hrtime": "^1.0.0"
+            }
+        },
         "node_modules/w3c-xmlserializer": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
@@ -32840,8 +33087,7 @@
         "node_modules/xmlchars": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-            "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-            "dev": true
+            "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
         },
         "node_modules/xtend": {
             "version": "4.0.2",
@@ -32874,11 +33120,6 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/yaml-ast-parser": {
-            "version": "0.0.43",
-            "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-            "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A=="
-        },
         "node_modules/yargs": {
             "version": "16.2.0",
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
diff --git a/portals/publisher/src/main/webapp/package.json b/portals/publisher/src/main/webapp/package.json
index d5bc30c53ec..c2f227c5698 100644
--- a/portals/publisher/src/main/webapp/package.json
+++ b/portals/publisher/src/main/webapp/package.json
@@ -31,8 +31,8 @@
     "dependencies": {
         "@apidevtools/json-schema-ref-parser": "^9.1.0",
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@asyncapi/parser": "1.17.2",
-        "@asyncapi/react-component": "^0.24.23",
+        "@asyncapi/parser": "^3.0.10",
+        "@asyncapi/react-component": "^1.4.0",
         "@dnd-kit/core": "^6.0.8",
         "@dnd-kit/sortable": "^7.0.2",
         "@dnd-kit/utilities": "^3.2.1",
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/APIDefinition/APIDefinition.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/APIDefinition/APIDefinition.jsx
index c4d46685452..99e878b86ac 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/APIDefinition/APIDefinition.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/APIDefinition/APIDefinition.jsx
@@ -202,8 +202,10 @@ class APIDefinition extends React.Component {
             promisedApi = api.getSwagger(api.id);
         }
 
-        this.setState({ securityAuditProperties: settings.securityAuditProperties });
-
+        if (settings) {
+            this.setState({ securityAuditProperties: settings.securityAuditProperties });
+        }
+        
         promisedApi
             .then((response) => {
                 if (api.type === 'GRAPHQL') {
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/APIDefinition/asyncApiUI/AsyncApiUI.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/APIDefinition/asyncApiUI/AsyncApiUI.jsx
index 4eb5b239de9..00e44ddffdc 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/APIDefinition/asyncApiUI/AsyncApiUI.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/APIDefinition/asyncApiUI/AsyncApiUI.jsx
@@ -1,13 +1,41 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import React from 'react';
+import { styled } from '@mui/material/styles';
 import AsyncApiComponent from '@asyncapi/react-component';
-import '@asyncapi/react-component/lib/styles/fiori.css';
-// import './styles.css';
+import "@asyncapi/react-component/styles/default.min.css";
+
+const Root = styled('div')(({ theme }) => ({
+    '&': {
+        fontFamily: theme.typography.fontFamily,
+    }
+}));
 
 const AsyncApiUI = (props) => {
     const {
         spec,
     } = props;
-    return <AsyncApiComponent schema={spec} />;
+    return (
+        <Root>
+            <AsyncApiComponent schema={spec} />
+        </Root>
+    )
 };
 
 export default AsyncApiUI;
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Topics.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Topics.jsx
index 87c1b936b22..61d7c4032c4 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Topics.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Topics.jsx
@@ -162,7 +162,7 @@ class Topics extends React.Component {
                                     <div className={classes.root}>
                                         <Grid container spacing={1}>
                                             <Grid item xs={12}>
-                                                <Grid container direction='row' spacing={1}>
+                                                <Grid container direction='row' spacing={1} sx={{ mb: 1 }}>
                                                     <Grid item>
                                                         <VerbElement verb={topic.type.substr(0, 3)} />
                                                     </Grid>
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/index.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/index.jsx
index 3c4eabbe37f..0f5259cd265 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/index.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/index.jsx
@@ -443,8 +443,8 @@ class Details extends Component {
                                 id: 'Apis.Details.index.asyncApi.definition',
                                 defaultMessage: 'AsyncAPI Definition',
                             })}
-                            route='asyncApi definition'
-                            to={pathPrefix + 'asyncApi definition'}
+                            route='asyncApi-definition'
+                            to={pathPrefix + 'asyncApi-definition'}
                             Icon={<CodeIcon />}
                         />
                     </>
@@ -1093,7 +1093,7 @@ Details.subPaths = {
     TRYOUT_PRODUCT: '/api-products/:apiprod_uuid/test-console',
     QUERYANALYSIS: '/apis/:api_uuid/queryanalysis',
     TOPICS: '/apis/:api_uuid/topics',
-    ASYNCAPI_DEFINITION: '/apis/:api_uuid/asyncApi definition',
+    ASYNCAPI_DEFINITION: '/apis/:api_uuid/asyncApi-definition',
     POLICIES: '/apis/:api_uuid/policies',
 };
 

From 80ed53f4af8dcdc8e7c6e2c4fb1409eb578082c9 Mon Sep 17 00:00:00 2001
From: BLasan <benuraab@gmail.com>
Date: Tue, 19 Mar 2024 17:08:16 +0530
Subject: [PATCH 15/42] Fix: Doc type issue

---
 .../main/webapp/site/public/locales/en.json   |   6 +
 .../webapp/site/public/locales/raw.en.json    |   3 +
 .../Apis/Details/Documents/CreateEditForm.jsx | 136 +++++++++++-------
 3 files changed, 95 insertions(+), 50 deletions(-)

diff --git a/portals/publisher/src/main/webapp/site/public/locales/en.json b/portals/publisher/src/main/webapp/site/public/locales/en.json
index 5c021ca03e2..0ed0a902a7d 100644
--- a/portals/publisher/src/main/webapp/site/public/locales/en.json
+++ b/portals/publisher/src/main/webapp/site/public/locales/en.json
@@ -2613,6 +2613,12 @@
       "value": "Provide the document type"
     }
   ],
+  "Apis.Details.Documents.CreateEditForm.document.create.type.other.error.document.category.helper.text": [
+    {
+      "type":0,
+      "value": "Document type cannot be empty"
+    }
+  ],
   "Apis.Details.Documents.CreateEditForm.document.create.type.public.forum": [
     {
       "type": 0,
diff --git a/portals/publisher/src/main/webapp/site/public/locales/raw.en.json b/portals/publisher/src/main/webapp/site/public/locales/raw.en.json
index 9659d8b1444..563c2a5d541 100644
--- a/portals/publisher/src/main/webapp/site/public/locales/raw.en.json
+++ b/portals/publisher/src/main/webapp/site/public/locales/raw.en.json
@@ -1203,6 +1203,9 @@
   "Apis.Details.Documents.CreateEditForm.document.create.type.other.document.category.helper.text": {
     "defaultMessage": "Provide the document type"
   },
+  "Apis.Details.Documents.CreateEditForm.document.create.type.other.error.document.category.helper.text": {
+    "defaultMessage": "Document type cannot be empty"
+  },
   "Apis.Details.Documents.CreateEditForm.document.create.type.public.forum": {
     "defaultMessage": "Public Forum"
   },
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/CreateEditForm.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/CreateEditForm.jsx
index 80db7ea0c54..a6de815e115 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/CreateEditForm.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Documents/CreateEditForm.jsx
@@ -166,12 +166,13 @@ class CreateEditForm extends React.Component {
             sourceUrl: '',
             file: null,
             disableName: false,
-            otherTypeName: null,
+            otherTypeName: '',
             nameNotDuplicate: true,
             nameMaxLengthExceeds: false,
             invalidUrl: false,
             nameEmpty: false,
             summeryEmpty: false,
+            otherTypeEmpty: false,
             urlEmpty: false,
             invalidDocName: false,
             visibility: 'API_LEVEL'
@@ -198,6 +199,7 @@ class CreateEditForm extends React.Component {
             }
         }
     };
+
     handleChange = name => (e) => {
         const { value } = e.target;
         if (name === 'name') {
@@ -208,7 +210,7 @@ class CreateEditForm extends React.Component {
             this.setState({ sourceUrl: value });
         } else if (name === 'otherTypeName') {
             this.setState({ otherTypeName: value });
-        }else if (name === 'visibility') {
+        } else if (name === 'visibility') {
             this.setState({ visibility: value });
         }
     };
@@ -245,6 +247,7 @@ class CreateEditForm extends React.Component {
         });
         return { docPromise, file };
     };
+
     updateDocument = (apiId) => {
         const { apiType } = this.props;
         const restAPI = apiType === Api.CONSTS.APIProduct ? new APIProduct() : new Api();
@@ -264,6 +267,7 @@ class CreateEditForm extends React.Component {
         });
         return { docPromise, file };
     };
+
     getDocument() {
         const { apiId, docId, apiType } = this.props;
         const restAPI = apiType === Api.CONSTS.APIProduct ? new APIProduct() : new Api();
@@ -295,6 +299,7 @@ class CreateEditForm extends React.Component {
                 });
         }
     }
+
     validate(field=null, value=null) {
         let invalidUrl = false;
         if (field === 'url') {
@@ -311,17 +316,17 @@ class CreateEditForm extends React.Component {
                 if (nameValidity === null) {
                     this.setState({ invalidDocName: false });
                     const promise = APIValidation.apiDocument.validate({ id: this.props.apiId, name: value });
-                        promise
-                            .then((isDocumentPresent) => {
-                                this.setState({ nameNotDuplicate: !isDocumentPresent });
-                            })
-                            .catch((error) => {
-                                if (error.status === 404) {
-                                    this.setState({ nameNotDuplicate: true });
-                                } else {
-                                    Alert.error('Error when validating document name');
-                                }
-                            });
+                    promise
+                        .then((isDocumentPresent) => {
+                            this.setState({ nameNotDuplicate: !isDocumentPresent });
+                        })
+                        .catch((error) => {
+                            if (error.status === 404) {
+                                this.setState({ nameNotDuplicate: true });
+                            } else {
+                                Alert.error('Error when validating document name');
+                            }
+                        });
                 } else {
                     this.setState({ invalidDocName: true });
                 }
@@ -342,8 +347,15 @@ class CreateEditForm extends React.Component {
             } else {
                 this.setState({ summeryEmpty: false });
             }
+        } else if (field === 'otherTypeName') {
+            if (value === '') {
+                this.setState({ otherTypeEmpty: true });
+            } else {
+                this.setState({ otherTypeEmpty: false });
+            }
         }
     }
+
     componentDidMount() {
         this.getDocument();
         const { apiId, docId } = this.props;
@@ -351,6 +363,7 @@ class CreateEditForm extends React.Component {
             this.setState({ disableName: true });
         }
     }
+
     showNameHelper() {
         const { nameEmpty, nameNotDuplicate, nameMaxLengthExceeds, invalidDocName } = this.state;
         if (nameMaxLengthExceeds) {
@@ -390,6 +403,7 @@ class CreateEditForm extends React.Component {
             );
         }
     }
+
     getUrlHelperText() {
         const { invalidUrl, urlEmpty} = this.state;
 
@@ -416,6 +430,7 @@ class CreateEditForm extends React.Component {
             );
         }
     }
+
     render() {
         const {
             name,
@@ -432,6 +447,7 @@ class CreateEditForm extends React.Component {
             nameEmpty,
             invalidDocName,
             summeryEmpty,
+            otherTypeEmpty,
             urlEmpty,
             visibility
         } = this.state;
@@ -440,6 +456,7 @@ class CreateEditForm extends React.Component {
         if (
             name !== '' &&
             summary !== '' &&
+            (otherTypeName !== '' && type === 'OTHER') &&
             nameNotDuplicate &&
             !nameMaxLengthExceeds &&
             !invalidDocName &&
@@ -527,18 +544,18 @@ class CreateEditForm extends React.Component {
                 </FormControl>
                 {settingsContext.docVisibilityEnabled && 
                 <FormControl margin='normal' className={classes.FormControlOdd}>
-                <TextField
-                    fullWidth
-                    id='docVisibility-selector'
-                    select
-                    variant='outlined'
-                    label={
+                    <TextField
+                        fullWidth
+                        id='docVisibility-selector'
+                        select
+                        variant='outlined'
+                        label={
                         <FormattedMessage
                             id='Apis.Details.Documents.CreateEditForm.document.docVisibility'
                             defaultMessage='Document Visibility'
                         />
                     }
-                    helperText={
+                        helperText={
                         summeryEmpty ? (
                             <FormattedMessage
                                 id='Apis.Details.Documents.CreateEditForm.document.summary.error.empty'
@@ -551,33 +568,33 @@ class CreateEditForm extends React.Component {
                             />
                         )
                     }
-                    type='text'
-                    name='visibility'
-                    margin='normal'
-                    value={visibility}
-                    onChange={this.handleChange('visibility')}
-                    error={summeryEmpty}
+                        type='text'
+                        name='visibility'
+                        margin='normal'
+                        value={visibility}
+                        onChange={this.handleChange('visibility')}
+                        error={summeryEmpty}
                 >
-                    <MenuItem value='API_LEVEL'>
-                        <FormattedMessage
-                            id='Apis.Details.Documents.CreateEditForm.document.docVisibility.dropdown.public'
-                            defaultMessage='Same as API Visibility'
+                        <MenuItem value='API_LEVEL'>
+                            <FormattedMessage
+                                id='Apis.Details.Documents.CreateEditForm.document.docVisibility.dropdown.public'
+                                defaultMessage='Same as API Visibility'
                         />
-                    </MenuItem>
-                    <MenuItem value='PRIVATE'>
-                        <FormattedMessage
-                            id='Apis.Details.Documents.CreateEditForm.document.docVisibility.dropdown.private'
-                            defaultMessage='Private'
+                        </MenuItem>
+                        <MenuItem value='PRIVATE'>
+                            <FormattedMessage
+                                id='Apis.Details.Documents.CreateEditForm.document.docVisibility.dropdown.private'
+                                defaultMessage='Private'
                         />
-                    </MenuItem>
-                    <MenuItem value='OWNER_ONLY'>
-                        <FormattedMessage
-                            id='Apis.Details.Documents.CreateEditForm.document.docVisibility.dropdown.ownerOnly'
-                            defaultMessage='Owner Only'
+                        </MenuItem>
+                        <MenuItem value='OWNER_ONLY'>
+                            <FormattedMessage
+                                id='Apis.Details.Documents.CreateEditForm.document.docVisibility.dropdown.ownerOnly'
+                                defaultMessage='Owner Only'
                         />
-                    </MenuItem>
-                </TextField>
-            </FormControl>}
+                        </MenuItem>
+                    </TextField>
+                </FormControl>}
                 <FormControl component='fieldset' className={classes.formControlFirst}>
                     <FormLabel component='legend'>
                         <FormattedMessage
@@ -681,6 +698,14 @@ class CreateEditForm extends React.Component {
                     <FormControl margin='normal' className={classes.FormControlOdd}>
                         <TextField
                             fullWidth
+                            InputProps={{
+                                onBlur: ({ target: { value } }) => {
+                                    this.validate('otherTypeName', value);
+                                },
+                                onKeyUp: ({ target: { value } }) => {
+                                    this.validate('otherTypeName', value);
+                                },
+                            }}
                             label={
                                 <FormattedMessage
                                     id={
@@ -691,19 +716,30 @@ class CreateEditForm extends React.Component {
                                 />
                             }
                             helperText={
-                                <FormattedMessage
-                                    id={
-                                        'Apis.Details.Documents.CreateEditForm.document.create.type.other.document.' +
-                                        'category.helper.text'
-                                    }
-                                    defaultMessage='Provide the document type'
-                                />
+                                otherTypeEmpty ? (
+                                    <FormattedMessage
+                                        id={
+                                            'Apis.Details.Documents.CreateEditForm.document.create.type.other.error.document.' +
+                                            'category.helper.text'
+                                        }
+                                        defaultMessage='Document type cannot be empty'
+                                    />
+                                ) : (
+                                    <FormattedMessage
+                                        id={
+                                            'Apis.Details.Documents.CreateEditForm.document.create.type.other.document.' +
+                                            'category.helper.text'
+                                        }
+                                        defaultMessage='Provide the document type'
+                                    />
+                                )
                             }
                             type='text'
                             id='other-doc-type'
                             name='otherTypeName'
                             margin='normal'
                             value={otherTypeName}
+                            error={otherTypeEmpty}
                             variant='outlined'
                             onChange={this.handleChange('otherTypeName')}
                             InputLabelProps={{

From 3da2d04e4cf83a78c4b2e84d001bb673a4ff98d3 Mon Sep 17 00:00:00 2001
From: BLasan <benuraab@gmail.com>
Date: Wed, 20 Mar 2024 14:28:44 +0530
Subject: [PATCH 16/42] Remove: APIKey Header customization

---
 .../Configuration/components/ApiKeyHeader.jsx | 111 +++++++++---------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/ApiKeyHeader.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/ApiKeyHeader.jsx
index aeb3e867170..851a41a94e3 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/ApiKeyHeader.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/ApiKeyHeader.jsx
@@ -39,6 +39,7 @@ import APIValidation from 'AppData/APIValidation';
 export default function ApiKeyHeader(props) {
     const { api, configDispatcher } = props;
     const [apiFromContext] = useAPI();
+    const isRestAPI = apiFromContext.type==="HTTP";
     const [isHeaderNameValid, setIsHeaderNameValid] = useState(true);
     let hasResourceWithSecurity;
     const apiKeyHeaderValue = api.apiKeyHeader;
@@ -73,63 +74,65 @@ export default function ApiKeyHeader(props) {
         }
     }
 
-    return (
-        <Grid container spacing={1} alignItems='center'>
-            <Grid item xs={11}>
-                <TextField
-                    disabled={isRestricted(['apim:api_create'], apiFromContext) || !hasResourceWithSecurity}
-                    id='outlined-name'
-                    label={(
-                        <FormattedMessage
-                            id='Apis.Details.Configuration.Configuration.apiKey.header.label'
-                            defaultMessage='ApiKey Header'
-                        />
-                    )}
-                    value={hasResourceWithSecurity ? apiKeyHeaderValue : ' '}
-                    error={!isHeaderNameValid}
-                    helperText={
-                        (!isHeaderNameValid)
-                        && (
+    if(isRestAPI){
+        return (
+            <Grid container spacing={1} alignItems='center'>
+                <Grid item xs={11}>
+                    <TextField
+                        disabled={isRestricted(['apim:api_create'], apiFromContext) || !hasResourceWithSecurity}
+                        id='outlined-name'
+                        label={(
                             <FormattedMessage
-                                id='Apis.Details.Configuration.ApiKeyHeader.helper.text'
-                                defaultMessage='ApiKey header name cannot contain spaces or special characters'
+                                id='Apis.Details.Configuration.Configuration.apiKey.header.label'
+                                defaultMessage='ApiKey Header'
                             />
-                        )
-                    }
-                    InputProps={{
-                        id: 'itest-id-apiKeyHeaderName-input',
-                        onBlur: ({ target: { value } }) => {
-                            validateHeader(value);
-                        },
-                    }}
-                    margin='normal'
-                    variant='outlined'
-                    onChange={({ target: { value } }) => configDispatcher({
-                        action: 'apiKeyHeader',
-                        value: value === '' ? 'ApiKey' : value })}
-                    style={{ display: 'flex' }}
-                />
-            </Grid>
-            <Grid item xs={1}>
-                <Tooltip
-                    title={(
-                        <FormattedMessage
-                            id='Apis.Details.Configuration.Configuration.ApiKeyHeader.tooltip'
-                            defaultMessage={
-                                ' The header name that is used to send the api key '
-                                + 'information. "ApiKey" is the default header.'
-                            }
-                        />
-                    )}
-                    aria-label='ApiKey Header'
-                    placement='right-end'
-                    interactive
-                >
-                    <HelpOutline />
-                </Tooltip>
+                        )}
+                        value={hasResourceWithSecurity ? apiKeyHeaderValue : ' '}
+                        error={!isHeaderNameValid}
+                        helperText={
+                            (!isHeaderNameValid)
+                            && (
+                                <FormattedMessage
+                                    id='Apis.Details.Configuration.ApiKeyHeader.helper.text'
+                                    defaultMessage='ApiKey header name cannot contain spaces or special characters'
+                                />
+                            )
+                        }
+                        InputProps={{
+                            id: 'itest-id-apiKeyHeaderName-input',
+                            onBlur: ({ target: { value } }) => {
+                                validateHeader(value);
+                            },
+                        }}
+                        margin='normal'
+                        variant='outlined'
+                        onChange={({ target: { value } }) => configDispatcher({
+                            action: 'apiKeyHeader',
+                            value: value === '' ? 'ApiKey' : value })}
+                        style={{ display: 'flex' }}
+                    />
+                </Grid>
+                <Grid item xs={1}>
+                    <Tooltip
+                        title={(
+                            <FormattedMessage
+                                id='Apis.Details.Configuration.Configuration.ApiKeyHeader.tooltip'
+                                defaultMessage={
+                                    ' The header name that is used to send the api key '
+                                    + 'information. "ApiKey" is the default header.'
+                                }
+                            />
+                        )}
+                        aria-label='ApiKey Header'
+                        placement='right-end'
+                        interactive
+                    >
+                        <HelpOutline />
+                    </Tooltip>
+                </Grid>
             </Grid>
-        </Grid>
-    );
+        );
+    }
 }
 
 ApiKeyHeader.propTypes = {

From 9da0fcee57597c9e3c95552bfc689f156ff31020 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Wed, 20 Mar 2024 14:19:11 +0530
Subject: [PATCH 17/42] Fix Service catalog view defintion page

---
 .../ServiceCatalog/Listing/Overview.jsx       | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/ServiceCatalog/Listing/Overview.jsx b/portals/publisher/src/main/webapp/source/src/app/components/ServiceCatalog/Listing/Overview.jsx
index 1c5c1054f9e..318e9ab68a0 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/ServiceCatalog/Listing/Overview.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/ServiceCatalog/Listing/Overview.jsx
@@ -88,12 +88,7 @@ const classes = {
     editorRoot: `${PREFIX}-editorRoot`
 };
 
-
-const Root = styled('div')((
-    {
-        theme
-    }
-) => ({
+const Root = styled('div')(({ theme }) => ({
     [`& .${classes.preview}`]: {
         height: theme.spacing(16),
         marginBottom: theme.spacing(3),
@@ -184,10 +179,6 @@ const Root = styled('div')((
         marginRight: theme.spacing(1),
     },
 
-    [`& .${classes.button}`]: {
-        marginLeft: theme.spacing(2),
-    },
-
     [`& .${classes.buttonIcon}`]: {
         marginRight: theme.spacing(1),
     },
@@ -195,6 +186,12 @@ const Root = styled('div')((
     [`& .${classes.downloadButtonSpacing}`]: {
         marginLeft: theme.spacing(1),
     },
+}));
+
+const StyledDialog = styled(Dialog)(({ theme }) => ({
+    [`& .${classes.button}`]: {
+        marginLeft: theme.spacing(2),
+    },
 
     [`& .${classes.editorPane}`]: {
         width: '50%',
@@ -624,12 +621,12 @@ function Overview(props) {
                                                         </Button>
                                                     </div>
                                                 </div>
-                                                <Dialog
+                                                <StyledDialog
                                                     fullScreen
                                                     open={openReadOnlyDefinition}
                                                     onClose={closeEditor}
                                                 >
-                                                    <Paper square className={classes.popupHeader}>
+                                                    <Paper square>
                                                         <IconButton
                                                             className={classes.button}
                                                             color='inherit'
@@ -679,7 +676,7 @@ function Overview(props) {
                                                             />
                                                         )}
                                                     </Suspense>
-                                                </Dialog>
+                                                </StyledDialog>
                                             </TableCell>
                                         </TableRow>
                                         <TableRow>

From 85b7fea8d2a12f1cdbfabf8684714563c9a261f1 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Wed, 20 Mar 2024 14:37:34 +0530
Subject: [PATCH 18/42] Enable eslinting

---
 .../app/components/Apis/Details/Environments/Environments.jsx    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
index c675141f8db..e158e1ca715 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
@@ -16,7 +16,6 @@
  * under the License.
  */
 
-/* eslint-disable */
 import React, { useContext, useEffect, useState } from 'react';
 import { styled } from '@mui/material/styles';
 import { APIContext } from 'AppComponents/Apis/Details/components/ApiContext';

From fb5f9540874f5ba76c5b84aeec0e3d708b4ab3e2 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 20 Mar 2024 09:15:53 +0000
Subject: [PATCH 19/42] [WSO2 Release] [Jenkins #799] [Release 9.1.13] prepare
 release v9.1.13

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 18b9c6c1328..07da063a7c4 100644
--- 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.1.13-SNAPSHOT</version>
+    <version>9.1.13</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.13</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index b4781207b69..3c938bf29a5 100644
--- 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.1.13-SNAPSHOT</version>
+        <version>9.1.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 4de898d3490..38ccc8fc7a7 100644
--- 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.1.13-SNAPSHOT</version>
+        <version>9.1.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index edc2ec603be..832033f2e37 100644
--- 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.1.13-SNAPSHOT</version>
+        <version>9.1.13</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.13-SNAPSHOT</version>
+    <version>9.1.13</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
index 14878f3470e..3cc195bbc50 100644
--- 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.1.13-SNAPSHOT</version>
+        <version>9.1.13</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 9b65440c19b4acfe6f930121764d8df801e4a242 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 20 Mar 2024 09:15:54 +0000
Subject: [PATCH 20/42] [WSO2 Release] [Jenkins #799] [Release 9.1.13] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 07da063a7c4..8c33d43c8ee 100644
--- 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.1.13</version>
+    <version>9.1.14-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.13</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 3c938bf29a5..b463ba4c704 100644
--- 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.1.13</version>
+        <version>9.1.14-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 38ccc8fc7a7..1822136a0ff 100644
--- 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.1.13</version>
+        <version>9.1.14-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 832033f2e37..89886527b63 100644
--- 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.1.13</version>
+        <version>9.1.14-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.13</version>
+    <version>9.1.14-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
index 3cc195bbc50..06edc0387f9 100644
--- 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.1.13</version>
+        <version>9.1.14-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 554a697f256e02f6270c33f917796da323667f30 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Wed, 20 Mar 2024 15:42:41 +0530
Subject: [PATCH 21/42] Fix openAPI validation errors

---
 .../OpenAPI/Steps/ValidationResults.tsx       | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Create/OpenAPI/Steps/ValidationResults.tsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Create/OpenAPI/Steps/ValidationResults.tsx
index 88894b64d60..fc51968259a 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Create/OpenAPI/Steps/ValidationResults.tsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Create/OpenAPI/Steps/ValidationResults.tsx
@@ -15,8 +15,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import React, { useState } from "react";
-import { styled } from '@mui/material/styles';
 import { Accordion, AccordionDetails, AccordionSummary, Box, CircularProgress, Grid, List, ListItem, 
     ListItemIcon, ListItemText, Typography } from '@mui/material';
 import { ExpandMore } from '@mui/icons-material';
@@ -26,19 +26,6 @@ import APILintingSummary from "AppComponents/Apis/Details/APIDefinition/Linting/
 import {  
     spectralSeverityMap as severityMap } from "../../../Details/APIDefinition/Linting/Linting"
 
-const PREFIX = 'ValidationResults';
-
-const classes = {
-    importDefinitionDialogHeader: `${PREFIX}-importDefinitionDialogHeader`
-};
-
-
-const Root = styled('div')(() => ({
-    [`& .${classes.importDefinitionDialogHeader}`]: {
-        fontWeight: 600,
-    }
-}));
-
 type APILintingProps = {
     inputValue: any,
     isValidating: boolean,
@@ -56,8 +43,8 @@ export default function ValidationResults(props: APILintingProps) {
 
 
     return (
-        (<Root>
-            <Grid item xs={10} md={11}>
+        (<>
+            <Grid item xs={10} md={12}>
                 <List>
                     {inputValue && isValidating && (
                         <ListItem>
@@ -84,7 +71,7 @@ export default function ValidationResults(props: APILintingProps) {
                 </List>
             </Grid>
             {!isValidating && validationErrors.length>0 && (
-                <Grid item xs={10} md={11}>
+                <Grid item xs={10} md={12}>
                     <Accordion
                         expanded={expandValidationErrors}
                         onChange={()=>{setExpandValidationErrors(!expandValidationErrors)}}>
@@ -94,7 +81,7 @@ export default function ValidationResults(props: APILintingProps) {
                             id='panel1bh-header'>
                             <Grid container direction='row' 
                                 justifyContent='space-between' alignItems='center'>
-                                <Typography className={classes.importDefinitionDialogHeader}>
+                                <Typography sx={{ fontWeight: 600 }}>
                                     <FormattedMessage
                                         id='Apis.Create.OpenAPI.Steps.ValidationResults.validation.errros'
                                         defaultMessage='Validation Errors'
@@ -126,8 +113,8 @@ export default function ValidationResults(props: APILintingProps) {
                 </Grid>
             )}
             {!isLinting && linterResults.length>0 && (
-                <Grid item xs={10} md={11}
-                    data-testid='itest-id-linter-results'>
+                <Grid item xs={10} md={12}
+                    data-testid='itest-id-linter-results' sx={{ pt: 2 }}>
                     <Accordion
                         expanded={expandLinterResults}
                         onChange={()=>{setExpandLinterResults(!expandLinterResults)}}>
@@ -137,7 +124,7 @@ export default function ValidationResults(props: APILintingProps) {
                             id='panel1bh-header'>
                             <Grid container direction='row' 
                                 justifyContent='space-between' alignItems='center'>
-                                <Typography className={classes.importDefinitionDialogHeader}>
+                                <Typography sx={{ fontWeight: 600 }}>
                                     <FormattedMessage
                                         id='Apis.Create.OpenAPI.Steps.ValidationResults.linter.results'
                                         defaultMessage='Linter Results'
@@ -166,10 +153,9 @@ export default function ValidationResults(props: APILintingProps) {
                                 } }
                             />
                         </AccordionDetails>
-                        
                     </Accordion>
                 </Grid>
             )}
-        </Root>)
+        </>)
     );
 }
\ No newline at end of file

From 2dc341fcf2a5ac705da60bffda14c251a4b2bc20 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 20 Mar 2024 14:49:19 +0000
Subject: [PATCH 22/42] [WSO2 Release] [Jenkins #801] [Release 9.1.14] prepare
 release v9.1.14

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c33d43c8ee..f6125677537 100644
--- 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.1.14-SNAPSHOT</version>
+    <version>9.1.14</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.14</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index b463ba4c704..6f8c599ab24 100644
--- 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.1.14-SNAPSHOT</version>
+        <version>9.1.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 1822136a0ff..f558ea15bd9 100644
--- 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.1.14-SNAPSHOT</version>
+        <version>9.1.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 89886527b63..7090b6b26b1 100644
--- 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.1.14-SNAPSHOT</version>
+        <version>9.1.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.14-SNAPSHOT</version>
+    <version>9.1.14</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
index 06edc0387f9..7484d1148b6 100644
--- 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.1.14-SNAPSHOT</version>
+        <version>9.1.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From f4f5289c531b6ea8d0058a901e5b29416ed97306 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 20 Mar 2024 14:49:20 +0000
Subject: [PATCH 23/42] [WSO2 Release] [Jenkins #801] [Release 9.1.14] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index f6125677537..5018b178c51 100644
--- 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.1.14</version>
+    <version>9.1.15-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.14</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 6f8c599ab24..d6f23009eec 100644
--- 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.1.14</version>
+        <version>9.1.15-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index f558ea15bd9..4aecca02ba7 100644
--- 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.1.14</version>
+        <version>9.1.15-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 7090b6b26b1..4b7c4e3242e 100644
--- 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.1.14</version>
+        <version>9.1.15-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.14</version>
+    <version>9.1.15-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
index 7484d1148b6..3e5fe68066d 100644
--- 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.1.14</version>
+        <version>9.1.15-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From ab3f0d450c4b27f656cc4a892b175f472c4e1aaa Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 20 Mar 2024 16:23:09 +0000
Subject: [PATCH 24/42] [WSO2 Release] [Jenkins #803] [Release 9.1.15] prepare
 release v9.1.15

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5018b178c51..5ba30542a07 100644
--- 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.1.15-SNAPSHOT</version>
+    <version>9.1.15</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.15</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index d6f23009eec..9febe4d928f 100644
--- 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.1.15-SNAPSHOT</version>
+        <version>9.1.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 4aecca02ba7..b19ab031be8 100644
--- 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.1.15-SNAPSHOT</version>
+        <version>9.1.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 4b7c4e3242e..46844eb3ac0 100644
--- 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.1.15-SNAPSHOT</version>
+        <version>9.1.15</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.15-SNAPSHOT</version>
+    <version>9.1.15</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
index 3e5fe68066d..1a3db0dd8e4 100644
--- 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.1.15-SNAPSHOT</version>
+        <version>9.1.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 5ef46eed7ffc0aacdf5d2647e442f697454289ec Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 20 Mar 2024 16:23:11 +0000
Subject: [PATCH 25/42] [WSO2 Release] [Jenkins #803] [Release 9.1.15] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5ba30542a07..600311e1387 100644
--- 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.1.15</version>
+    <version>9.1.16-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.15</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 9febe4d928f..a94a52f6f13 100644
--- 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.1.15</version>
+        <version>9.1.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index b19ab031be8..e1350369ea4 100644
--- 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.1.15</version>
+        <version>9.1.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 46844eb3ac0..13305b40d0a 100644
--- 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.1.15</version>
+        <version>9.1.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.15</version>
+    <version>9.1.16-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
index 1a3db0dd8e4..6029ea53e88 100644
--- 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.1.15</version>
+        <version>9.1.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 3a8333623dba21641dea95fc99ee978f6af6f374 Mon Sep 17 00:00:00 2001
From: Krishanx92 <krishan.wijesena@gmail.com>
Date: Thu, 21 Mar 2024 11:47:37 +0530
Subject: [PATCH 26/42] Add default business plan

---
 .../Apis/Create/OpenAPI/ApiCreateOpenAPI.jsx  |  2 +-
 .../components/ApplicationLevel.jsx           | 35 +++++++++----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Create/OpenAPI/ApiCreateOpenAPI.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Create/OpenAPI/ApiCreateOpenAPI.jsx
index afdfb473418..76c74eba38b 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Create/OpenAPI/ApiCreateOpenAPI.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Create/OpenAPI/ApiCreateOpenAPI.jsx
@@ -120,7 +120,7 @@ export default function ApiCreateOpenAPI(props) {
     function createAPI() {
         setCreating(true);
         const {
-            name, version, context, endpoint, gatewayType, policies, inputValue, inputType,
+            name, version, context, endpoint, gatewayType, policies = ["Unlimited"], inputValue, inputType,
         } = apiInputs;
         let defaultGatewayType;
         if (settings && settings.gatewayTypes.length === 1 && settings.gatewayTypes.includes('Regular')) {
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/APISecurity/components/ApplicationLevel.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/APISecurity/components/ApplicationLevel.jsx
index 7cf8cfe0add..4fe7113f21f 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/APISecurity/components/ApplicationLevel.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Configuration/components/APISecurity/components/ApplicationLevel.jsx
@@ -216,25 +216,22 @@ export default function ApplicationLevel(props) {
                                     label='Basic'
                                 />
                             )}
-                            {(apiFromContext.gatewayType === 'wso2/synapse' ||
-                                apiFromContext.apiType === API.CONSTS.APIProduct) && (
-                                <FormControlLabel
-                                    control={(
-                                        <Checkbox
-                                            checked={securityScheme.includes(API_SECURITY_API_KEY)}
-                                            disabled={isRestricted(['apim:api_create'], apiFromContext)}
-                                            onChange={({ target: { checked, value } }) => configDispatcher({
-                                                action: 'securityScheme',
-                                                event: { checked, value },
-                                            })}
-                                            value={API_SECURITY_API_KEY}
-                                            color='primary'
-                                            id='api-security-api-key-checkbox'
-                                        />
-                                    )}
-                                    label='Api Key'
-                                />
-                            )}
+                            <FormControlLabel
+                                control={(
+                                    <Checkbox
+                                        checked={securityScheme.includes(API_SECURITY_API_KEY)}
+                                        disabled={isRestricted(['apim:api_create'], apiFromContext)}
+                                        onChange={({ target: { checked, value } }) => configDispatcher({
+                                            action: 'securityScheme',
+                                            event: { checked, value },
+                                        })}
+                                        value={API_SECURITY_API_KEY}
+                                        color='primary'
+                                        id='api-security-api-key-checkbox'
+                                    />
+                                )}
+                                label='Api Key'
+                            />
                         </FormGroup>
                         <FormControl className={classes.bottomSpace} component='fieldset'>
                             <RadioGroup

From e52cf8502e43da746e53e008a279e7f542f08282 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Thu, 21 Mar 2024 12:53:23 +0530
Subject: [PATCH 27/42] Fix https://github.com/wso2/api-manager/issues/2640

---
 .../Apis/Details/Credentials/Credentials.jsx  | 15 ++++++++----
 .../Shared/AppsAndKeys/SubscribeToApi.jsx     | 23 ++++---------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/portals/devportal/src/main/webapp/source/src/app/components/Apis/Details/Credentials/Credentials.jsx b/portals/devportal/src/main/webapp/source/src/app/components/Apis/Details/Credentials/Credentials.jsx
index 18876896991..281aa2f579f 100755
--- a/portals/devportal/src/main/webapp/source/src/app/components/Apis/Details/Credentials/Credentials.jsx
+++ b/portals/devportal/src/main/webapp/source/src/app/components/Apis/Details/Credentials/Credentials.jsx
@@ -257,7 +257,16 @@ class Credentials extends React.Component {
         const { api, applicationsAvailable } = this.context;
         const { subscriptionRequest } = this.state;
         const newSubscriptionRequest = { ...subscriptionRequest, apiId: api.id };
-        const throttlingPolicyList = api.tiers;
+        const throttlingPolicyList = api.tiers.sort((a, b) => {
+            // Sort by 'COMMERCIAL' tier plan first
+            if (a.tierPlan === 'COMMERCIAL' && b.tierPlan !== 'COMMERCIAL') {
+                return -1;
+            } else if (a.tierPlan !== 'COMMERCIAL' && b.tierPlan === 'COMMERCIAL') {
+                return 1;
+            }
+            // For options within the same tier plan, sort alphabetically
+            return a.tierName.localeCompare(b.tierName);
+        });
         if (throttlingPolicyList && throttlingPolicyList[0]) {
             newSubscriptionRequest.throttlingPolicy = throttlingPolicyList[0].tierName;
         }
@@ -512,9 +521,7 @@ class Credentials extends React.Component {
                                                 applicationsAvailable={applicationsAvailable}
                                                 subscriptionRequest={subscriptionRequest}
                                                 throttlingPolicyList={throttlingPolicyList}
-                                                updateSubscriptionRequest={
-                                                    this.updateSubscriptionRequest
-                                                }
+                                                updateSubscriptionRequest={this.updateSubscriptionRequest}
                                                 renderSmall
                                             />
                                             <Button
diff --git a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/SubscribeToApi.jsx b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/SubscribeToApi.jsx
index f185b5d33b8..ee58f1c0a61 100755
--- a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/SubscribeToApi.jsx
+++ b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/SubscribeToApi.jsx
@@ -168,22 +168,9 @@ const subscribeToApi = (props) => {
         renderSmall,
     } = props;
 
-    let sortedThrottlingPolicyList = throttlingPolicyList;
-
     useEffect(() => {
-        sortedThrottlingPolicyList = throttlingPolicyList.sort((a, b) => {
-            // Sort by 'COMMERCIAL' tier plan first
-            if (a.tierPlan === 'COMMERCIAL' && b.tierPlan !== 'COMMERCIAL') {
-                return -1;
-            } else if (a.tierPlan !== 'COMMERCIAL' && b.tierPlan === 'COMMERCIAL') {
-                return 1;
-            }
-        
-            // For options within the same tier plan, sort alphabetically
-            return a.tierName.localeCompare(b.tierName);
-        });
         if (throttlingPolicyList && throttlingPolicyList[0]) {
-            setPolicySelected(sortedThrottlingPolicyList[0]);
+            setPolicySelected(throttlingPolicyList[0]);
         }
     }, [throttlingPolicyList]);
 
@@ -253,7 +240,7 @@ const subscribeToApi = (props) => {
                         </FormHelperText>
                     </FormControl>
                 )}
-                {sortedThrottlingPolicyList && (
+                {throttlingPolicyList && (
                     <FormControl
                         variant="standard"
                         className={classNames(classes.FormControl, classes.smallDisplayFix, {
@@ -270,7 +257,7 @@ const subscribeToApi = (props) => {
                         <Autocomplete
                             id='application-policy'
                             aria-describedby='policies-helper-text'
-                            options={sortedThrottlingPolicyList}
+                            options={throttlingPolicyList}
                             disableClearable
                             value={policySelected}
                             getOptionLabel={(option) => option.tierName}
@@ -315,10 +302,10 @@ const subscribeToApi = (props) => {
                                 id='Shared.AppsAndKeys.SubscribeToApi.available.policies'
                                 defaultMessage='Available Policies -'
                             />{' '}
-                            {sortedThrottlingPolicyList.map((policy, index) => (
+                            {throttlingPolicyList.map((policy, index) => (
                                 <span key={policy.tierName}>
                                     {policy.tierName}
-                                    {index !== sortedThrottlingPolicyList.length - 1 && <span>,</span>}
+                                    {index !== throttlingPolicyList.length - 1 && <span>,</span>}
                                 </span>
                             ))}
                         </FormHelperText>

From 662366fa1f5856bceea25bed56c875659ad3ac0a Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 07:39:01 +0000
Subject: [PATCH 28/42] [WSO2 Release] [Jenkins #805] [Release 9.1.16] prepare
 release v9.1.16

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 600311e1387..2eae8f2899a 100644
--- 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.1.16-SNAPSHOT</version>
+    <version>9.1.16</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.16</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index a94a52f6f13..07447238f83 100644
--- 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.1.16-SNAPSHOT</version>
+        <version>9.1.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index e1350369ea4..9f7d0a3b572 100644
--- 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.1.16-SNAPSHOT</version>
+        <version>9.1.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 13305b40d0a..b8516d2778a 100644
--- 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.1.16-SNAPSHOT</version>
+        <version>9.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.16-SNAPSHOT</version>
+    <version>9.1.16</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
index 6029ea53e88..ca36a4cb765 100644
--- 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.1.16-SNAPSHOT</version>
+        <version>9.1.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 18239a75ccc40c424bee179e1be97de1f27d0637 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 07:39:02 +0000
Subject: [PATCH 29/42] [WSO2 Release] [Jenkins #805] [Release 9.1.16] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2eae8f2899a..a7a96429d28 100644
--- 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.1.16</version>
+    <version>9.1.17-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.16</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 07447238f83..09724047bd9 100644
--- 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.1.16</version>
+        <version>9.1.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 9f7d0a3b572..a14ca886dd5 100644
--- 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.1.16</version>
+        <version>9.1.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index b8516d2778a..7b73ac667f7 100644
--- 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.1.16</version>
+        <version>9.1.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.16</version>
+    <version>9.1.17-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
index ca36a4cb765..d2940ad63bf 100644
--- 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.1.16</version>
+        <version>9.1.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 0e62d2b07451b1009bd0cab34cdd145a6e771ffa Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 10:46:34 +0000
Subject: [PATCH 30/42] [WSO2 Release] [Jenkins #807] [Release 9.1.17] prepare
 release v9.1.17

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7a96429d28..885b7ee8585 100644
--- 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.1.17-SNAPSHOT</version>
+    <version>9.1.17</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.17</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 09724047bd9..d1ec248b85a 100644
--- 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.1.17-SNAPSHOT</version>
+        <version>9.1.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index a14ca886dd5..4f917e286d0 100644
--- 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.1.17-SNAPSHOT</version>
+        <version>9.1.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 7b73ac667f7..b8cf09439d2 100644
--- 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.1.17-SNAPSHOT</version>
+        <version>9.1.17</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.17-SNAPSHOT</version>
+    <version>9.1.17</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
index d2940ad63bf..5721355f49d 100644
--- 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.1.17-SNAPSHOT</version>
+        <version>9.1.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 6bcc38289e661cb03119f520520f7f68c4613817 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 10:46:35 +0000
Subject: [PATCH 31/42] [WSO2 Release] [Jenkins #807] [Release 9.1.17] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 885b7ee8585..611d8de6e00 100644
--- 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.1.17</version>
+    <version>9.1.18-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.17</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index d1ec248b85a..f6c6632c242 100644
--- 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.1.17</version>
+        <version>9.1.18-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 4f917e286d0..a63e65088ba 100644
--- 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.1.17</version>
+        <version>9.1.18-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index b8cf09439d2..e23916e88d5 100644
--- 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.1.17</version>
+        <version>9.1.18-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.17</version>
+    <version>9.1.18-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
index 5721355f49d..fb761a2a0d9 100644
--- 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.1.17</version>
+        <version>9.1.18-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From d0c17d256ee2c8bc962b441168d40046cd44afa2 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 11:27:05 +0000
Subject: [PATCH 32/42] [WSO2 Release] [Jenkins #808] [Release 9.1.18] prepare
 release v9.1.18

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 611d8de6e00..1f00851bf58 100644
--- 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.1.18-SNAPSHOT</version>
+    <version>9.1.18</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.18</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index f6c6632c242..224067c33ca 100644
--- 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.1.18-SNAPSHOT</version>
+        <version>9.1.18</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index a63e65088ba..dcb9c8f0011 100644
--- 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.1.18-SNAPSHOT</version>
+        <version>9.1.18</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index e23916e88d5..093f00d9a00 100644
--- 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.1.18-SNAPSHOT</version>
+        <version>9.1.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.18-SNAPSHOT</version>
+    <version>9.1.18</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
index fb761a2a0d9..860e9753b5f 100644
--- 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.1.18-SNAPSHOT</version>
+        <version>9.1.18</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 970e50e9e85073d64e961bb63885264ae7c72139 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 11:27:06 +0000
Subject: [PATCH 33/42] [WSO2 Release] [Jenkins #808] [Release 9.1.18] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f00851bf58..088d27858f7 100644
--- 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.1.18</version>
+    <version>9.1.19-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.18</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 224067c33ca..a33d9cc8888 100644
--- 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.1.18</version>
+        <version>9.1.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index dcb9c8f0011..ee3af279153 100644
--- 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.1.18</version>
+        <version>9.1.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 093f00d9a00..d39255d0b33 100644
--- 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.1.18</version>
+        <version>9.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.18</version>
+    <version>9.1.19-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
index 860e9753b5f..5145ecf10e5 100644
--- 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.1.18</version>
+        <version>9.1.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 9fb4d265c47d9cd06e73066341121d4194efc63c Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Thu, 21 Mar 2024 17:18:14 +0530
Subject: [PATCH 34/42] Fix https://github.com/wso2/api-manager/issues/2546

---
 .../src/app/components/Shared/ChipInput.js    | 1363 ++++++++---------
 1 file changed, 676 insertions(+), 687 deletions(-)

diff --git a/portals/devportal/src/main/webapp/source/src/app/components/Shared/ChipInput.js b/portals/devportal/src/main/webapp/source/src/app/components/Shared/ChipInput.js
index 0578c3d77f0..4aa9eded3b8 100644
--- a/portals/devportal/src/main/webapp/source/src/app/components/Shared/ChipInput.js
+++ b/portals/devportal/src/main/webapp/source/src/app/components/Shared/ChipInput.js
@@ -11,767 +11,756 @@ import FilledInput from '@mui/material/FilledInput/FilledInput'
 import OutlinedInput from '@mui/material/OutlinedInput'
 import InputLabel from '@mui/material/InputLabel'
 import Chip from '@mui/material/Chip'
-import blue from '@mui/material/colors/blue'
 import FormControl from '@mui/material/FormControl'
 import FormHelperText from '@mui/material/FormHelperText'
 import cx from 'classnames'
+import { blue } from '@mui/material/colors';
 
 const PREFIX = 'WAMuiChipInput';
 
 const classes = {
-    root: `${PREFIX}-root`,
-    inputRoot: `${PREFIX}-inputRoot`,
-    input: `${PREFIX}-input`,
-    chipContainer: `${PREFIX}-chipContainer`,
-    outlined: `${PREFIX}-outlined`,
-    standard: `${PREFIX}-standard`,
-    filled: `${PREFIX}-filled`,
-    labeled: `${PREFIX}-labeled`,
-    label: `${PREFIX}-label`,
-    labelShrink: `${PREFIX}-labelShrink`,
-    helperText: `${PREFIX}-helperText`,
-    focused: `${PREFIX}-focused`,
-    disabled: `${PREFIX}-disabled`,
-    underline: `${PREFIX}-underline`,
-    error: `${PREFIX}-error`,
-    chip: `${PREFIX}-chip`,
-    marginDense: `${PREFIX}-marginDense`
+  root: `${PREFIX}-root`,
+  inputRoot: `${PREFIX}-inputRoot`,
+  input: `${PREFIX}-input`,
+  chipContainer: `${PREFIX}-chipContainer`,
+  outlined: `${PREFIX}-outlined`,
+  standard: `${PREFIX}-standard`,
+  filled: `${PREFIX}-filled`,
+  labeled: `${PREFIX}-labeled`,
+  label: `${PREFIX}-label`,
+  labelShrink: `${PREFIX}-labelShrink`,
+  helperText: `${PREFIX}-helperText`,
+  focused: `${PREFIX}-focused`,
+  disabled: `${PREFIX}-disabled`,
+  underline: `${PREFIX}-underline`,
+  error: `${PREFIX}-error`,
+  chip: `${PREFIX}-chip`,
+  marginDense: `${PREFIX}-marginDense`
 };
 
-const Root = styled('div')((
-    {
-        theme
-    }
-) => {
-    const light = theme.palette.type === 'light'
-    const bottomLineColor = light ? 'rgba(0, 0, 0, 0.42)' : 'rgba(255, 255, 255, 0.7)'
-
-    return {
-        [`& .${classes.root}`]: {},
-        [`& .${classes.inputRoot}`]: {
-            display: 'inline-flex',
-            flexWrap: 'wrap',
-            flex: 1,
-            marginTop: 0,
-            minWidth: 70,
-            '&$outlined,&$filled': {
-                boxSizing: 'border-box'
-            },
-            '&$outlined': {
-                paddingTop: 14
-            },
-            '&$filled': {
-                paddingTop: 28
-            }
-        },
-        [`& .${classes.input}`]: {
-            display: 'inline-block',
-            textOverflow: 'ellipsis',
-            overflow: 'hidden',
-            whiteSpace: 'nowrap',
-            appearance: 'none', // Remove border in Safari, doesn't seem to break anything in other browsers
-            WebkitTapHighlightColor: 'rgba(0,0,0,0)', // Remove mobile color flashing (deprecated style).
-            float: 'left',
-            flex: 1
-        },
-        [`& .${classes.chipContainer}`]: {
-            display: 'flex',
-            flexFlow: 'row wrap',
-            cursor: 'text',
-            marginBottom: -2,
-            minHeight: 40,
-            '&$labeled&$standard': {
-                marginTop: 18
-            }
-        },
-        [`& .${classes.outlined}`]: {
-            '& input': {
-                height: 16,
-                paddingTop: 4,
-                paddingBottom: 12,
-                marginTop: 4,
-                marginBottom: 4
-            }
-        },
-        [`& .${classes.standard}`]: {},
-        [`& .${classes.filled}`]: {
-            '& input': {
-                height: 22,
-                marginBottom: 4,
-                marginTop: 4,
-                paddingTop: 0
-            },
-            '$marginDense & input': {
-                height: 26
-            }
-        },
-        [`& .${classes.labeled}`]: {},
-        [`& .${classes.label}`]: {
-            top: 4,
-            '&$outlined&:not($labelShrink)': {
-                top: 2,
-                '$marginDense &': {
-                    top: 5
-                }
-            },
-            '&$filled&:not($labelShrink)': {
-                top: 15,
-                '$marginDense &': {
-                    top: 20
-                }
-            }
-        },
-        [`& .${classes.labelShrink}`]: {
-            top: 0
-        },
-        [`& .${classes.helperText}`]: {
-            marginBottom: -20
-        },
-        [`& .${classes.focused}`]: {},
-        [`& .${classes.disabled}`]: {},
-        [`& .${classes.underline}`]: {
-            '&:after': {
-                borderBottom: `2px solid ${theme.palette.primary[light ? 'dark' : 'light']}`,
-                left: 0,
-                bottom: 0,
-                // Doing the other way around crash on IE 11 "''" https://github.com/cssinjs/jss/issues/242
-                content: '""',
-                position: 'absolute',
-                right: 0,
-                transform: 'scaleX(0)',
-                transition: theme.transitions.create('transform', {
-                    duration: theme.transitions.duration.shorter,
-                    easing: theme.transitions.easing.easeOut
-                }),
-                pointerEvents: 'none' // Transparent to the hover style.
-            },
-            '&$focused:after': {
-                transform: 'scaleX(1)'
-            },
-            '&$error:after': {
-                borderBottomColor: theme.palette.error.main,
-                transform: 'scaleX(1)' // error is always underlined in red
-            },
-            '&:before': {
-                borderBottom: `1px solid ${bottomLineColor}`,
-                left: 0,
-                bottom: 0,
-                // Doing the other way around crash on IE 11 "''" https://github.com/cssinjs/jss/issues/242
-                content: '"\\00a0"',
-                position: 'absolute',
-                right: 0,
-                transition: theme.transitions.create('border-bottom-color', {
-                    duration: theme.transitions.duration.shorter
-                }),
-                pointerEvents: 'none' // Transparent to the hover style.
-            },
-            '&:hover:not($disabled):not($focused):not($error):before': {
-                borderBottom: `2px solid ${theme.palette.text.primary}`,
-                // Reset on touch devices, it doesn't add specificity
-                '@media (hover: none)': {
-                    borderBottom: `1px solid ${bottomLineColor}`
-                }
-            },
-            '&$disabled:before': {
-                borderBottomStyle: 'dotted'
-            }
-        },
-        [`& .${classes.error}`]: {
-            '&:after': {
-                backgroundColor: theme.palette.error.main,
-                transform: 'scaleX(1)' // error is always underlined in red
-            }
-        },
-        [`& .${classes.chip}`]: {
-            margin: '0 8px 8px 0',
-            float: 'left'
-        },
-        [`& .${classes.marginDense}`]: {}
-    };
+const StyledFormControl = styled(FormControl)(({ theme }) => {
+  const light = theme.palette.mode === 'light'
+  const bottomLineColor = light ? 'rgba(0, 0, 0, 0.42)' : 'rgba(255, 255, 255, 0.7)'
+  return {
+    [`& .${classes.root}`]: {},
+    [`& .${classes.inputRoot}`]: {
+      display: 'inline-flex',
+      flexWrap: 'wrap',
+      flex: 1,
+      margin: 0,
+      minWidth: 70,
+      width: '100%',
+      '&$outlined,&$filled': {
+        boxSizing: 'border-box'
+      },
+      '&$outlined': {
+        paddingTop: 14
+      },
+      '&$filled': {
+        paddingTop: 28
+      }
+    },
+    [`& .${classes.input}`]: {
+      display: 'inline-block',
+      textOverflow: 'ellipsis',
+      overflow: 'hidden',
+      whiteSpace: 'nowrap',
+      appearance: 'none', // Remove border in Safari, doesn't seem to break anything in other browsers
+      WebkitTapHighlightColor: 'rgba(0,0,0,0)', // Remove mobile color flashing (deprecated style).
+      float: 'left',
+      flex: 1
+    },
+    [`& .${classes.chipContainer}`]: {
+      display: 'flex',
+      flexFlow: 'row wrap',
+      cursor: 'text',
+      marginBottom: -2,
+      minHeight: 40,
+      '&$labeled&$standard': {
+        marginTop: 18
+      }
+    },
+    [`& .${classes.outlined}`]: {
+    },
+    [`& .${classes.standard}`]: {},
+    [`& .${classes.filled}`]: {
+      '& input': {
+        height: 22,
+        marginBottom: 4,
+        marginTop: 4,
+        paddingTop: 0
+      },
+      '$marginDense & input': {
+        height: 26
+      }
+    },
+    [`& .${classes.labeled}`]: {},
+    [`& .${classes.label}`]: {
+    //   top: 4,
+      padding: '0 8px',
+      backgroundColor: theme.palette.background.paper,
+      '&$outlined&:not($labelShrink)': {
+        top: 2,
+        '$marginDense &': {
+          top: 5
+        }
+      },
+      '&$filled&:not($labelShrink)': {
+        top: 15,
+        '$marginDense &': {
+          top: 20
+        }
+      }
+    },
+    [`& .${classes.labelShrink}`]: {
+      top: 0
+    },
+    [`& .${classes.helperText}`]: {
+      marginBottom: -20
+    },
+    [`& .${classes.focused}`]: {},
+    [`& .${classes.disabled}`]: {},
+    [`& .${classes.underline}`]: {
+      '&:after': {
+        borderBottom: `2px solid ${theme.palette.primary[light ? 'dark' : 'light']}`,
+        left: 0,
+        bottom: 0,
+        // Doing the other way around crash on IE 11 "''" https://github.com/cssinjs/jss/issues/242
+        content: '""',
+        position: 'absolute',
+        right: 0,
+        transform: 'scaleX(0)',
+        transition: theme.transitions.create('transform', {
+          duration: theme.transitions.duration.shorter,
+          easing: theme.transitions.easing.easeOut
+        }),
+        pointerEvents: 'none' // Transparent to the hover style.
+      },
+      '&$focused:after': {
+        transform: 'scaleX(1)'
+      },
+      '&$error:after': {
+        borderBottomColor: theme.palette.error.main,
+        transform: 'scaleX(1)' // error is always underlined in red
+      },
+      '&:before': {
+        borderBottom: `1px solid ${bottomLineColor}`,
+        left: 0,
+        bottom: 0,
+        // Doing the other way around crash on IE 11 "''" https://github.com/cssinjs/jss/issues/242
+        content: '"\\00a0"',
+        position: 'absolute',
+        right: 0,
+        transition: theme.transitions.create('border-bottom-color', {
+          duration: theme.transitions.duration.shorter
+        }),
+        pointerEvents: 'none' // Transparent to the hover style.
+      },
+      '&:hover:not($disabled):not($focused):not($error):before': {
+        borderBottom: `2px solid ${theme.palette.text.primary}`,
+        // Reset on touch devices, it doesn't add specificity
+        '@media (hover: none)': {
+          borderBottom: `1px solid ${bottomLineColor}`
+        }
+      },
+      '&$disabled:before': {
+        borderBottomStyle: 'dotted'
+      }
+    },
+    [`& .${classes.error}`]: {
+      '&:after': {
+        backgroundColor: theme.palette.error.main,
+        transform: 'scaleX(1)' // error is always underlined in red
+      }
+    },
+    [`& .${classes.chip}`]: {
+      margin: '0 8px 0 0',
+      float: 'left'
+    },
+    [`& .${classes.marginDense}`]: {},
+  };
 });
 
 const variantComponent = {
-    standard: Input,
-    filled: FilledInput,
-    outlined: OutlinedInput
+  standard: Input,
+  filled: FilledInput,
+  outlined: OutlinedInput
 }
 
 const keyCodes = {
-    BACKSPACE: 8,
-    DELETE: 46,
-    LEFT_ARROW: 37,
-    RIGHT_ARROW: 39
+  BACKSPACE: 8,
+  DELETE: 46,
+  LEFT_ARROW: 37,
+  RIGHT_ARROW: 39
 }
 
 class ChipInput extends React.Component {
-    state = {
-        chips: [],
-        errorText: undefined,
-        focusedChip: null,
-        inputValue: '',
-        isClean: true,
-        isFocused: false,
-        chipsUpdated: false,
-        prevPropsValue: []
-    }
-
-    constructor (props) {
-        super(props)
-        if (props.defaultValue) {
-            this.state.chips = props.defaultValue
-        }
-        this.labelRef = React.createRef()
-        this.input = React.createRef()
+  state = {
+    chips: [],
+    errorText: undefined,
+    focusedChip: null,
+    inputValue: '',
+    isClean: true,
+    isFocused: false,
+    chipsUpdated: false,
+    prevPropsValue: []
+  }
+
+  constructor (props) {
+    super(props)
+    if (props.defaultValue) {
+      this.state.chips = props.defaultValue
     }
-
-    componentDidMount () {
-        if (this.props.variant === 'outlined') {
-            this.labelNode = ReactDOM.findDOMNode(this.labelRef.current)
-            this.forceUpdate()
-        }
+    this.labelRef = React.createRef()
+    this.input = React.createRef()
+  }
+
+  componentDidMount () {
+    if (this.props.variant === 'outlined') {
+      this.labelNode = ReactDOM.findDOMNode(this.labelRef.current)
+      this.forceUpdate()
     }
+  }
 
-    componentWillUnmount () {
-        clearTimeout(this.inputBlurTimeout)
-    }
+  componentWillUnmount () {
+    clearTimeout(this.inputBlurTimeout)
+  }
 
-    static getDerivedStateFromProps (props, state) {
-        let newState = null
+  static getDerivedStateFromProps (props, state) {
+    let newState = null
 
-        if (props.value && props.value.length !== state.prevPropsValue.length) {
-            newState = { prevPropsValue: props.value }
-            if (props.clearInputValueOnChange) {
-                newState.inputValue = ''
-            }
-        }
-
-        // if change detection is only needed for clearInputValueOnChange
-        if (props.clearInputValueOnChange && props.value && props.value.length !== state.prevPropsValue.length) {
-            newState = { prevPropsValue: props.value, inputValue: '' }
-        }
-
-        if (props.disabled) {
-            newState = { ...newState, focusedChip: null }
-        }
+    if (props.value && props.value.length !== state.prevPropsValue.length) {
+      newState = { prevPropsValue: props.value }
+      if (props.clearInputValueOnChange) {
+        newState.inputValue = ''
+      }
+    }
 
-        if (!state.chipsUpdated && props.defaultValue) {
-            newState = { ...newState, chips: props.defaultValue }
-        }
+    // if change detection is only needed for clearInputValueOnChange
+    if (props.clearInputValueOnChange && props.value && props.value.length !== state.prevPropsValue.length) {
+      newState = { prevPropsValue: props.value, inputValue: '' }
+    }
 
-        return newState
+    if (props.disabled) {
+      newState = { ...newState, focusedChip: null }
     }
 
-    /**
-     * Blurs this component.
-     * @public
-     */
-    blur () {
-        if (this.input) this.actualInput.blur()
+    if (!state.chipsUpdated && props.defaultValue) {
+      newState = { ...newState, chips: props.defaultValue }
     }
 
-    /**
-     * Focuses this component.
-     * @public
-     */
-    focus = () => {
-        this.actualInput.focus()
-        if (this.state.focusedChip != null) {
-            this.setState({ focusedChip: null })
-        }
+    return newState
+  }
+
+  /**
+   * Blurs this component.
+   * @public
+   */
+  blur () {
+    if (this.input) this.actualInput.blur()
+  }
+
+  /**
+   * Focuses this component.
+   * @public
+   */
+  focus = () => {
+    this.actualInput.focus()
+    if (this.state.focusedChip != null) {
+      this.setState({ focusedChip: null })
     }
+  }
 
-    handleInputBlur = (event) => {
-        if (this.props.onBlur) {
-            this.props.onBlur(event)
-        }
-        this.setState({ isFocused: false })
-        if (this.state.focusedChip != null) {
-            this.setState({ focusedChip: null })
-        }
-        const value = event.target.value
-        let addChipOptions
-        switch (this.props.blurBehavior) {
-            case 'add-or-clear':
-                addChipOptions = { clearInputOnFail: true }
-            // falls through
-            case 'add':
-                if (this.props.delayBeforeAdd) {
-                    // Lets assume that we only want to add the existing content as chip, when
-                    // another event has not added a chip within 200ms .
-                    // e.g. onSelection Callback in Autocomplete case
-                    const numChipsBefore = (this.props.value || this.state.chips).length
-                    this.inputBlurTimeout = setTimeout(() => {
-                        const numChipsAfter = (this.props.value || this.state.chips).length
-                        if (numChipsBefore === numChipsAfter) {
-                            this.handleAddChip(value, addChipOptions)
-                        } else {
-                            this.clearInput()
-                        }
-                    }, 150)
-                } else {
-                    this.handleAddChip(value, addChipOptions)
-                }
-                break
-            case 'clear':
-                this.clearInput()
-                break
+  handleInputBlur = (event) => {
+    if (this.props.onBlur) {
+      this.props.onBlur(event)
+    }
+    this.setState({ isFocused: false })
+    if (this.state.focusedChip != null) {
+      this.setState({ focusedChip: null })
+    }
+    const value = event.target.value
+    let addChipOptions
+    switch (this.props.blurBehavior) {
+      case 'add-or-clear':
+        addChipOptions = { clearInputOnFail: true }
+        // falls through
+      case 'add':
+        if (this.props.delayBeforeAdd) {
+          // Lets assume that we only want to add the existing content as chip, when
+          // another event has not added a chip within 200ms .
+          // e.g. onSelection Callback in Autocomplete case
+          const numChipsBefore = (this.props.value || this.state.chips).length
+          this.inputBlurTimeout = setTimeout(() => {
+            const numChipsAfter = (this.props.value || this.state.chips).length
+            if (numChipsBefore === numChipsAfter) {
+              this.handleAddChip(value, addChipOptions)
+            } else {
+              this.clearInput()
+            }
+          }, 150)
+        } else {
+          this.handleAddChip(value, addChipOptions)
         }
+        break
+      case 'clear':
+        this.clearInput()
+        break
     }
+  }
 
-    handleInputFocus = (event) => {
-        this.setState({ isFocused: true })
-        if (this.props.onFocus) {
-            this.props.onFocus(event)
-        }
+  handleInputFocus = (event) => {
+    this.setState({ isFocused: true })
+    if (this.props.onFocus) {
+      this.props.onFocus(event)
+    }
+  }
+
+  handleKeyDown = (event) => {
+    const { focusedChip } = this.state
+    this._keyPressed = false
+    this._preventChipCreation = false
+    if (this.props.onKeyDown) {
+      // Needed for arrow controls on menu in autocomplete scenario
+      this.props.onKeyDown(event)
+      // Check if the callback marked the event as isDefaultPrevented() and skip further actions
+      // enter key for example should not always add the current value of the inputField
+      if (event.isDefaultPrevented()) {
+        return
+      }
+    }
+    const chips = this.props.value || this.state.chips
+    if (this.props.newChipKeyCodes.indexOf(event.keyCode) >= 0 || this.props.newChipKeys.indexOf(event.key) >= 0) {
+      const result = this.handleAddChip(event.target.value)
+      if (result !== false) {
+        event.preventDefault()
+      }
+      return
     }
 
-    handleKeyDown = (event) => {
-        const { focusedChip } = this.state
-        this._keyPressed = false
-        this._preventChipCreation = false
-        if (this.props.onKeyDown) {
-            // Needed for arrow controls on menu in autocomplete scenario
-            this.props.onKeyDown(event)
-            // Check if the callback marked the event as isDefaultPrevented() and skip further actions
-            // enter key for example should not always add the current value of the inputField
-            if (event.isDefaultPrevented()) {
-                return
+    switch (event.keyCode) {
+      case keyCodes.BACKSPACE:
+        if (event.target.value === '') {
+          if (focusedChip != null) {
+            this.handleDeleteChip(chips[focusedChip], focusedChip)
+            if (focusedChip > 0) {
+              this.setState({ focusedChip: focusedChip - 1 })
             }
+          } else {
+            this.setState({ focusedChip: chips.length - 1 })
+          }
         }
-        const chips = this.props.value || this.state.chips
-        if (this.props.newChipKeyCodes.indexOf(event.keyCode) >= 0 || this.props.newChipKeys.indexOf(event.key) >= 0) {
-            const result = this.handleAddChip(event.target.value)
-            if (result !== false) {
-                event.preventDefault()
-            }
-            return
+        break
+      case keyCodes.DELETE:
+        if (event.target.value === '' && focusedChip != null) {
+          this.handleDeleteChip(chips[focusedChip], focusedChip)
+          if (focusedChip <= chips.length - 1) {
+            this.setState({ focusedChip })
+          }
         }
-
-        switch (event.keyCode) {
-            case keyCodes.BACKSPACE:
-                if (event.target.value === '') {
-                    if (focusedChip != null) {
-                        this.handleDeleteChip(chips[focusedChip], focusedChip)
-                        if (focusedChip > 0) {
-                            this.setState({ focusedChip: focusedChip - 1 })
-                        }
-                    } else {
-                        this.setState({ focusedChip: chips.length - 1 })
-                    }
-                }
-                break
-            case keyCodes.DELETE:
-                if (event.target.value === '' && focusedChip != null) {
-                    this.handleDeleteChip(chips[focusedChip], focusedChip)
-                    if (focusedChip <= chips.length - 1) {
-                        this.setState({ focusedChip })
-                    }
-                }
-                break
-            case keyCodes.LEFT_ARROW:
-                if (focusedChip == null && event.target.value === '' && chips.length) {
-                    this.setState({ focusedChip: chips.length - 1 })
-                } else if (focusedChip != null && focusedChip > 0) {
-                    this.setState({ focusedChip: focusedChip - 1 })
-                }
-                break
-            case keyCodes.RIGHT_ARROW:
-                if (focusedChip != null && focusedChip < chips.length - 1) {
-                    this.setState({ focusedChip: focusedChip + 1 })
-                } else {
-                    this.setState({ focusedChip: null })
-                }
-                break
-            default:
-                this.setState({ focusedChip: null })
-                break
+        break
+      case keyCodes.LEFT_ARROW:
+        if (focusedChip == null && event.target.value === '' && chips.length) {
+          this.setState({ focusedChip: chips.length - 1 })
+        } else if (focusedChip != null && focusedChip > 0) {
+          this.setState({ focusedChip: focusedChip - 1 })
         }
-    }
-
-    handleKeyUp = (event) => {
-        if (!this._preventChipCreation && (this.props.newChipKeyCodes.indexOf(event.keyCode) >= 0 || this.props.newChipKeys.indexOf(event.key) >= 0) && this._keyPressed) {
-            this.clearInput()
+        break
+      case keyCodes.RIGHT_ARROW:
+        if (focusedChip != null && focusedChip < chips.length - 1) {
+          this.setState({ focusedChip: focusedChip + 1 })
         } else {
-            this.updateInput(event.target.value)
+          this.setState({ focusedChip: null })
         }
-        if (this.props.onKeyUp) { this.props.onKeyUp(event) }
+        break
+      default:
+        this.setState({ focusedChip: null })
+        break
     }
+  }
 
-    handleKeyPress = (event) => {
-        this._keyPressed = true
-        if (this.props.onKeyPress) { this.props.onKeyPress(event) }
+  handleKeyUp = (event) => {
+    if (!this._preventChipCreation && (this.props.newChipKeyCodes.indexOf(event.keyCode) >= 0 || this.props.newChipKeys.indexOf(event.key) >= 0) && this._keyPressed) {
+      this.clearInput()
+    } else {
+      this.updateInput(event.target.value)
     }
+    if (this.props.onKeyUp) { this.props.onKeyUp(event) }
+  }
 
-    handleUpdateInput = (e) => {
-        if (this.props.inputValue == null) {
-            this.updateInput(e.target.value)
-        }
+  handleKeyPress = (event) => {
+    this._keyPressed = true
+    if (this.props.onKeyPress) { this.props.onKeyPress(event) }
+  }
 
-        if (this.props.onUpdateInput) {
-            this.props.onUpdateInput(e)
-        }
+  handleUpdateInput = (e) => {
+    if (this.props.inputValue == null) {
+      this.updateInput(e.target.value)
     }
 
-    /**
-     * Handles adding a chip.
-     * @param {string|object} chip Value of the chip, either a string or an object (if dataSourceConfig is set)
-     * @param {object=} options Additional options
-     * @param {boolean=} options.clearInputOnFail If `true`, and `onBeforeAdd` returns `false`, clear the input
-     * @returns True if the chip was added (or at least `onAdd` was called), false if adding the chip was prevented
-     */
-    handleAddChip (chip, options) {
-        if (this.props.onBeforeAdd && !this.props.onBeforeAdd(chip)) {
-            this._preventChipCreation = true
-            if (options != null && options.clearInputOnFail) {
-                this.clearInput()
-            }
-            return false
-        }
+    if (this.props.onUpdateInput) {
+      this.props.onUpdateInput(e)
+    }
+  }
+
+  /**
+   * Handles adding a chip.
+   * @param {string|object} chip Value of the chip, either a string or an object (if dataSourceConfig is set)
+   * @param {object=} options Additional options
+   * @param {boolean=} options.clearInputOnFail If `true`, and `onBeforeAdd` returns `false`, clear the input
+   * @returns True if the chip was added (or at least `onAdd` was called), false if adding the chip was prevented
+   */
+  handleAddChip (chip, options) {
+    if (this.props.onBeforeAdd && !this.props.onBeforeAdd(chip)) {
+      this._preventChipCreation = true
+      if (options != null && options.clearInputOnFail) {
         this.clearInput()
-        const chips = this.props.value || this.state.chips
-
-        if (this.props.dataSourceConfig) {
-            if (typeof chip === 'string') {
-                chip = {
-                    [this.props.dataSourceConfig.text]: chip,
-                    [this.props.dataSourceConfig.value]: chip
-                }
-            }
-
-            if (this.props.allowDuplicates || !chips.some((c) => c[this.props.dataSourceConfig.value] === chip[this.props.dataSourceConfig.value])) {
-                if (this.props.value && this.props.onAdd) {
-                    this.props.onAdd(chip)
-                } else {
-                    this.updateChips([...this.state.chips, chip])
-                }
-            }
-            return true
+      }
+      return false
+    }
+    this.clearInput()
+    const chips = this.props.value || this.state.chips
+
+    if (this.props.dataSourceConfig) {
+      if (typeof chip === 'string') {
+        chip = {
+          [this.props.dataSourceConfig.text]: chip,
+          [this.props.dataSourceConfig.value]: chip
         }
+      }
 
-        if (chip.trim().length > 0) {
-            if (this.props.allowDuplicates || chips.indexOf(chip) === -1) {
-                if (this.props.value && this.props.onAdd) {
-                    this.props.onAdd(chip)
-                } else {
-                    this.updateChips([...this.state.chips, chip])
-                }
-            }
-            return true
+      if (this.props.allowDuplicates || !chips.some((c) => c[this.props.dataSourceConfig.value] === chip[this.props.dataSourceConfig.value])) {
+        if (this.props.value && this.props.onAdd) {
+          this.props.onAdd(chip)
+        } else {
+          this.updateChips([...this.state.chips, chip])
         }
-        return false
+      }
+      return true
     }
 
-    handleDeleteChip (chip, i) {
-        if (!this.props.value) {
-            const chips = this.state.chips.slice()
-            const changed = chips.splice(i, 1) // remove the chip at index i
-            if (changed) {
-                let focusedChip = this.state.focusedChip
-                if (this.state.focusedChip === i) {
-                    focusedChip = null
-                } else if (this.state.focusedChip > i) {
-                    focusedChip = this.state.focusedChip - 1
-                }
-                this.updateChips(chips, { focusedChip })
-            }
-        } else if (this.props.onDelete) {
-            this.props.onDelete(chip, i)
+    if (chip.trim().length > 0) {
+      if (this.props.allowDuplicates || chips.indexOf(chip) === -1) {
+        if (this.props.value && this.props.onAdd) {
+          this.props.onAdd(chip)
+        } else {
+          this.updateChips([...this.state.chips, chip])
         }
+      }
+      return true
     }
-
-    updateChips (chips, additionalUpdates = {}) {
-        this.setState({ chips, chipsUpdated: true, ...additionalUpdates })
-        if (this.props.onChange) {
-            this.props.onChange(chips)
+    return false
+  }
+
+  handleDeleteChip (chip, i) {
+    if (!this.props.value) {
+      const chips = this.state.chips.slice()
+      const changed = chips.splice(i, 1) // remove the chip at index i
+      if (changed) {
+        let focusedChip = this.state.focusedChip
+        if (this.state.focusedChip === i) {
+          focusedChip = null
+        } else if (this.state.focusedChip > i) {
+          focusedChip = this.state.focusedChip - 1
         }
+        this.updateChips(chips, { focusedChip })
+      }
+    } else if (this.props.onDelete) {
+      this.props.onDelete(chip, i)
     }
+  }
 
-    /**
-     * Clears the text field for adding new chips.
-     * This only works in uncontrolled input mode, i.e. if the inputValue prop is not used.
-     * @public
-     */
-    clearInput () {
-        this.updateInput('')
+  updateChips (chips, additionalUpdates = {}) {
+    this.setState({ chips, chipsUpdated: true, ...additionalUpdates })
+    if (this.props.onChange) {
+      this.props.onChange(chips)
     }
-
-    updateInput (value) {
-        this.setState({ inputValue: value })
+  }
+
+  /**
+   * Clears the text field for adding new chips.
+   * This only works in uncontrolled input mode, i.e. if the inputValue prop is not used.
+   * @public
+   */
+  clearInput () {
+    this.updateInput('')
+  }
+
+  updateInput (value) {
+    this.setState({ inputValue: value })
+  }
+
+  /**
+   * Set the reference to the actual input, that is the input of the Input.
+   * @param {object} ref - The reference
+   */
+  setActualInputRef = (ref) => {
+    this.actualInput = ref
+    if (this.props.inputRef) {
+      this.props.inputRef(ref)
     }
-
-    /**
-     * Set the reference to the actual input, that is the input of the Input.
-     * @param {object} ref - The reference
-     */
-    setActualInputRef = (ref) => {
-        this.actualInput = ref
-        if (this.props.inputRef) {
-            this.props.inputRef(ref)
-        }
+  }
+
+  render () {
+    const {
+      allowDuplicates,
+      alwaysShowPlaceholder,
+      blurBehavior,
+      children,
+      chipRenderer = defaultChipRenderer,
+      className,
+      clearInputValueOnChange,
+      dataSource,
+      dataSourceConfig,
+      defaultValue,
+      delayBeforeAdd,
+      disabled,
+      disableUnderline,
+      error,
+      filter,
+      FormHelperTextProps,
+      fullWidth,
+      fullWidthInput,
+      helperText,
+      id,
+      InputProps = {},
+      inputRef,
+      InputLabelProps = {},
+      inputValue,
+      label,
+      newChipKeyCodes,
+      newChipKeys,
+      onBeforeAdd,
+      onAdd,
+      onBlur,
+      onDelete,
+      onChange,
+      onFocus,
+      onKeyDown,
+      onKeyPress,
+      onKeyUp,
+      onUpdateInput,
+      placeholder,
+      readOnly,
+      required,
+      rootRef,
+      value,
+      variant,
+      ...other
+    } = this.props
+
+    const chips = value || this.state.chips
+    const actualInputValue = inputValue != null ? inputValue : this.state.inputValue
+
+    const hasInput = (this.props.value || actualInputValue).length > 0 || actualInputValue.length > 0
+    const shrinkFloatingLabel = InputLabelProps.shrink != null
+      ? InputLabelProps.shrink
+      : (label != null && (hasInput || this.state.isFocused || chips.length > 0))
+
+    const chipComponents = chips.map((chip, i) => {
+      const value = dataSourceConfig ? chip[dataSourceConfig.value] : chip
+      return chipRenderer(
+        {
+          value,
+          text: dataSourceConfig ? chip[dataSourceConfig.text] : chip,
+          chip,
+          isDisabled: !!disabled,
+          isReadOnly: readOnly,
+          isFocused: this.state.focusedChip === i,
+          handleClick: () => this.setState({ focusedChip: i }),
+          handleDelete: () => this.handleDeleteChip(chip, i),
+          className: classes.chip
+        },
+        i
+      )
+    })
+
+    const InputMore = {}
+    if (variant === 'outlined') {
+      InputMore.notched = shrinkFloatingLabel
+      InputMore.labelWidth =
+        (shrinkFloatingLabel && this.labelNode && this.labelNode.offsetWidth) ||
+        0
     }
 
-    render () {
-        const {
-            allowDuplicates,
-            alwaysShowPlaceholder,
-            blurBehavior,
-            children,
-            chipRenderer = defaultChipRenderer,
-            className,
-            clearInputValueOnChange,
-            dataSource,
-            dataSourceConfig,
-            defaultValue,
-            delayBeforeAdd,
-            disabled,
-            disableUnderline,
-            error,
-            filter,
-            FormHelperTextProps,
-            fullWidth,
-            fullWidthInput,
-            helperText,
-            id,
-            InputProps = {},
-            inputRef,
-            InputLabelProps = {},
-            inputValue,
-            label,
-            newChipKeyCodes,
-            newChipKeys,
-            onBeforeAdd,
-            onAdd,
-            onBlur,
-            onDelete,
-            onChange,
-            onFocus,
-            onKeyDown,
-            onKeyPress,
-            onKeyUp,
-            onUpdateInput,
-            placeholder,
-            readOnly,
-            required,
-            rootRef,
-            value,
-            variant,
-            ...other
-        } = this.props
-
-        const chips = value || this.state.chips
-        const actualInputValue = inputValue != null ? inputValue : this.state.inputValue
-
-        const hasInput = (this.props.value || actualInputValue).length > 0 || actualInputValue.length > 0
-        const shrinkFloatingLabel = InputLabelProps.shrink != null
-            ? InputLabelProps.shrink
-            : (label != null && (hasInput || this.state.isFocused || chips.length > 0))
-
-        const chipComponents = chips.map((chip, i) => {
-            const value = dataSourceConfig ? chip[dataSourceConfig.value] : chip
-            return chipRenderer(
-                {
-                    value,
-                    text: dataSourceConfig ? chip[dataSourceConfig.text] : chip,
-                    chip,
-                    isDisabled: !!disabled,
-                    isReadOnly: readOnly,
-                    isFocused: this.state.focusedChip === i,
-                    handleClick: () => this.setState({ focusedChip: i }),
-                    handleDelete: () => this.handleDeleteChip(chip, i),
-                    className: classes.chip
-                },
-                i
-            )
-        })
-
-        const InputMore = {}
-        if (variant === 'outlined') {
-            InputMore.notched = shrinkFloatingLabel
-            InputMore.labelWidth =
-                (shrinkFloatingLabel && this.labelNode && this.labelNode.offsetWidth) ||
-                0
-        }
-
-        if (variant !== 'standard') {
-            InputMore.startAdornment = (
-                <React.Fragment>{chipComponents}</React.Fragment>
-            )
-        } else {
-            InputProps.disableUnderline = true
-        }
-
-        const InputComponent = variantComponent[variant]
-
-        return (
-            <Root>
-                <FormControl
-                    ref={rootRef}
-                    fullWidth={fullWidth}
-                    className={cx(className, classes.root, {
-                        [classes.marginDense]: other.margin === 'dense'
-                    })}
-                    error={error}
-                    required={chips.length > 0 ? undefined : required}
-                    onClick={this.focus}
-                    disabled={disabled}
-                    variant={variant}
-                    {...other}
-                >
-                    {label && (
-                        <InputLabel
-                            htmlFor={id}
-                            classes={{ root: cx(classes[variant], classes.label), shrink: classes.labelShrink }}
-                            shrink={shrinkFloatingLabel}
-                            focused={this.state.isFocused}
-                            variant={variant}
-                            ref={this.labelRef}
-                            required={required}
-                            {...InputLabelProps}
-                        >
-                            {label}
-                        </InputLabel>
-                    )}
-                    <div
-                        className={cx(
-                            classes[variant],
-                            classes.chipContainer,
-                            {
-                                [classes.focused]: this.state.isFocused,
-                                [classes.underline]: !disableUnderline && variant === 'standard',
-                                [classes.disabled]: disabled,
-                                [classes.labeled]: label != null,
-                                [classes.error]: error
-                            })}
-                    >
-                        {variant === 'standard' && chipComponents}
-                        <InputComponent
-                            ref={this.input}
-                            classes={{
-                                input: cx(classes.input, classes[variant]),
-                                root: cx(classes.inputRoot, classes[variant])
-                            }}
-                            id={id}
-                            value={actualInputValue}
-                            onChange={this.handleUpdateInput}
-                            onKeyDown={this.handleKeyDown}
-                            onKeyPress={this.handleKeyPress}
-                            onKeyUp={this.handleKeyUp}
-                            onFocus={this.handleInputFocus}
-                            onBlur={this.handleInputBlur}
-                            inputRef={this.setActualInputRef}
-                            disabled={disabled}
-                            fullWidth={fullWidthInput}
-                            placeholder={(!hasInput && (shrinkFloatingLabel || label == null)) || alwaysShowPlaceholder ? placeholder : null}
-                            readOnly={readOnly}
-                            {...InputProps}
-                            {...InputMore}
-                        />
-                    </div>
-                    {helperText && (
-                        <FormHelperText
-                            {...FormHelperTextProps}
-                            className={FormHelperTextProps ? cx(FormHelperTextProps.className, classes.helperText) : classes.helperText}
-                        >
-                            {helperText}
-                        </FormHelperText>
-                    )}
-                </FormControl>
-            </Root>
-        )
+    if (variant !== 'standard') {
+      InputMore.startAdornment = (
+        <React.Fragment>{chipComponents}</React.Fragment>
+      )
+    } else {
+      InputProps.disableUnderline = true
     }
+
+    const InputComponent = variantComponent[variant]
+
+    return (
+      <StyledFormControl
+        ref={rootRef}
+        fullWidth={fullWidth}
+        className={cx(className, classes.root, {
+          [classes.marginDense]: other.margin === 'dense'
+        })}
+        error={error}
+        required={chips.length > 0 ? undefined : required}
+        onClick={this.focus}
+        disabled={disabled}
+        variant={variant}
+        {...other}
+      >
+        {label && (
+          <InputLabel
+            htmlFor={id}
+            classes={{ root: cx(classes[variant], classes.label), shrink: classes.labelShrink }}
+            shrink={shrinkFloatingLabel}
+            focused={this.state.isFocused}
+            variant={variant}
+            ref={this.labelRef}
+            required={required}
+            {...InputLabelProps}
+          >
+            {label}
+          </InputLabel>
+        )}
+        <div
+          className={cx(
+            classes[variant],
+            classes.chipContainer,
+            {
+              [classes.focused]: this.state.isFocused,
+              [classes.underline]: !disableUnderline && variant === 'standard',
+              [classes.disabled]: disabled,
+              [classes.labeled]: label != null,
+              [classes.error]: error
+            })}
+        >
+          {variant === 'standard' && chipComponents}
+          <InputComponent
+            ref={this.input}
+            classes={{
+              input: cx(classes.input, classes[variant]),
+              root: cx(classes.inputRoot, classes[variant])
+            }}
+            id={id}
+            value={actualInputValue}
+            onChange={this.handleUpdateInput}
+            onKeyDown={this.handleKeyDown}
+            onKeyPress={this.handleKeyPress}
+            onKeyUp={this.handleKeyUp}
+            onFocus={this.handleInputFocus}
+            onBlur={this.handleInputBlur}
+            inputRef={this.setActualInputRef}
+            disabled={disabled}
+            fullWidth={fullWidth}
+            placeholder={(!hasInput && (shrinkFloatingLabel || label == null)) || alwaysShowPlaceholder ? placeholder : null}
+            readOnly={readOnly}
+            {...InputProps}
+            {...InputMore}
+          />
+        </div>
+        {helperText && (
+          <FormHelperText
+            {...FormHelperTextProps}
+            className={FormHelperTextProps ? cx(FormHelperTextProps.className, classes.helperText) : classes.helperText}
+          >
+            {helperText}
+          </FormHelperText>
+        )}
+      </StyledFormControl>
+    )
+  }
 }
 
 ChipInput.propTypes = {
-    /** Allows duplicate chips if set to true. */
-    allowDuplicates: PropTypes.bool,
-    /** If true, the placeholder will always be visible. */
-    alwaysShowPlaceholder: PropTypes.bool,
-    /** Behavior when the chip input is blurred: `'clear'` clears the input, `'add'` creates a chip and `'ignore'` keeps the input. */
-    blurBehavior: PropTypes.oneOf(['clear', 'add', 'add-or-clear', 'ignore']),
-    /** A function of the type `({ value, text, chip, isFocused, isDisabled, isReadOnly, handleClick, handleDelete, className }, key) => node` that returns a chip based on the given properties. This can be used to customize chip styles.  Each item in the `dataSource` array will be passed to `chipRenderer` as arguments `chip`, `value` and `text`. If `dataSource` is an array of objects and `dataSourceConfig` is present, then `value` and `text` will instead correspond to the object values defined in `dataSourceConfig`. If `dataSourceConfig` is not set and `dataSource` is an array of objects, then a custom `chipRenderer` must be set. `chip` is always the raw value from `dataSource`, either an object or a string. */
-    chipRenderer: PropTypes.func,
-    /** Whether the input value should be cleared if the `value` prop is changed. */
-    clearInputValueOnChange: PropTypes.bool,
-    /** Data source for auto complete. This should be an array of strings or objects. */
-    dataSource: PropTypes.array,
-    /** Config for objects list dataSource, e.g. `{ text: 'text', value: 'value' }`. If not specified, the `dataSource` must be a flat array of strings or a custom `chipRenderer` must be set to handle the objects. */
-    dataSourceConfig: PropTypes.shape({
-        text: PropTypes.string.isRequired,
-        value: PropTypes.string.isRequired
-    }),
-    /** The chips to display by default (for uncontrolled mode). */
-    defaultValue: PropTypes.array,
-    /** Whether to use `setTimeout` to delay adding chips in case other input events like `onSelection` need to fire first */
-    delayBeforeAdd: PropTypes.bool,
-    /** Disables the chip input if set to true. */
-    disabled: PropTypes.bool,
-    /** Disable the input underline. Only valid for 'standard' variant */
-    disableUnderline: PropTypes.bool,
-    /** Props to pass through to the `FormHelperText` component. */
-    FormHelperTextProps: PropTypes.object,
-    /** If true, the chip input will fill the available width. */
-    fullWidth: PropTypes.bool,
-    /** If true, the input field will always be below the chips and fill the available space. By default, it will try to be beside the chips. */
-    fullWidthInput: PropTypes.bool,
-    /** Helper text that is displayed below the input. */
-    helperText: PropTypes.node,
-    /** Props to pass through to the `InputLabel`. */
-    InputLabelProps: PropTypes.object,
-    /** Props to pass through to the `Input`. */
-    InputProps: PropTypes.object,
-    /** Use this property to pass a ref callback to the native input component. */
-    inputRef: PropTypes.func,
-    /** The input value (enables controlled mode for the text input if set). */
-    inputValue: PropTypes.string,
-    /* The content of the floating label. */
-    label: PropTypes.node,
-    /** The key codes (`KeyboardEvent.keyCode`) used to determine when to create a new chip. */
-    newChipKeyCodes: PropTypes.arrayOf(PropTypes.number),
-    /** The keys (`KeyboardEvent.key`) used to determine when to create a new chip. */
-    newChipKeys: PropTypes.arrayOf(PropTypes.string),
-    /** Callback function that is called when a new chip was added (in controlled mode). */
-    onAdd: PropTypes.func,
-    /** Callback function that is called with the chip to be added and should return true to add the chip or false to prevent the chip from being added without clearing the text input. */
-    onBeforeAdd: PropTypes.func,
-    /** Callback function that is called when the chips change (in uncontrolled mode). */
-    onChange: PropTypes.func,
-    /** Callback function that is called when a new chip was removed (in controlled mode). */
-    onDelete: PropTypes.func,
-    /** Callback function that is called when the input changes. */
-    onUpdateInput: PropTypes.func,
-    /** A placeholder that is displayed if the input has no values. */
-    placeholder: PropTypes.string,
-    /** Makes the chip input read-only if set to true. */
-    readOnly: PropTypes.bool,
-    /** The chips to display (enables controlled mode if set). */
-    value: PropTypes.array,
-    /** The variant of the Input component */
-    variant: PropTypes.oneOf(['outlined', 'standard', 'filled'])
+  /** Allows duplicate chips if set to true. */
+  allowDuplicates: PropTypes.bool,
+  /** If true, the placeholder will always be visible. */
+  alwaysShowPlaceholder: PropTypes.bool,
+  /** Behavior when the chip input is blurred: `'clear'` clears the input, `'add'` creates a chip and `'ignore'` keeps the input. */
+  blurBehavior: PropTypes.oneOf(['clear', 'add', 'add-or-clear', 'ignore']),
+  /** A function of the type `({ value, text, chip, isFocused, isDisabled, isReadOnly, handleClick, handleDelete, className }, key) => node` that returns a chip based on the given properties. This can be used to customize chip styles.  Each item in the `dataSource` array will be passed to `chipRenderer` as arguments `chip`, `value` and `text`. If `dataSource` is an array of objects and `dataSourceConfig` is present, then `value` and `text` will instead correspond to the object values defined in `dataSourceConfig`. If `dataSourceConfig` is not set and `dataSource` is an array of objects, then a custom `chipRenderer` must be set. `chip` is always the raw value from `dataSource`, either an object or a string. */
+  chipRenderer: PropTypes.func,
+  /** Whether the input value should be cleared if the `value` prop is changed. */
+  clearInputValueOnChange: PropTypes.bool,
+  /** Data source for auto complete. This should be an array of strings or objects. */
+  dataSource: PropTypes.array,
+  /** Config for objects list dataSource, e.g. `{ text: 'text', value: 'value' }`. If not specified, the `dataSource` must be a flat array of strings or a custom `chipRenderer` must be set to handle the objects. */
+  dataSourceConfig: PropTypes.shape({
+    text: PropTypes.string.isRequired,
+    value: PropTypes.string.isRequired
+  }),
+  /** The chips to display by default (for uncontrolled mode). */
+  defaultValue: PropTypes.array,
+  /** Whether to use `setTimeout` to delay adding chips in case other input events like `onSelection` need to fire first */
+  delayBeforeAdd: PropTypes.bool,
+  /** Disables the chip input if set to true. */
+  disabled: PropTypes.bool,
+  /** Disable the input underline. Only valid for 'standard' variant */
+  disableUnderline: PropTypes.bool,
+  /** Props to pass through to the `FormHelperText` component. */
+  FormHelperTextProps: PropTypes.object,
+  /** If true, the chip input will fill the available width. */
+  fullWidth: PropTypes.bool,
+  /** If true, the input field will always be below the chips and fill the available space. By default, it will try to be beside the chips. */
+  fullWidthInput: PropTypes.bool,
+  /** Helper text that is displayed below the input. */
+  helperText: PropTypes.node,
+  /** Props to pass through to the `InputLabel`. */
+  InputLabelProps: PropTypes.object,
+  /** Props to pass through to the `Input`. */
+  InputProps: PropTypes.object,
+  /** Use this property to pass a ref callback to the native input component. */
+  inputRef: PropTypes.func,
+  /** The input value (enables controlled mode for the text input if set). */
+  inputValue: PropTypes.string,
+  /* The content of the floating label. */
+  label: PropTypes.node,
+  /** The key codes (`KeyboardEvent.keyCode`) used to determine when to create a new chip. */
+  newChipKeyCodes: PropTypes.arrayOf(PropTypes.number),
+  /** The keys (`KeyboardEvent.key`) used to determine when to create a new chip. */
+  newChipKeys: PropTypes.arrayOf(PropTypes.string),
+  /** Callback function that is called when a new chip was added (in controlled mode). */
+  onAdd: PropTypes.func,
+  /** Callback function that is called with the chip to be added and should return true to add the chip or false to prevent the chip from being added without clearing the text input. */
+  onBeforeAdd: PropTypes.func,
+  /** Callback function that is called when the chips change (in uncontrolled mode). */
+  onChange: PropTypes.func,
+  /** Callback function that is called when a new chip was removed (in controlled mode). */
+  onDelete: PropTypes.func,
+  /** Callback function that is called when the input changes. */
+  onUpdateInput: PropTypes.func,
+  /** A placeholder that is displayed if the input has no values. */
+  placeholder: PropTypes.string,
+  /** Makes the chip input read-only if set to true. */
+  readOnly: PropTypes.bool,
+  /** The chips to display (enables controlled mode if set). */
+  value: PropTypes.array,
+  /** The variant of the Input component */
+  variant: PropTypes.oneOf(['outlined', 'standard', 'filled'])
 }
 
 ChipInput.defaultProps = {
-    allowDuplicates: false,
-    blurBehavior: 'clear',
-    clearInputValueOnChange: false,
-    delayBeforeAdd: false,
-    disableUnderline: false,
-    newChipKeyCodes: [13],
-    newChipKeys: ['Enter'],
-    variant: 'standard'
+  allowDuplicates: false,
+  blurBehavior: 'clear',
+  clearInputValueOnChange: false,
+  delayBeforeAdd: false,
+  disableUnderline: false,
+  newChipKeyCodes: [13],
+  newChipKeys: ['Enter'],
+  variant: 'standard'
 }
 
 export default (ChipInput)
 
 export const defaultChipRenderer = ({ value, text, isFocused, isDisabled, isReadOnly, handleClick, handleDelete, className }, key) => (
-    <Chip
-        key={key}
-        className={className}
-        style={{
-            pointerEvents: isDisabled || isReadOnly ? 'none' : undefined,
-            backgroundColor: isFocused ? blue[300] : undefined
-        }}
-        onClick={handleClick}
-        onDelete={handleDelete}
-        label={text}
-    />
+  <Chip
+    key={key}
+    className={className}
+    style={{
+      pointerEvents: isDisabled || isReadOnly ? 'none' : undefined,
+      backgroundColor: isFocused ? blue[300] : undefined,
+    }}
+    onClick={handleClick}
+    onDelete={handleDelete}
+    label={text}
+  />
 )
\ No newline at end of file

From 7d2e8f29bd0f28463bebd36612415c9488a124b0 Mon Sep 17 00:00:00 2001
From: lasanthaS <lasn1987@gmail.com>
Date: Thu, 21 Mar 2024 17:57:18 +0530
Subject: [PATCH 35/42] Fix https://github.com/wso2/api-manager/issues/2692

---
 .../Shared/AppsAndKeys/ViewKeys.jsx           | 21 ++-----------------
 .../Shared/AppsAndKeys/ViewSecret.jsx         |  1 +
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewKeys.jsx b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewKeys.jsx
index 9c5cf6488ac..db1b4e44000 100755
--- a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewKeys.jsx
+++ b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewKeys.jsx
@@ -56,24 +56,7 @@ const classes = {
     iconButton: `${PREFIX}-iconButton`
 };
 
-const Root = styled('div')((
-    {
-        theme
-    }
-) => ({
-    [`& .${classes.button}`]: {
-        margin: theme.spacing(3),
-        color: theme.palette.getContrastText(theme.palette.background.default),
-        display: 'flex',
-        alignItems: 'center',
-        fontSize: '11px',
-        cursor: 'pointer',
-        '& span': {
-            paddingLeft: 6,
-            display: 'inline-block',
-        },
-    },
-
+const Root = styled('div')(({ theme }) => ({
     [`& .${classes.inputWrapper}`]: {
         display: 'flex',
         flexDirection: 'row',
@@ -451,7 +434,7 @@ class ViewKeys extends React.Component {
                             <Button
                                 variant='contained'
                                 color='primary'
-                                className={classes.button}
+                                sx={{ mt: 1 }}
                                 onClick={() => this.handleSecretRegenerate(consumerKey, keyType, keyMappingId, selectedTab)}
                                 disabled={!isUserOwner}
                             >
diff --git a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewSecret.jsx b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewSecret.jsx
index 6f8ae1198b6..c6f473d7883 100755
--- a/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewSecret.jsx
+++ b/portals/devportal/src/main/webapp/source/src/app/components/Shared/AppsAndKeys/ViewSecret.jsx
@@ -18,6 +18,7 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
 import PropTypes from 'prop-types';
+import IconButton from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
 import FileCopy from '@mui/icons-material/FileCopy';
 import Typography from '@mui/material/Typography';

From cf59a29e4c93ce463b025b5a3b23602c9541a506 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 12:50:41 +0000
Subject: [PATCH 36/42] [WSO2 Release] [Jenkins #810] [Release 9.1.19] prepare
 release v9.1.19

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 088d27858f7..4798a4ab8cc 100644
--- 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.1.19-SNAPSHOT</version>
+    <version>9.1.19</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.19</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index a33d9cc8888..d9bd0eaa8dd 100644
--- 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.1.19-SNAPSHOT</version>
+        <version>9.1.19</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index ee3af279153..db575515add 100644
--- 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.1.19-SNAPSHOT</version>
+        <version>9.1.19</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index d39255d0b33..667eba39ea8 100644
--- 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.1.19-SNAPSHOT</version>
+        <version>9.1.19</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.19-SNAPSHOT</version>
+    <version>9.1.19</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
index 5145ecf10e5..15f482293a5 100644
--- 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.1.19-SNAPSHOT</version>
+        <version>9.1.19</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 6e25339b6b9e4b635516b62f8ff77f59c99587b4 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 12:50:43 +0000
Subject: [PATCH 37/42] [WSO2 Release] [Jenkins #810] [Release 9.1.19] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4798a4ab8cc..a88808b0363 100644
--- 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.1.19</version>
+    <version>9.1.20-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.19</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index d9bd0eaa8dd..f22ee568e77 100644
--- 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.1.19</version>
+        <version>9.1.20-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index db575515add..939760a2ef6 100644
--- 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.1.19</version>
+        <version>9.1.20-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 667eba39ea8..e6350bf53f1 100644
--- 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.1.19</version>
+        <version>9.1.20-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.19</version>
+    <version>9.1.20-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
index 15f482293a5..cab9ac02bc4 100644
--- 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.1.19</version>
+        <version>9.1.20-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From e2ebf208a7a5e1e72f1cbfc90177b5ab8cfb01b3 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 17:14:01 +0000
Subject: [PATCH 38/42] [WSO2 Release] [Jenkins #812] [Release 9.1.20] prepare
 release v9.1.20

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index a88808b0363..b8e4e748668 100644
--- 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.1.20-SNAPSHOT</version>
+    <version>9.1.20</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.20</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index f22ee568e77..5f4638c6e1f 100644
--- 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.1.20-SNAPSHOT</version>
+        <version>9.1.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 939760a2ef6..48a744825fd 100644
--- 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.1.20-SNAPSHOT</version>
+        <version>9.1.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index e6350bf53f1..1e64140c770 100644
--- 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.1.20-SNAPSHOT</version>
+        <version>9.1.20</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.20-SNAPSHOT</version>
+    <version>9.1.20</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
index cab9ac02bc4..53ed1b61074 100644
--- 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.1.20-SNAPSHOT</version>
+        <version>9.1.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 263b9fec63901bfe73c2c1ba8fca3a35c72f13eb Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 17:14:02 +0000
Subject: [PATCH 39/42] [WSO2 Release] [Jenkins #812] [Release 9.1.20] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index b8e4e748668..95119dd592d 100644
--- 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.1.20</version>
+    <version>9.1.21-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.20</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 5f4638c6e1f..43cce2de761 100644
--- 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.1.20</version>
+        <version>9.1.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 48a744825fd..c39f5222b11 100644
--- 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.1.20</version>
+        <version>9.1.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 1e64140c770..8a1263a898b 100644
--- 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.1.20</version>
+        <version>9.1.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.20</version>
+    <version>9.1.21-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
index 53ed1b61074..115c1d10208 100644
--- 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.1.20</version>
+        <version>9.1.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 6aaa37bc7ed9bf0a8bee4713b937a948315a5667 Mon Sep 17 00:00:00 2001
From: AnuGayan <anushaj@wso2.com>
Date: Fri, 22 Mar 2024 01:01:26 +0530
Subject: [PATCH 40/42] Fix issues related to OpenAPI 3.1.0

---
 .../Apis/Details/Resources/Resources.jsx      | 22 +++++++++----------
 .../Apis/Details/Resources/operationUtils.js  |  5 +++--
 .../main/webapp/source/src/app/data/api.js    | 20 +++++++++++++++++
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/Resources.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/Resources.jsx
index 98f8a239468..93831d6a1c4 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/Resources.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/Resources.jsx
@@ -29,7 +29,6 @@ import Banner from 'AppComponents/Shared/Banner';
 import API from 'AppData/api';
 import CircularProgress from '@mui/material/CircularProgress';
 import PropTypes from 'prop-types';
-import SwaggerParser from '@apidevtools/swagger-parser';
 import { isRestricted } from 'AppData/AuthManager';
 import CONSTS from 'AppData/Constants';
 import Configurations from 'Config';
@@ -315,7 +314,7 @@ export default function Resources(props) {
      */
     function setSecurityDefScopesFromSpec(spec) {
         const openAPIVersion = getVersion(spec);
-        if (VERSIONS.V3.test(openAPIVersion)) {
+        if (VERSIONS.V3.test(openAPIVersion) || VERSIONS.V3_1.test(openAPIVersion)) {
             if (spec.components && spec.components.securitySchemes && spec.components.securitySchemes.default) {
                 const { flows } = spec.components.securitySchemes.default;
                 if (flows.implicit.scopes) {
@@ -336,7 +335,7 @@ export default function Resources(props) {
      */
     function setSpecScopesFromSecurityDefScopes() {
         const openAPIVersion = getVersion(openAPISpec);
-        if (VERSIONS.V3.test(openAPIVersion)) {
+        if (VERSIONS.V3.test(openAPIVersion) || VERSIONS.V3_1.test(openAPIVersion)) {
             if (openAPISpec.components
                 && openAPISpec.components.securitySchemes
                 && openAPISpec.components.securitySchemes.default) {
@@ -364,15 +363,16 @@ export default function Resources(props) {
         /*
         * Used SwaggerParser.validate() because we can get the errors as well.
         */
-        SwaggerParser.validate(specCopy, (err, result) => {
-            setResolvedSpec(() => {
-                const errors = err ? [err] : [];
-                return {
-                    spec: result,
-                    errors,
-                };
+        API.validateOpenAPIByInlineDefinition(specCopy)
+            .then((response) => {
+                setResolvedSpec(() => {
+                    const errors = response.body.errors ? response.body.errors : [];
+                    return {
+                        spec: response.body.info,
+                        errors,
+                    };
+                });
             });
-        });
         operationsDispatcher({ action: 'init', data: rawSpec.paths });
         setOpenAPISpec(rawSpec);
         setSecurityDefScopesFromSpec(rawSpec);
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/operationUtils.js b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/operationUtils.js
index 09025f6eb33..4d6b9ad6fc0 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/operationUtils.js
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Resources/operationUtils.js
@@ -18,6 +18,7 @@
 
 const VERSIONS = {
     V3: new RegExp('[3][.][0][.][0-9]'),
+    V3_1: new RegExp('[3][.][1][.][0-9]'),
     V2: new RegExp('[2][.][0]'),
 };
 /**
@@ -110,7 +111,7 @@ function extractPathParameters(target, spec) {
     const params = target.match(regEx) || [];
     let parameters = [];
     const openAPIVersion = getVersion(spec);
-    if (VERSIONS.V3.test(openAPIVersion)) {
+    if (VERSIONS.V3.test(openAPIVersion) || VERSIONS.V3_1.test(openAPIVersion)) {
         parameters = params.map((para) => {
             const paraObj = {};
             paraObj.name = para;
@@ -166,7 +167,7 @@ function extractAsyncAPIPathParameters(target) {
 function getOperationScopes(operation, spec) {
     const openAPIVersion = getVersion(spec);
     let scopes = [];
-    if (VERSIONS.V3.test(openAPIVersion)) {
+    if (VERSIONS.V3.test(openAPIVersion) || VERSIONS.V3_1.test(openAPIVersion)) {
         if (Array.isArray(operation.security) && operation.security.find((item) => item.default)) {
             scopes = operation.security.find((item) => item.default).default;
         } else if (operation['x-scope']) {
diff --git a/portals/publisher/src/main/webapp/source/src/app/data/api.js b/portals/publisher/src/main/webapp/source/src/app/data/api.js
index 4f492e031a8..b5c123e1059 100644
--- a/portals/publisher/src/main/webapp/source/src/app/data/api.js
+++ b/portals/publisher/src/main/webapp/source/src/app/data/api.js
@@ -167,6 +167,26 @@ class API extends Resource {
         return promisedValidate;
     }
 
+    static validateOpenAPIByInlineDefinition(openAPIData) {
+        const apiClient = new APIClientFactory().getAPIClient(Utils.getCurrentEnvironment(), Utils.CONST.API_CLIENT).client;
+        let payload, promisedValidate;
+        payload = {
+            inlineAPIDefinition: openAPIData,
+        };
+        const requestBody = {
+            requestBody: {
+                inlineAPIDefinition: openAPIData,
+            },
+        };
+        promisedValidate = apiClient.then(client => {
+            return client.apis.Validation.validateOpenAPIDefinition(
+                payload,
+                requestBody
+            );
+        });
+        return promisedValidate;
+    }
+
     static validateOpenAPIByUrl(url, params = { returnContent: false }) {
         const apiClient = new APIClientFactory().getAPIClient(Utils.getCurrentEnvironment(), Utils.CONST.API_CLIENT).client;
         const payload = {

From 7e374e58e63adb96171150bbca8264124b3c629e Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 19:56:55 +0000
Subject: [PATCH 41/42] [WSO2 Release] [Jenkins #814] [Release 9.1.21] prepare
 release v9.1.21

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95119dd592d..db1b5dfc09f 100644
--- 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.1.21-SNAPSHOT</version>
+    <version>9.1.21</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.1.21</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 43cce2de761..3e74b215a6a 100644
--- 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.1.21-SNAPSHOT</version>
+        <version>9.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index c39f5222b11..771f744a392 100644
--- 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.1.21-SNAPSHOT</version>
+        <version>9.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 8a1263a898b..90520f8c2b3 100644
--- 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.1.21-SNAPSHOT</version>
+        <version>9.1.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.21-SNAPSHOT</version>
+    <version>9.1.21</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
index 115c1d10208..95ad4062f62 100644
--- 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.1.21-SNAPSHOT</version>
+        <version>9.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 2d8c1b34ce860b6b402e261cc70de66d36119e8c Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 21 Mar 2024 19:56:57 +0000
Subject: [PATCH 42/42] [WSO2 Release] [Jenkins #814] [Release 9.1.21] prepare
 for next development iteration

---
 pom.xml                   | 4 ++--
 portals/admin/pom.xml     | 2 +-
 portals/devportal/pom.xml | 2 +-
 portals/pom.xml           | 4 ++--
 portals/publisher/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index db1b5dfc09f..1820fc888d2 100644
--- 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.1.21</version>
+    <version>9.1.22-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/apim-apps.git</url>
         <developerConnection>scm:git:https://github.com/wso2/apim-apps.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/apim-apps.git</connection>
-        <tag>v9.1.21</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
diff --git a/portals/admin/pom.xml b/portals/admin/pom.xml
index 3e74b215a6a..3aad3612f68 100644
--- 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.1.21</version>
+        <version>9.1.22-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/devportal/pom.xml b/portals/devportal/pom.xml
index 771f744a392..99dc41f3db8 100644
--- 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.1.21</version>
+        <version>9.1.22-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/portals/pom.xml b/portals/pom.xml
index 90520f8c2b3..a1e368fe577 100644
--- 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.1.21</version>
+        <version>9.1.22-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apim.ui.apps.portals</artifactId>
     <packaging>pom</packaging>
-    <version>9.1.21</version>
+    <version>9.1.22-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
index 95ad4062f62..60c00298aa7 100644
--- 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.1.21</version>
+        <version>9.1.22-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>