feat: add crud + permission api

Author: ritvikmahajan17

src/components/ApplicationGroup/AppGroup.service.ts

@@ -194,16 +194,17 @@ export const getAppGroupList = (envId: number): Promise<AppGroupList> => {
     return get(`${Routes.APP_LIST_GROUP}/${envId}`)
 }
 
-export const getEnvGroupList = (envId: number): Promise<EnvGroupListResponse> => {
-    return get(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUPS}`)
+export const getEnvGroupList = (envId: number, filterParentType:string): Promise<EnvGroupListResponse> => {
+    return get(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUPS}?groupType=${filterParentType}`)
 }
 
 export const getEnvGroup = (envId: number, groupId: number): Promise<EnvGroupResponse> => {
     return get(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}/${groupId}`)
 }
 
-export const createEnvGroup = (envId: string, data: EnvGroupListType, isEdit: boolean): Promise<EnvGroupResponse> => {
+export const createEnvGroup = (envId: string, data, isEdit: boolean): Promise<EnvGroupResponse> => {
     if (isEdit) {
+        console.log('edit')
         return put(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}`, data)
     }
     return post(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}`, data)
@@ -213,6 +214,6 @@ export const appGroupPermission = (envId: string, data: CheckPermissionType): Pr
     return post(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}/${Routes.PERMISSION}`, data)
 }
 
-export const deleteEnvGroup = (envId: string, groupId: string): Promise<EnvGroupResponse> => {
-    return trash(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}/${groupId}`)
+export const deleteEnvGroup = (envId: string, groupId: string, filterParentType?:string): Promise<EnvGroupResponse> => {
+    return trash(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}/${groupId}?groupType=${filterParentType}`)
 }

src/components/ApplicationGroup/AppGroup.types.ts

@@ -385,6 +385,6 @@ export interface SearchBarType {
 }
 
 export enum FilterParentType {
-    app = 'app',
-    env = 'env',
+    app = 'app-group',
+    env = 'env-group',
 }

src/components/ApplicationGroup/AppGroupDetailsRoute.tsx

@@ -101,7 +101,7 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
     const getSavedFilterData = async (groupId?: number): Promise<void> => {
         setSelectedAppList([])
         setAppListLoading(true)
-        const { result } = await getEnvGroupList(+envId)
+        const { result } = await getEnvGroupList(+envId, FilterParentType.app) //FIXME if required
         if (result) {
             const _groupFilterOption = []
             let _selectedGroup
@@ -227,6 +227,7 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
         if (groupId) {
             // true for edit
             _selectedGroup = groupFilterOptions.find((group) => group.value === groupId)
+            console.log('_selectedGroup', _selectedGroup)
             const groupAppIds = _selectedGroup?.appIds || []
             for (const appId of groupAppIds) {
                 _allAppIds.push(appId)

src/components/ApplicationGroup/CreateAppGroup.tsx

@@ -28,13 +28,15 @@ export default function CreateAppGroup({
     unAuthorizedApps,
     filterParentType,
 }: CreateGroupType) {
-    const { envId } = useParams<{ envId: string }>()
+    const { appId, envId } = useParams<{ appId: string; envId: string }>()
     const CreateGroupRef = useRef<HTMLDivElement>(null)
     const [isLoading, setLoading] = useState(false)
     const [showErrorMsg, setShowErrorMsg] = useState(false)
     const [appGroupName, setAppGroupName] = useState<string>(selectedAppGroup?.label ?? '')
     const [appGroupDescription, setAppGroupDescription] = useState<string>(selectedAppGroup?.description ?? '')
-    const [selectedTab, setSelectedTab] = useState<CreateGroupTabs>(CreateGroupTabs.SELECTED_APPS)
+    const [selectedTab, setSelectedTab] = useState<CreateGroupTabs>(
+        filterParentType === FilterParentType.env ? CreateGroupTabs.SELECTED_ENV : CreateGroupTabs.SELECTED_APPS,
+    )
     const [allAppSearchText, setAllAppSearchText] = useState('')
     const [allAppSearchApplied, setAllAppSearchApplied] = useState(false)
     const [selectedAppSearchText, setSelectedAppSearchText] = useState('')
@@ -151,6 +153,7 @@ export default function CreateAppGroup({
     }
 
     const renderSelectedApps = (): JSX.Element => {
+        console.log('selectedApps')
         return (
             <div>
                 <SearchBar
@@ -216,6 +219,7 @@ export default function CreateAppGroup({
     }
 
     const renderAllApps = (): JSX.Element => {
+        console.log('allApps')
         return (
             <div>
                 <SearchBar
@@ -262,6 +266,7 @@ export default function CreateAppGroup({
     }
 
     const onTabChange = (e): void => {
+        console.log('onTabChange', e.currentTarget.dataset.tabName)
         setSelectedTab(e.currentTarget.dataset.tabName)
     }
 
@@ -288,6 +293,8 @@ export default function CreateAppGroup({
             return 'Max 30 char is allowed in name'
         }
     }
+    console.log(selectedTab, CreateGroupTabs.SELECTED_APPS, CreateGroupTabs.SELECTED_ENV)
+    console.log(selectedTab === (CreateGroupTabs.SELECTED_APPS || selectedTab === CreateGroupTabs.SELECTED_ENV))
 
     const renderBodySection = (): JSX.Element => {
         if (isLoading) {
@@ -348,7 +355,10 @@ export default function CreateAppGroup({
                             appList.length,
                         )}
                     </ul>
-                    {selectedTab === CreateGroupTabs.SELECTED_APPS ? renderSelectedApps() : renderAllApps()}
+
+                    {selectedTab === CreateGroupTabs.SELECTED_APPS || selectedTab === CreateGroupTabs.SELECTED_ENV
+                        ? renderSelectedApps()
+                        : renderAllApps()}
                 </div>
             </div>
         )
@@ -386,12 +396,15 @@ export default function CreateAppGroup({
             id: selectedAppGroup ? +selectedAppGroup.value : null,
             name: appGroupName,
             description: appGroupDescription,
-            appIds: payloadAppIds,
+            resourceIds: payloadAppIds,
+            groupType: filterParentType,
         }
 
         try {
-            const { result } = await createEnvGroup(envId, payload, !!selectedAppGroup?.value)
+            const id = filterParentType === FilterParentType.env ? appId : envId
+            const { result } = await createEnvGroup(id, payload, !!selectedAppGroup?.value)
             toast.success('Successfully saved')
+            console.log('result', result)
             closePopup(e, result.id)
         } catch (err) {
             showError(err)