diff --git a/resources/js/components/UploadRequest/CreateUploadRequestPopup.vue b/resources/js/components/UploadRequest/CreateUploadRequestPopup.vue index 89d20ba5..849b4970 100644 --- a/resources/js/components/UploadRequest/CreateUploadRequestPopup.vue +++ b/resources/js/components/UploadRequest/CreateUploadRequestPopup.vue @@ -10,7 +10,7 @@ - - + + - + {{ $t('cancel') }} @@ -98,7 +98,7 @@ - + {{ $t('awesome_iam_done') }} @@ -147,7 +147,8 @@ export default { folder_id: undefined, name: undefined, }, - generatedUploadRequest: undefined, + uploadRequest: undefined, + uploadRequestURL: undefined, shareViaEmail: false, pickedItem: undefined, isLoading: false, @@ -166,7 +167,10 @@ export default { axios .post(`/api/file-request`, this.form) .then((response) => { - this.generatedUploadRequest = response.data + this.uploadRequest = response.data + + // Format upload request url + this.uploadRequestURL = `${this.$store.getters.config.host}/request/${response.data.data.id}/upload` }) .catch(() => { events.$emit('alert:open', { @@ -192,7 +196,7 @@ export default { // Restore data setTimeout(() => { - this.generatedUploadRequest = undefined + this.uploadRequest = undefined this.pickedItem = undefined this.shareViaEmail = false diff --git a/src/Domain/UploadRequest/Resources/UploadRequestResource.php b/src/Domain/UploadRequest/Resources/UploadRequestResource.php index bcef79eb..7dbe70d9 100644 --- a/src/Domain/UploadRequest/Resources/UploadRequestResource.php +++ b/src/Domain/UploadRequest/Resources/UploadRequestResource.php @@ -17,7 +17,6 @@ class UploadRequestResource extends JsonResource 'status' => $this->status, 'email' => $this->email, 'notes' => $this->notes, - 'url' => url("/request/$this->id/upload"), ], 'relationships' => [ $this->mergeWhen($this->folder, fn () => [