Commit 67362ff

committed

Merge remote-tracking branch 'upstream/master' into GH-5074-4

2 parents 1508a1b + 8bced18 commit 67362ffCopy full SHA for 67362ff

File tree

24 files changed

+512

-474

lines changed

assets/vue
- components/glossary
  - GlossaryExportForm.vue
- services
  - glossaryService.js
composer.lock
package.json
public/main
- admin
- inc/lib
src/CoreBundle
- Controller/Api
  - ExportCGlossaryAction.php
- Helpers
  - LdapAuthenticatorHelper.php
- Settings
  - PlatformSettingsSchema.php
yarn.lock

24 files changed

+512

-474

lines changed

`‎assets/vue/components/glossary/GlossaryExportForm.vue‎`

Lines changed: 24 additions & 26 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`<template>`
`2`		`- <form>`
	`2`	`+ <form`
	`3`	`+ action="/api/glossaries/export"`
	`4`	`+ method="post"`
	`5`	`+ @submit="submitForm"`
	`6`	`+ >`
`3`	`7`	`<BaseSelect`
`4`	`8`	`id="format"`
`5`	`9`	`v-model="selectedFormat"`
`@@ -18,9 +22,25 @@`
`18`	`22`	`:label="t('Export')"`
`19`	`23`	`icon="file-export"`
`20`	`24`	`type="secondary"`
`21`		`- @click="submitForm"`
	`25`	`+ is-submit`
`22`	`26`	`/>`
`23`	`27`	`</LayoutFormButtons>`
	`28`	`+`
	`29`	`+ <input`
	`30`	`+ name="cid"`
	`31`	`+ type="hidden"`
	`32`	`+ :value="cid"`
	`33`	`+ />`
	`34`	`+ <input`
	`35`	`+ name="sid"`
	`36`	`+ type="hidden"`
	`37`	`+ :value="sid"`
	`38`	`+ />`
	`39`	`+ <input`
	`40`	`+ name="format"`
	`41`	`+ type="hidden"`
	`42`	`+ :value="selectedFormat"`
	`43`	`+ />`
`24`	`44`	`</form>`
`25`	`45`	`</template>`
`26`	`46`
`@@ -32,7 +52,6 @@ import BaseButton from "../basecomponents/BaseButton.vue"`
`32`	`52`	`import BaseSelect from "../basecomponents/BaseSelect.vue"`
`33`	`53`	`import { useCidReq } from "../../composables/cidReq"`
`34`	`54`	`import { useNotification } from "../../composables/notification"`
`35`		`-import glossaryService from "../../services/glossaryService"`
`36`	`55`
`37`	`56`	`const { t } = useI18n()`
`38`	`57`	`const { sid, cid } = useCidReq()`
`@@ -47,28 +66,7 @@ const formats = [`
`47`	`66`	`]`
`48`	`67`	`const selectedFormat = ref("csv")`
`49`	`68`
`50`		`-const submitForm = async () => {`
`51`		`- const format = selectedFormat.value`
`52`		`-`
`53`		`- const formData = new FormData()`
`54`		`- formData.append("format", format)`
`55`		`- formData.append("sid", sid)`
`56`		`- formData.append("cid", cid)`
`57`		`-`
`58`		`- try {`
`59`		`- const data = await glossaryService.export(formData)`
`60`		`- const fileUrl = window.URL.createObjectURL(new Blob([data]))`
`61`		`- const link = document.createElement("a")`
`62`		`- link.href = fileUrl`
`63`		- link.setAttribute("download", `glossary.${format}`)
`64`		`- document.body.appendChild(link)`
`65`		`- link.click()`
`66`		`- document.body.removeChild(link)`
`67`		`-`
`68`		`- notification.showSuccessNotification(t("Glossary exported"))`
`69`		`- } catch (error) {`
`70`		`- console.error("Error exporting glossary:", error)`
`71`		`- notification.showErrorNotification(t("Could not export glossary"))`
`72`		`- }`
	`69`	`+const submitForm = () => {`
	`70`	`+ notification.showSuccessNotification(t("Glossary exported"))`
`73`	`71`	`}`
`74`	`72`	`</script>`

`‎assets/vue/services/glossaryService.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export default {`
`44`	`44`	`*/`
`45`	`45`	`export: async (formData) => {`
`46`	`46`	const endpoint = `${ENTRYPOINT}glossaries/export`
`47`		`- const response = await axios.post(endpoint, formData, { responsetype: "blob" })`
	`47`	`+ const response = await axios.post(endpoint, formData, { responsetype: "blob" })`
`48`	`48`
`49`	`49`	`return response.data`
`50`	`50`	`},`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 67362ff

File tree

24 files changed

24 files changed

`‎assets/vue/components/glossary/GlossaryExportForm.vue‎`

`‎assets/vue/services/glossaryService.js‎`

0 commit comments