Skip to content

Bugfix/cm 1959 integration loading #2767

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
emlimlf merged 4 commits into from
Jan 16, 2025
Merged

Bugfix/cm 1959 integration loading #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b256469
added loading icon for integrations
emlimlf Jan 15, 2025
6548f49
added loading icon for integrations
emlimlf Jan 15, 2025
2bb1182
Merge branch 'bugfix/CM-1959-integration-loading' of github.com:Crowd…
emlimlf Jan 16, 2025
d521b64
moved the loading to the main integrations list component
emlimlf Jan 16, 2025
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
2 changes: 2 additions & 0 deletions frontend/src/modules/admin/modules/integration/components/integration-list-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@
<div v-else-if="hasError">
{{ props.config.name }} integration failed to connect due to an API error.
</div>

<component
:is="props.config.connectedParamsComponent"
v-else-if="isComplete && props.config.connectedParamsComponent"
:integration="integration"
:segment-id="route.params.id"
:grandparent-id="route.params.grandparentId"
/>

<component
:is="props.config.statusComponent"
v-else-if="!isComplete && props.config.statusComponent"
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/modules/admin/modules/integration/pages/integration-list.page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
</section>
</div>

<section>
<app-integration-progress-wrapper :segments="[route.params.id]">
<section v-loading="loadingFetch">
<app-integration-progress-wrapper v-if="!loadingFetch" :segments="[route.params.id]">
<template #default="{ progress, progressError }">
<div v-if="platformsByStatus.length > 0" class="flex flex-col gap-6">
<lf-integration-list-item
Expand Down Expand Up @@ -100,7 +100,7 @@ const route = useRoute();

const { findSubProject } = useLfSegmentsStore();
const { doFetch } = mapActions('integration');
const { array } = mapGetters('integration');
const { array, loadingFetch } = mapGetters('integration');

const { id, grandparentId } = route.params;

Expand Down
Loading