Skip to content

Beautiful Open-Source Form Builder

move form to another workspace (#339)

Favour Olayinka29fdc961fc39
diff --git a/app/Http/Controllers/Forms/FormController.php b/app/Http/Controllers/Forms/FormController.php
index 8b29d6e0b..9c268c5fc 100644
--- a/app/Http/Controllers/Forms/FormController.php
+++ b/app/Http/Controllers/Forms/FormController.php
@@ -218,4 +218,24 @@ class FormController extends Controller
return redirect()->to(Storage::temporaryUrl($path, now()->addMinutes(5)));
}
+
+ /**
+ * Updates a form's workspace
+ */
+ public function updateWorkspace($id, $workspace_id)
+ {
+ $form = Form::findOrFail($id);
+ $workspace = Workspace::findOrFail($workspace_id);
+
+ $this->authorize('update', $form);
+ $this->authorize('view', $workspace);
+
+ $form->workspace_id = $workspace_id;
+ $form->creator_id = auth()->user()->id;
+ $form->save();
+
+ return $this->success([
+ 'message' => 'Form workspace updated successfully.',
+ ]);
+ }
}
diff --git a/client/components/open/forms/components/FormWorkspaceModal.vue b/client/components/open/forms/components/FormWorkspaceModal.vue
new file mode 100644
index 000000000..d4528530c
--- /dev/null
+++ b/client/components/open/forms/components/FormWorkspaceModal.vue
@@ -0,0 +1,103 @@
+<template>
+ <modal :show="show" @close="emit('close')">
+ <template #icon>
+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-8 h-8">
+ <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Z" />
+ </svg>
+ </template>
+ <template #title>
+ Change form workspace
+ </template>
+ <div class="p-4">
+ <div class="flex space-x-4 items-center">
+ <p>Current workspace:</p>
+ <div class="flex items-center cursor group p-2 rounded border">
+ <div class="rounded-full h-8 8">
+ <img v-if="isUrl(workspace.icon)"
+ :src="workspace.icon"
+ :alt="workspace.name + ' icon'" class="flex-shrink-0 h-8 w-8 rounded-full shadow"
+ />
+ <div v-else class="rounded-full pt-2 text-xs truncate bg-nt-blue-lighter h-8 w-8 text-center shadow"
+ v-text="workspace.icon"
+ />
+ </div>
+ <p class="lg:block max-w-10 truncate ml-2 text-gray-800 dark:text-gray-200">
+ {{ workspace.name }}
+ </p>
+ </div>
+ </div>
+ <form @submit.prevent="onSubmit">
+ <div class=" my-4">
+ <select-input name="workspace" class=""
+ :options="workspacesSelectOptions"
+ v-model="selectedWorkspace"
+ :required="true"
+ label="Select workspace"
+ />
+ </div>
+ <div class="flex justify-end mt-4 pb-5">
+ <v-button class="mr-2" :loading="loading">
+ Change workspace
+ </v-button>
+ <v-button color="white" @click.prevent="emit('close')">
+ Close
+ </v-button>
+ </div>
+ </form>
+ </div>
+ </modal>
+</template>
+
+<script setup>
+import { ref, defineProps, defineEmits, computed } from 'vue'
+const emit = defineEmits(['close'])
+const workspacesStore = useWorkspacesStore()
+const formsStore = useFormsStore()
+
+const selectedWorkspace = ref(null);
+const props = defineProps({
+ show: { type: Boolean, required: true },
+ form: { type: Object, required: true },
+})
+const workspaces = computed(() => workspacesStore.getAll)
+const workspace = computed(() => workspacesStore.getByKey(props.form?.workspace_id))
+const loading = ref(false)
+const workspacesSelectOptions = computed(()=> workspaces.value.filter((w)=>{
+ return w.id !== workspace.value.id
+}).map(workspace => ({ name: workspace.name, value: workspace.id })))
+
+
+const onSubmit = () => {
+ const endpoint = '/open/forms/' + props.form.id + '/workspace/' + selectedWorkspace.value
+ if(! selectedWorkspace.value) {
+ useAlert().error('Please select a workspace!')
+ return;
+ }
+ opnFetch(endpoint, { method: 'POST' }).then(data => {
+ loading.value = false;
+ emit('close')
+ useAlert().success('Form workspace updated successfully.')
+ workspacesStore.setCurrentId(selectedWorkspace.value)
+ formsStore.resetState()
+ formsStore.loadAll(selectedWorkspace.value)
+ const router = useRouter()
+ const route = useRoute()
+ if (route.name !== 'home') {
+ router.push({ name: 'home' })
+ }
+ formsStore.loadAll(selectedWorkspace.value)
+ }).catch((error) => {
+ useAlert().error(error?.data?.message ?? 'Something went wrong, please try again!')
+ loading.value = false;
+ })
+}
+
+const isUrl = (str) => {
+ try {
+ new URL(str)
+ } catch (_) {
+ return false
+ }
+ return true
+}
+</script>
\ No newline at end of file
diff --git a/client/components/pages/forms/show/ExtraMenu.vue b/client/components/pages/forms/show/ExtraMenu.vue
index f6aca7fc5..9e6b10c38 100644
--- a/client/components/pages/forms/show/ExtraMenu.vue
+++ b/client/components/pages/forms/show/ExtraMenu.vue
@@ -107,6 +107,17 @@
</svg>
Create Template
</a>
+
+ <a v-track.change_workspace_click="{form_id:form.id, form_slug:form.slug}" href="#"
+ class="block block px-4 py-2 text-md text-gray-700 dark:text-white hover:bg-gray-100 hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
+ @click.prevent="showFormWorkspaceModal=true"
+ >
+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4 mr-2">
+ <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Z" />
+ </svg>
+
+ Change workspace
+ </a>
<a v-track.delete_form_click="{form_id:form.id, form_slug:form.slug}"
href="#"
class="block block px-4 py-2 text-md text-red-600 hover:bg-red-50 flex items-center"
@@ -152,6 +163,8 @@
</div>
</modal>
<form-template-modal v-if="!isMainPage && user" :form="form" :show="showFormTemplateModal" @close="showFormTemplateModal=false" />
+ <form-workspace-modal v-if="user" :form="form" :show="showFormWorkspaceModal" @close="showFormWorkspaceModal=false" />
+
</div>
</template>
@@ -159,6 +172,7 @@
import { ref, defineProps, computed } from 'vue'
import Dropdown from '~/components/global/Dropdown.vue'
import FormTemplateModal from '../../../open/forms/components/templates/FormTemplateModal.vue'
+import FormWorkspaceModal from '../../../open/forms/components/FormWorkspaceModal.vue'
const { copy } = useClipboard()
const router = useRouter()
@@ -177,6 +191,7 @@ let loadingDuplicate = ref(false)
let loadingDelete = ref(false)
let showDeleteFormModal = ref(false)
let showFormTemplateModal = ref(false)
+let showFormWorkspaceModal = ref(false)
const copyLink = () => {
copy(props.form.share_url)
diff --git a/routes/api.php b/routes/api.php
index bb27a16cd..33885bb6c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -89,6 +89,7 @@ Route::group(['middleware' => 'auth:api'], function () {
Route::prefix('forms')->name('forms.')->group(function () {
Route::post('/', [FormController::class, 'store'])->name('store');
+ Route::post('/{id}/workspace/{workspace_id}', [FormController::class, 'updateWorkspace'])->name('workspace.update');
Route::put('/{id}', [FormController::class, 'update'])->name('update');
Route::delete('/{id}', [FormController::class, 'destroy'])->name('destroy');