Skip to content

fix:App group empty state handled #1516

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 6, 2023
Merged

fix:App group empty state handled #1516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff1834c
bug fix
ShashwatDadhich Dec 6, 2023
6db1733
code review comments incorporated
ShashwatDadhich Dec 6, 2023
0870d4e
code review comments incorporated
ShashwatDadhich Dec 6, 2023
a960819
code review comments incorporated
ShashwatDadhich Dec 6, 2023
5cef765
code review comments incorporated
ShashwatDadhich Dec 6, 2023
1e4fdd0
code review comments incorporated
ShashwatDadhich Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions src/components/ApplicationGroup/AppGroup.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,32 @@ export const getWorkflows = (envID: string, appIds: string): Promise<WorkflowsRe
getCIConfig(envID, appIds),
getCDConfig(envID, appIds),
getExternalCIList(envID, appIds),
]).then(([workflow, ciConfig, cdConfig, externalCIConfig]) => {
const _ciConfigMap = new Map<number, CiPipelineResult>()
for (const _ciConfig of ciConfig.result) {
_ciConfigMap.set(_ciConfig.appId, _ciConfig)
}
for (const workflowResult of workflow.result.workflows) {
const processWorkflowData = processWorkflow(
{
...workflowResult,
workflows: [workflowResult],
} as WorkflowResult,
_ciConfigMap.get(workflowResult.appId),
cdConfig.result as CdPipelineResult,
externalCIConfig.result,
WorkflowTrigger,
WorkflowTrigger.workflow,
filterChildAndSiblingCD(envID),
)
_workflows.push(...processWorkflowData.workflows)
_filteredCIPipelines.set(workflowResult.appId, processWorkflowData.filteredCIPipelines)
}
return { workflows: _workflows, filteredCIPipelines: _filteredCIPipelines }
})
])
.then(([workflow, ciConfig, cdConfig, externalCIConfig]) => {
if (workflow.result) {
const _ciConfigMap = new Map<number, CiPipelineResult>()
for (const _ciConfig of ciConfig.result) {
_ciConfigMap.set(_ciConfig.appId, _ciConfig)
}
for (const workflowResult of workflow.result.workflows) {
const processWorkflowData = processWorkflow(
{
...workflowResult,
workflows: [workflowResult],
} as WorkflowResult,
_ciConfigMap.get(workflowResult.appId),
cdConfig.result as CdPipelineResult,
externalCIConfig.result,
WorkflowTrigger,
WorkflowTrigger.workflow,
filterChildAndSiblingCD(envID),
)
_workflows.push(...processWorkflowData.workflows)
_filteredCIPipelines.set(workflowResult.appId, processWorkflowData.filteredCIPipelines)
}
}
return { workflows: _workflows, filteredCIPipelines: _filteredCIPipelines }
})
}

export const getCIConfigList = (envID: string, appIds: string): Promise<CIConfigListType> => {
Expand Down
7 changes: 6 additions & 1 deletion src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
const getWorkflowsData = async (): Promise<void> => {
try {
const { workflows: _workflows, filteredCIPipelines } = await getWorkflows(envId, filteredAppIds)
if(_workflows){
if (showCIModal) {
_workflows.forEach((wf) =>
wf.nodes.forEach((n) => {
Expand All @@ -257,14 +258,18 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
setWorkflows(_workflows)
setFilteredCIPipelines(filteredCIPipelines)
setErrorCode(0)
setPageViewType(ViewType.FORM)

getWorkflowStatusData(_workflows)
processFilteredData(_workflows)
}
} catch (error) {
showError(error)
setErrorCode(error['code'])
setPageViewType(ViewType.ERROR)
}
finally{
setPageViewType(ViewType.FORM)
}
}

const processFilteredData = (_filteredWorkflows: WorkflowType[]): void => {
Expand Down