Skip to content

Commit fe9c905

Browse files
ritvikmahajan17ritvikmahajan17
committed
chore: address PR comments and remove console logs
1 parent 34831ac commit fe9c905

File tree

6 files changed

+21
-49
lines changed

6 files changed

+21
-49
lines changed

‎src/components/ApplicationGroup/AppGroup.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ export const getAppGroupList = (envId: number): Promise<AppGroupList> => {
194194
return get(`${Routes.APP_LIST_GROUP}/${envId}`)
195195
}
196196

197-
export const getEnvGroupList = (envId: number, filterParentType:string): Promise<EnvGroupListResponse> => {
197+
export const getEnvGroupList = (envId: number, filterParentType?:string): Promise<EnvGroupListResponse> => {
198+
if(!filterParentType) return get(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUPS}`)
198199
return get(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUPS}?groupType=${filterParentType}`)
199200
}
200201

@@ -204,7 +205,6 @@ export const getEnvGroup = (envId: number, groupId: number): Promise<EnvGroupRes
204205

205206
export const createEnvGroup = (envId: string, data, isEdit: boolean): Promise<EnvGroupResponse> => {
206207
if (isEdit) {
207-
console.log('edit')
208208
return put(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}`, data)
209209
}
210210
return post(`${Routes.ENVIRONMENT}/${envId}/${Routes.GROUP}`, data)

‎src/components/ApplicationGroup/AppGroup.types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,6 @@ export interface SearchBarType {
385385
}
386386

387387
export enum FilterParentType {
388-
app = 'app-group',
389-
env = 'env-group',
388+
app = 'env-group',
389+
env = 'app-group',
390390
}

‎src/components/ApplicationGroup/AppGroupDetailsRoute.tsx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
101101
const getSavedFilterData = async (groupId?: number): Promise<void> => {
102102
setSelectedAppList([])
103103
setAppListLoading(true)
104-
const { result } = await getEnvGroupList(+envId, FilterParentType.app) //FIXME if required
104+
const { result } = await getEnvGroupList(+envId)
105105
if (result) {
106106
const _groupFilterOption = []
107107
let _selectedGroup
@@ -216,18 +216,14 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
216216
}
217217
}
218218

219-
// opens with edit state and blank state while clicked onSave
220219
const openCreateGroup = (e, groupId?: string, _edit?: boolean) => {
221-
console.log('openCreateGroup', groupId, _edit)
222220
stopPropagation(e)
223221
const selectedAppsMap: Record<string, boolean> = {}
224222
const _allAppList: { id: string; appName: string; isSelected: boolean }[] = []
225223
let _selectedGroup
226224
const _allAppIds: number[] = []
227225
if (groupId) {
228-
// true for edit
229226
_selectedGroup = groupFilterOptions.find((group) => group.value === groupId)
230-
console.log('_selectedGroup', _selectedGroup)
231227
const groupAppIds = _selectedGroup?.appIds || []
232228
for (const appId of groupAppIds) {
233229
_allAppIds.push(appId)
@@ -253,7 +249,6 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
253249
envId: +envId,
254250
}
255251
if (_edit) {
256-
// true for edit
257252
getPermissionCheck({ appIds: _allAppIds }, _edit)
258253
} else {
259254
getPermissionCheck(_permissionData)

‎src/components/ApplicationGroup/CreateAppGroup.tsx‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function CreateAppGroup({
3535
const [appGroupName, setAppGroupName] = useState<string>(selectedAppGroup?.label ?? '')
3636
const [appGroupDescription, setAppGroupDescription] = useState<string>(selectedAppGroup?.description ?? '')
3737
const [selectedTab, setSelectedTab] = useState<CreateGroupTabs>(
38-
filterParentType === FilterParentType.env ? CreateGroupTabs.SELECTED_ENV : CreateGroupTabs.SELECTED_APPS,
38+
filterParentType === FilterParentType.app ? CreateGroupTabs.SELECTED_ENV : CreateGroupTabs.SELECTED_APPS,
3939
)
4040
const [allAppSearchText, setAllAppSearchText] = useState('')
4141
const [allAppSearchApplied, setAllAppSearchApplied] = useState(false)
@@ -153,7 +153,6 @@ export default function CreateAppGroup({
153153
}
154154

155155
const renderSelectedApps = (): JSX.Element => {
156-
console.log('selectedApps')
157156
return (
158157
<div>
159158
<SearchBar
@@ -219,7 +218,6 @@ export default function CreateAppGroup({
219218
}
220219

221220
const renderAllApps = (): JSX.Element => {
222-
console.log('allApps')
223221
return (
224222
<div>
225223
<SearchBar
@@ -266,7 +264,6 @@ export default function CreateAppGroup({
266264
}
267265

268266
const onTabChange = (e): void => {
269-
console.log('onTabChange', e.currentTarget.dataset.tabName)
270267
setSelectedTab(e.currentTarget.dataset.tabName)
271268
}
272269

@@ -293,8 +290,6 @@ export default function CreateAppGroup({
293290
return 'Max 30 char is allowed in name'
294291
}
295292
}
296-
console.log(selectedTab, CreateGroupTabs.SELECTED_APPS, CreateGroupTabs.SELECTED_ENV)
297-
console.log(selectedTab === (CreateGroupTabs.SELECTED_APPS || selectedTab === CreateGroupTabs.SELECTED_ENV))
298293

299294
const renderBodySection = (): JSX.Element => {
300295
if (isLoading) {
@@ -343,13 +338,13 @@ export default function CreateAppGroup({
343338
<div>
344339
<ul role="tablist" className="tab-list dc__border-bottom mb-8">
345340
{renderTabItem(
346-
filterParentType === FilterParentType.env
341+
filterParentType === FilterParentType.app
347342
? CreateGroupTabs.SELECTED_ENV
348343
: CreateGroupTabs.SELECTED_APPS,
349344
selectedAppsCount,
350345
)}
351346
{renderTabItem(
352-
filterParentType === FilterParentType.env
347+
filterParentType === FilterParentType.app
353348
? CreateGroupTabs.ALL_ENV
354349
: CreateGroupTabs.ALL_APPS,
355350
appList.length,
@@ -401,10 +396,9 @@ export default function CreateAppGroup({
401396
}
402397

403398
try {
404-
const id = filterParentType === FilterParentType.env ? appId : envId
399+
const id = filterParentType === FilterParentType.app ? appId : envId
405400
const { result } = await createEnvGroup(id, payload, !!selectedAppGroup?.value)
406401
toast.success('Successfully saved')
407-
console.log('result', result)
408402
closePopup(e, result.id)
409403
} catch (err) {
410404
showError(err)

‎src/components/app/details/AppHeader.tsx‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,11 @@ export function AppHeader({
230230
}
231231

232232
return (
233-
<>
234-
<PageHeader
235-
breadCrumbs={renderBreadcrumbs}
236-
isBreadcrumbs={true}
237-
showTabs={true}
238-
renderHeaderTabs={renderAppDetailsTabs}
239-
/>
240-
</>
233+
<PageHeader
234+
breadCrumbs={renderBreadcrumbs}
235+
isBreadcrumbs={true}
236+
showTabs={true}
237+
renderHeaderTabs={renderAppDetailsTabs}
238+
/>
241239
)
242240
}

‎src/components/app/details/main.tsx‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
7878
setSelectedAppList([])
7979
setAppListLoading(true)
8080
setGroupFilterOptions([])
81-
const { result } = await getEnvGroupList(+appId, FilterParentType.env)
82-
console.log(result, 'savedFilterData')
81+
const { result } = await getEnvGroupList(+appId, FilterParentType.app)
8382
if (result) {
8483
const _groupFilterOption = []
8584
let _selectedGroup
@@ -115,7 +114,6 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
115114
}
116115

117116
const getAppListData = async (): Promise<void> => {
118-
console.log('abhishek')
119117
setSelectedAppList([])
120118
setAppListLoading(true)
121119
const { result } = await getAppOtherEnvironmentMin(appId)
@@ -162,13 +160,9 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
162160
}
163161

164162
async function getPermissionCheck(payload, _edit?: boolean, _delete?: boolean): Promise<void> {
165-
console.log(_delete, 'delete')
166-
console.log(_edit, 'edit')
167-
console.log(payload, 'payload')
168163
try {
169164
const { result } = await appGroupPermission(appId, payload)
170165
if (result && !_delete) {
171-
console.log(result)
172166
setShowCreateGroup(true)
173167
} else if (result && _delete) {
174168
setIsPopupBox(true)
@@ -221,13 +215,9 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
221215
let _selectedGroup
222216
const _allAppIds: number[] = []
223217
if (groupId) {
224-
console.log(groupId)
225-
console.log(groupFilterOptions)
226218
_selectedGroup = groupFilterOptions.find((group) => group.value === groupId)
227-
console.log(_selectedGroup)
228219
const groupAppIds = _selectedGroup?.appIds || []
229220
for (const appId of groupAppIds) {
230-
console.log(appId)
231221
_allAppIds.push(appId)
232222
selectedAppsMap[appId] = true
233223
}
@@ -239,7 +229,6 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
239229
for (const app of appListOptions) {
240230
_allAppList.push({ id: app.value, appName: app.label, isSelected: selectedAppsMap[app.value] })
241231
}
242-
console.log(_allAppList)
243232
setClickedGroup(_selectedGroup)
244233
setAllAppsList(_allAppList)
245234
const _allAppLists: number[] = []
@@ -250,13 +239,11 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
250239
id: +appId,
251240
resourceIds: _allAppLists,
252241
parentResourceId: +appId,
253-
groupType: FilterParentType.env,
242+
groupType: FilterParentType.app,
254243
}
255244
if (_edit) {
256-
console.log('edit')
257-
getPermissionCheck({ resourceIds: _allAppIds, groupType: FilterParentType.env }, _edit)
245+
getPermissionCheck({ resourceIds: _allAppIds, groupType: FilterParentType.app }, _edit)
258246
} else {
259-
console.log('create')
260247
getPermissionCheck(_permissionData)
261248
}
262249
}
@@ -270,14 +257,12 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
270257
}
271258

272259
async function handleDelete() {
273-
console.log('handleDelete')
274260
if (deleting) {
275261
return
276262
}
277263
setDeleting(true)
278264
try {
279-
console.log('deleting', clickedGroup.value)
280-
await deleteEnvGroup(appId, clickedGroup.value, FilterParentType.env)
265+
await deleteEnvGroup(appId, clickedGroup.value, FilterParentType.app)
281266
toast.success('Successfully deleted')
282267
setShowDeleteGroup(false)
283268
getSavedFilterData(
@@ -300,7 +285,7 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
300285
stopPropagation(e)
301286
const selectedGroupId = groupFilterOptions.find((group) => group.value === groupId)
302287
setClickedGroup(selectedGroupId)
303-
getPermissionCheck({ resourceIds: selectedGroupId.appIds, groupType: FilterParentType.env }, false, true)
288+
getPermissionCheck({ resourceIds: selectedGroupId.appIds, groupType: FilterParentType.app }, false, true)
304289
}
305290

306291
if (appListLoading) {
@@ -333,7 +318,7 @@ export default function AppDetailsPage({ isV2 }: AppDetailsProps) {
333318
appList={allAppsList}
334319
selectedAppGroup={clickedGroup}
335320
closePopup={closeCreateGroup}
336-
filterParentType={FilterParentType.env}
321+
filterParentType={FilterParentType.app}
337322
/>
338323
)}
339324
{showDeleteGroup && isPopupBox && (

0 commit comments

Comments
 (0)