Beautiful Open-Source Form Builder
Improve google sheet integration (#437)
Chirag Chhatralaca0864d0c015
diff --git a/app/Policies/OAuthProviderPolicy.php b/app/Policies/OAuthProviderPolicy.phpindex e3b0dce9c..1102ee294 100644--- a/app/Policies/OAuthProviderPolicy.php+++ b/app/Policies/OAuthProviderPolicy.php@@ -2,6 +2,7 @@namespace App\Policies;+use App\Models\Integration\FormIntegration;use App\Models\OAuthProvider;use App\Models\User;use Illuminate\Auth\Access\HandlesAuthorization;@@ -57,6 +58,10 @@ class OAuthProviderPolicy*/public function delete(User $user, OAuthProvider $provider){+ $integrations = FormIntegration::where('oauth_id', $provider->id)->get();+ if ($integrations->count() > 0) {+ return $this->denyWithStatus(400, 'This connection cannot be removed because there is already an integration using it.');+ }return $provider->user()->is($user);}diff --git a/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue b/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vueindex 6679a6667..a6fa81fd6 100644--- a/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue+++ b/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue@@ -14,7 +14,10 @@</div></div>- <div class="ml-auto">+ <div+ v-if="integration.data"+ class="ml-auto"+ ><v-button:href="integration.data.url"target="_blank"@@ -27,7 +30,30 @@</template><script setup>-defineProps({- integration: Object,+const props = defineProps({+ integration: {+ type: Object,+ required: true,+ },+ form: {+ type: Object,+ required: true,+ }+})++const formIntegrationsStore = useFormIntegrationsStore()+let interval = null++onMounted(() => {+ if (!props.integration.data) {+ interval = setInterval(() => formIntegrationsStore.fetchFormIntegrations(props.form.id), 3000)+ setTimeout(() => { clearInterval(interval) }, 30000)+ }+})++onBeforeUnmount(() => {+ if (interval) {+ clearInterval(interval)+ }})</script>diff --git a/client/components/open/integrations/components/IntegrationCard.vue b/client/components/open/integrations/components/IntegrationCard.vueindex efd4ac4ff..da84f11b4 100644--- a/client/components/open/integrations/components/IntegrationCard.vue+++ b/client/components/open/integrations/components/IntegrationCard.vue@@ -37,6 +37,7 @@:is="actionsComponent"v-if="actionsComponent":integration="integration"+ :form="form"/><divdiff --git a/client/components/open/integrations/components/IntegrationModal.vue b/client/components/open/integrations/components/IntegrationModal.vueindex e3880a10b..3531861d8 100644--- a/client/components/open/integrations/components/IntegrationModal.vue+++ b/client/components/open/integrations/components/IntegrationModal.vue@@ -50,8 +50,7 @@ const props = defineProps({form: { type: Object, required: true },integrationKey: { type: String, required: true },integration: { type: Object, required: true },- formIntegrationId: { type: Number, required: false, default: null },- providers: { type: Array, required: true }+ formIntegrationId: { type: Number, required: false, default: null }})const alert = useAlert()diff --git a/client/components/settings/ProviderCard.vue b/client/components/settings/ProviderCard.vueindex 471e50b91..36d0e0517 100644--- a/client/components/settings/ProviderCard.vue+++ b/client/components/settings/ProviderCard.vue@@ -7,7 +7,7 @@class="mr-4 text-blue-500"><Icon- name="mdi:google"+ :name="service?.icon"size="32px"/></div>@@ -87,6 +87,7 @@ const props = defineProps({})const providersStore = useOAuthProvidersStore()+const service = computed(() => providersStore.getService(props.provider?.provider))const alert = useAlert()function disconnect() {diff --git a/client/components/settings/ProviderModal.vue b/client/components/settings/ProviderModal.vueindex 4ca6ac5f3..7b355eedf 100644--- a/client/components/settings/ProviderModal.vue+++ b/client/components/settings/ProviderModal.vue@@ -65,15 +65,7 @@ defineProps({const emit = defineEmits(['close'])const providersStore = useOAuthProvidersStore()--const services = [- {- name: 'google',- title: 'Google',- icon: 'mdi:google',- enabled: true- },-]+const services = computed(() => providersStore.services)function connect(service) {providersStore.connect(service.name)diff --git a/client/pages/forms/[slug]/show.vue b/client/pages/forms/[slug]/show.vueindex 7c7f250b4..056c87715 100644--- a/client/pages/forms/[slug]/show.vue+++ b/client/pages/forms/[slug]/show.vue@@ -200,7 +200,7 @@class="mr-6"><nuxt-link- :to="{ name: tab.route }"+ :to="{ name: tab.route, params: tab.params ?? {} }"class="hover:no-underline inline-block py-4 rounded-t-lg border-b-2 text-gray-500 hover:text-gray-600"active-class="text-blue-600 hover:text-blue-900 dark:text-blue-500 dark:hover:text-blue-500 border-blue-600 dark:border-blue-500">@@ -277,18 +277,22 @@ const tabsList = [{name: "Submissions",route: "forms-slug-show-submissions",+ params: { 'slug': slug }},{name: "Integrations",route: "forms-slug-show-integrations",+ params: { 'slug': slug }},{name: "Analytics",route: "forms-slug-show-stats",+ params: { 'slug': slug }},{name: "Share",route: "forms-slug-show-share",+ params: { 'slug': slug }},]diff --git a/client/stores/oauth_providers.js b/client/stores/oauth_providers.jsindex 126107a86..9ed53ad99 100644--- a/client/stores/oauth_providers.js+++ b/client/stores/oauth_providers.js@@ -7,6 +7,21 @@ export const useOAuthProvidersStore = defineStore("oauth_providers", () => {const contentStore = useContentStore()const alert = useAlert()+ const services = computed(() => {+ return [+ {+ name: 'google',+ title: 'Google',+ icon: 'mdi:google',+ enabled: true+ }+ ]+ })++ const getService = (service) => {+ return services.value.find((item) => item.name === service)+ }+const fetchOAuthProviders = () => {contentStore.resetState()contentStore.startLoading()@@ -50,6 +65,8 @@ export const useOAuthProvidersStore = defineStore("oauth_providers", () => {return {...contentStore,+ services,+ getService,fetchOAuthProviders,providers,connect