deblan/forms
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move to OCS API

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2020-08-11 09:53:45 +02:00
commit fea32748e6
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
13 changed files with 194 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Forms.vue
View file

@ -71,7 +71,7 @@
<script>
import { emit } from '@nextcloud/event-bus'
import { showError } from '@nextcloud/dialogs'
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import AppContent from '@nextcloud/vue/dist/Components/AppContent'
@ -146,7 +146,7 @@ export default {
async loadForms() {
this.loading = true
try {
const response = await axios.get(generateUrl('apps/forms/api/v1/forms'))
const response = await axios.get(generateOcsUrl('apps/forms/api/v1', 2) + 'forms')
this.forms = response.data
} catch (error) {
showError(t('forms', 'An error occurred while loading the forms list'))
@ -162,7 +162,7 @@ export default {
async onNewForm() {
try {
// Request a new empty form
const response = await axios.post(generateUrl('/apps/forms/api/v1/form'))
const response = await axios.post(generateOcsUrl('apps/forms/api/v1', 2) + 'form')
const newForm = response.data
this.forms.unshift(newForm)
this.$router.push({ name: 'edit', params: { hash: newForm.hash } })

4
src/components/AppNavigationForm.vue
View file

@ -57,7 +57,7 @@
</template>
<script>
import { generateUrl } from '@nextcloud/router'
import { generateUrl, generateOcsUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
@ -174,7 +174,7 @@ export default {
// All good, let's delete
this.loading = true
try {
await axios.delete(generateUrl('/apps/forms/api/v1/form/{id}', { id: this.form.id }))
await axios.delete(generateOcsUrl('apps/forms/api/v1', 2) + `form/${this.form.id}`)
this.$emit('delete', this.form.id)
} catch (error) {
showError(t('forms', 'Error while deleting {title}', { title: this.formTitle }))

6
src/components/Questions/AnswerInput.vue
View file

@ -29,7 +29,7 @@
<script>
import { showError } from '@nextcloud/dialogs'
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import pDebounce from 'p-debounce'
import PQueue from 'p-queue'
@ -143,7 +143,7 @@ export default {
*/
async createAnswer(answer) {
try {
const response = await axios.post(generateUrl('/apps/forms/api/v1/option'), {
const response = await axios.post(generateOcsUrl('apps/forms/api/v1', 2) + 'option', {
questionId: answer.question_id,
text: answer.text,
})
@ -171,7 +171,7 @@ export default {
*/
async updateAnswer(answer) {
try {
await axios.post(generateUrl('/apps/forms/api/v1/option/update'), {
await axios.post(generateOcsUrl('apps/forms/api/v1', 2) + 'option/update', {
id: this.answer.id,
keyValuePairs: {
text: answer.text,

4
src/components/Questions/QuestionDropdown.vue
View file

@ -83,7 +83,7 @@
</template>
<script>
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs'
import axios from '@nextcloud/axios'
@ -305,7 +305,7 @@ export default {
if (!option.local) {
// let's not await, deleting in background
axios.delete(generateUrl('/apps/forms/api/v1/option/{id}', { id: option.id }))
axios.delete(generateOcsUrl('apps/forms/api/v1', 2) + `option/${option.id}`)
.catch(error => {
showError(t('forms', 'There was an issue deleting this option'))
console.error(error)

4
src/components/Questions/QuestionMultiple.vue
View file

@ -90,7 +90,7 @@
</template>
<script>
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs'
import axios from '@nextcloud/axios'
@ -312,7 +312,7 @@ export default {
if (!option.local) {
// let's not await, deleting in background
axios.delete(generateUrl('/apps/forms/api/v1/option/{id}', { id: option.id }))
axios.delete(generateOcsUrl('apps/forms/api/v1', 2) + `option/${option.id}`)
.catch(error => {
showError(t('forms', 'There was an issue deleting this option'))
console.error(error)

14
src/components/ShareDiv.vue
View file

@ -209,7 +209,7 @@ export default {
this.SHARE_TYPES.SHARE_TYPE_GROUP,
]
const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', {
const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees', {
params: {
format: 'json',
itemType: 'file',
@ -219,11 +219,6 @@ export default {
},
})
if (request.data.ocs.meta.statuscode !== 100) {
console.error('Error fetching suggestions', request)
return
}
const data = request.data.ocs.data
const exact = request.data.ocs.data.exact
data.exact = [] // removing exact from general results
@ -263,18 +258,13 @@ export default {
async getRecommendations() {
this.loading = true
const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees_recommended', {
const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees_recommended', {
params: {
format: 'json',
itemType: 'file',
},
})
if (request.data.ocs.meta.statuscode !== 100) {
console.error('Error fetching recommendations', request)
return
}
const exact = request.data.ocs.data.exact
// flatten array of arrays

4
src/mixins/QuestionMixin.js
View file

@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { debounce } from 'debounce'
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs'
import axios from '@nextcloud/axios'
@ -170,7 +170,7 @@ export default {
async saveQuestionProperty(key, value) {
try {
// TODO: add loading status feedback ?
await axios.post(generateUrl('/apps/forms/api/v1/question/update'), {
await axios.post(generateOcsUrl('apps/forms/api/v1', 2) + 'question/update', {
id: this.id,
keyValuePairs: {
[key]: value,

4
src/mixins/ViewsMixin.js
View file

@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs'
import axios from '@nextcloud/axios'
@ -39,7 +39,7 @@ export default {
async saveFormProperty(key) {
try {
// TODO: add loading status feedback ?
await axios.post(generateUrl('/apps/forms/api/v1/form/update'), {
await axios.post(generateOcsUrl('apps/forms/api/v1', 2) + 'form/update', {
id: this.form.id,
keyValuePairs: {
[key]: this.form[key],

10
src/views/Create.vue
View file

@ -121,7 +121,7 @@
<script>
import { emit } from '@nextcloud/event-bus'
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import { loadState } from '@nextcloud/initial-state'
import { showError } from '@nextcloud/dialogs'
import axios from '@nextcloud/axios'
@ -252,7 +252,7 @@ export default {
this.cancelFetchFullForm = cancel
try {
const form = await request(generateUrl('/apps/forms/api/v1/form/{id}', { id }))
const form = await request(generateOcsUrl('apps/forms/api/v1', 2) + `form/${id}`)
this.$emit('update:form', form.data)
this.isLoadingForm = false
} catch (error) {
@ -299,7 +299,7 @@ export default {
this.isLoadingQuestions = true
try {
const response = await axios.post(generateUrl('/apps/forms/api/v1/question'), {
const response = await axios.post(generateOcsUrl('apps/forms/api/v1', 2) + 'question', {
formId: this.form.id,
type,
text,
@ -337,7 +337,7 @@ export default {
this.isLoadingQuestions = true
try {
await axios.delete(generateUrl('/apps/forms/api/v1/question/{id}', { id }))
await axios.delete(generateOcsUrl('apps/forms/api/v1', 2) + `question/${id}`)
const index = this.form.questions.findIndex(search => search.id === id)
this.form.questions.splice(index, 1)
} catch (error) {
@ -356,7 +356,7 @@ export default {
const newOrder = this.form.questions.map(question => question.id)
try {
await axios.post(generateUrl('/apps/forms/api/v1/question/reorder'), {
await axios.post(generateOcsUrl('apps/forms/api/v1', 2) + 'question/reorder', {
formId: this.form.id,
newOrder,
})

10
src/views/Results.vue
View file

@ -117,7 +117,7 @@
</template>
<script>
import { generateUrl } from '@nextcloud/router'
import { generateUrl, generateOcsUrl } from '@nextcloud/router'
import { Parser } from 'json2csv'
import { showError, showSuccess } from '@nextcloud/dialogs'
import Actions from '@nextcloud/vue/dist/Components/Actions'
@ -214,9 +214,7 @@ export default {
console.debug('Loading results for form', this.form.hash)
try {
const response = await axios.get(generateUrl('/apps/forms/api/v1/submissions/{hash}', {
hash: this.form.hash,
}))
const response = await axios.get(generateOcsUrl('apps/forms/api/v1', 2) + `submissions/${this.form.hash}`)
// Append questions & submissions
this.$set(this.form, 'submissions', response.data.submissions)
@ -233,7 +231,7 @@ export default {
this.loadingResults = true
try {
await axios.delete(generateUrl('/apps/forms/api/v1/submission/{id}', { id }))
await axios.delete(generateOcsUrl('apps/forms/api/v1', 2) + `submission/${id}`)
const index = this.form.submissions.findIndex(search => search.id === id)
this.form.submissions.splice(index, 1)
} catch (error) {
@ -251,7 +249,7 @@ export default {
this.loadingResults = true
try {
await axios.delete(generateUrl('/apps/forms/api/v1/submissions/{formId}', { formId: this.form.id }))
await axios.delete(generateOcsUrl('apps/forms/api/v1', 2) + `submissions/${this.form.id}`)
this.form.submissions = []
} catch (error) {
console.error(error)

4
src/views/Submit.vue
View file

@ -77,7 +77,7 @@
<script>
import { loadState } from '@nextcloud/initial-state'
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs'
import axios from '@nextcloud/axios'
import AppContent from '@nextcloud/vue/dist/Components/AppContent'
@ -188,7 +188,7 @@ export default {
this.loading = true
try {
await axios.post(generateUrl('/apps/forms/api/v1/submission/insert'), {
await axios.post(generateOcsUrl('apps/forms/api/v1', 2) + 'submission/insert', {
formId: this.form.id,
answers: this.answers,
})