Merge pull request #474 from ashera96/api-levevl-policies

Add UI implementation for API level policy support feature
wso2 · Jul 11, 2023 · 84e8796 · 84e8796
2 parents 6678260 + 97e36bd
commit 84e8796
Show file tree

Hide file tree

Showing 19 changed files with 556 additions and 197 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
@@ -5711,6 +5711,12 @@
       "value": "Response Flow"
     }
   ],
+  "Apis.Details.Policies.PoliciesSection.info": [
+    {
+      "type": 0,
+      "value": "API level policies will execute before operation level policies"
+    }
+  ],
   "Apis.Details.Policies.PolicyConfigurationEditDrawer.title": [
     {
       "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
@@ -2712,6 +2712,9 @@
   "Apis.Details.Policies.PoliciesExpansion.response.flow.title": {
     "defaultMessage": "Response Flow"
   },
+  "Apis.Details.Policies.PoliciesSection.info": {
+    "defaultMessage": "API level policies will execute before operation level policies"
+  },
   "Apis.Details.Policies.PolicyConfigurationEditDrawer.title": {
     "defaultMessage": "Configure {policy}"
   },

diff --git a/...er/src/main/webapp/source/src/app/components/Apis/Details/Policies/AttachedPolicyCard.tsx b/...er/src/main/webapp/source/src/app/components/Apis/Details/Policies/AttachedPolicyCard.tsx
@@ -51,6 +51,7 @@ interface AttachedPolicyCardProps {
     verb: string;
     target: string;
     allPolicies: PolicySpec[] | null;
+    isAPILevelPolicy: boolean;
 }
 
 /**
@@ -66,6 +67,7 @@ const AttachedPolicyCard: FC<AttachedPolicyCardProps> = ({
     verb,
     target,
     allPolicies,
+    isAPILevelPolicy,
 }) => {
     const classes = useStyles();
     const { api } = useContext<any>(ApiContext);
@@ -232,6 +234,7 @@ const AttachedPolicyCard: FC<AttachedPolicyCardProps> = ({
                     target={target}
                     verb={verb}
                     allPolicies={allPolicies}
+                    isAPILevelPolicy={isAPILevelPolicy}
                 />
             )}
         </>

diff --git a/...ain/webapp/source/src/app/components/Apis/Details/Policies/AttachedPolicyForm/General.tsx b/...ain/webapp/source/src/app/components/Apis/Details/Policies/AttachedPolicyForm/General.tsx
@@ -68,10 +68,20 @@ interface GeneralProps {
     policySpec: PolicySpec;
     handleDrawerClose: () => void;
     isEditMode: boolean;
+    isAPILevelPolicy: boolean;
 }
 
 const General: FC<GeneralProps> = ({
-    policyObj, setDroppedPolicy, currentFlow, target, verb, apiPolicy, policySpec, handleDrawerClose, isEditMode
+    policyObj,
+    setDroppedPolicy,
+    currentFlow,
+    target,
+    verb,
+    apiPolicy,
+    policySpec,
+    handleDrawerClose,
+    isEditMode,
+    isAPILevelPolicy,
 }) => {
     const intl = useIntl();
     const classes = useStyles();
@@ -334,7 +344,7 @@ const General: FC<GeneralProps> = ({
                                     name={spec.name}
                                     type={spec.type.toLowerCase() === 'integer' ? 'number' : 'text'}
                                     value={getValue(spec)}
-                                    onChange={(e) => onInputChange(e, spec.type)}
+                                    onChange={(e: any) => onInputChange(e, spec.type)}
                                     fullWidth
                                 />
                             )}
@@ -407,7 +417,7 @@ const General: FC<GeneralProps> = ({
                             )}
                         </Grid>
                     ))}
-                    {setDroppedPolicy && (
+                    {setDroppedPolicy && !isAPILevelPolicy && (
                         <Grid item container justify='flex-start' xs={12}>
                             <FormControlLabel
                                 control={

diff --git a/...er/src/main/webapp/source/src/app/components/Apis/Details/Policies/AttachedPolicyList.tsx b/...er/src/main/webapp/source/src/app/components/Apis/Details/Policies/AttachedPolicyList.tsx
@@ -42,6 +42,7 @@ interface AttachedPolicyListProps {
     target: string;
     verb: string;
     allPolicies: PolicySpec[] | null;
+    isAPILevelPolicy: boolean;
 }
 
 /**
@@ -57,6 +58,7 @@ const AttachedPolicyList: FC<AttachedPolicyListProps> = ({
     target,
     verb,
     allPolicies,
+    isAPILevelPolicy,
 }) => {
     const reversedPolicyList = [...currentPolicyList].reverse();
     const policyListToDisplay =
@@ -116,6 +118,7 @@ const AttachedPolicyList: FC<AttachedPolicyListProps> = ({
                             target={target}
                             verb={verb}
                             allPolicies={allPolicies}
+                            isAPILevelPolicy={isAPILevelPolicy}
                         />
                     ))}
                 </SortableContext>

diff --git a/...isher/src/main/webapp/source/src/app/components/Apis/Details/Policies/OperationPolicy.tsx b/...isher/src/main/webapp/source/src/app/components/Apis/Details/Policies/OperationPolicy.tsx
@@ -185,6 +185,7 @@ const OperationPolicy: FC<OperationPolicyProps> = ({
                     allPolicies={allPolicies}
                     isChoreoConnectEnabled={isChoreoConnectEnabled}
                     policyList={policyList}
+                    isAPILevelPolicy={false}
                 />
             </ExpansionPanel>
         </>