Skip to content

Fix integrations page on tenant switch #203

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 2 commits into from
Nov 11, 2022
Merged

Fix integrations page on tenant switch #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bdd421
Fix integrations page on tenant switch
joanagmaia Nov 11, 2022
cb4fea9
Update logic to reset integrations store
joanagmaia Nov 11, 2022
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
5 changes: 5 additions & 0 deletions frontend/src/modules/auth/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { router } from '@/router'
import { tenantSubdomain } from '@/modules/tenant/tenant-subdomain'
import AuthCurrentTenant from '@/modules/auth/auth-current-tenant'
import { TenantService } from '@/modules/tenant/tenant-service'
import { buildInitialState, store } from '@/store'

export default {
async doInit({ commit, dispatch }) {
Expand Down Expand Up @@ -247,6 +248,10 @@ export default {
AuthCurrentTenant.set(tenant)
await dispatch('doRefreshCurrentUser')

const initialState = buildInitialState(true)

store.replaceState(initialState)

router.push('/')
},

Expand Down
11 changes: 10 additions & 1 deletion frontend/src/modules/integration/components/integration-list-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ export default {
</script>
<script setup>
import { useStore } from 'vuex'
import { defineProps, computed, ref } from 'vue'
import {
defineProps,
computed,
ref,
onUnmounted
} from 'vue'
import AppIntegrationConnect from '@/modules/integration/components/integration-connect'

const store = useStore()
Expand Down Expand Up @@ -151,6 +156,10 @@ const integrationInProgressInterval = setInterval(
fetchIntegrationInProgress,
10000
)

onUnmounted(() => {
clearInterval(integrationInProgressInterval)
})
</script>
<style lang="scss">
.integration-custom {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/modules/integration/components/integration-list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const props = defineProps({
})

const loading = computed(
() => store.getters['integration/loading']
() => store.getters['integration/loadingFetch']
)
const integrationsArray = computed(() => {
return props.onboard
Expand Down