Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publicatie dialogs en documentatie #4

Merged
merged 14 commits into from
Aug 13, 2024
Merged

Publicatie dialogs en documentatie #4

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7aa6b5a
Change to dialog
rubenvdlinde Aug 9, 2024
21171e4
Make the directory sidebar active
rubenvdlinde Aug 11, 2024
ca8a04a
Fixes on the search page
rubenvdlinde Aug 11, 2024
9a3b7ec
Code cleanup
rubenvdlinde Aug 11, 2024
21e4780
Debounced search
rubenvdlinde Aug 11, 2024
62118fd
Dealing with bad publications in the network
rubenvdlinde Aug 12, 2024
e138956
Small clear up on the feature flow
rubenvdlinde Aug 13, 2024
9e75311
Merge remote-tracking branch 'origin/development' into feature/DIMOC-240
rubenvdlinde Aug 13, 2024
685dab3
Betere publicatie flow
rubenvdlinde Aug 13, 2024
a45ddf2
Lint fix
remko48 Aug 13, 2024
3236f3b
Smal bit of cleanup
rubenvdlinde Aug 13, 2024
dc0093b
Removed unnecesery files
rubenvdlinde Aug 13, 2024
5748e01
Merge branch 'feature/DIMOC-240' of https://github.com/ConductionNL/o…
rubenvdlinde Aug 13, 2024
5ba3f62
Fixes on de MetaDataModal
rubenvdlinde Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/developers/feature_flow.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ alt Feature-aanvraag goedgekeurd
end note

Ontwikkelingspartij -> Ontwikkelingspartij: Forkt de codebase
Ontwikkelingspartij -> Ontwikkelingspartij: Bouwt de feature
Ontwikkelingspartij -> Ontwikkelingspartij: Bouwt de feature op de fork
Ontwikkelingspartij -> Beheerderspartij: Maakt PR met verwijzing naar het issue-nummer
note right of Beheerderspartij
Code wordt bij voorkeur terug geleverd aan de centrale codebase
Expand Down
6 changes: 3 additions & 3 deletions src/entities/publication/publication.mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ export const mockPublicationsData = (): TPublication[] => [
key: 'anyvalue',
streetNumber: 1,
object: {
blabla: 'bla'
},
array: ['appel', 'peer', 0, [], {}]
blabla: 'bla',
},
array: ['appel', 'peer', 0, [], {}],
},
attachments: [],
attachmentCount: 1,
Expand Down
248 changes: 147 additions & 101 deletions src/modals/publication/AddPublicationModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,115 +2,151 @@
import { navigationStore, publicationStore } from '../../store/store.js'
</script>
<template>
<NcModal v-if="navigationStore.modal === 'publicationAdd'"
ref="modalRef"
label-id="addPublicationModal"
@close="closeModal">
<div class="modal__content">
<h2>Publicatie toevoegen</h2>
<div v-if="success !== null || error">
<NcNoteCard v-if="success" type="success">
<p>Publicatie succesvol toegevoegd</p>
</NcNoteCard>
<NcNoteCard v-if="!success" type="error">
<p>Er is iets fout gegaan bij het toevoegen van Publicatie</p>
</NcNoteCard>
<NcNoteCard v-if="error" type="error">
<p>{{ error }}</p>
</NcNoteCard>
</div>
<div class="formContainer">
<div v-if="success === null" class="form-group">
<!-- STAGE 1 -->
<div v-if="!catalogi?.value?.id">
<NcSelect v-bind="catalogi"
v-model="catalogi.value"
input-label="Catalogi *"
:loading="catalogiLoading"
:disabled="publicationLoading"
required />
</div>
<!-- STAGE 2 -->
<div v-if="catalogi?.value?.id && !metaData?.value?.id">
<NcButton :disabled="loading"
@click="catalogi.value = null">
Terug naar Catalogi
</NcButton>
<NcSelect v-bind="metaData"
v-model="metaData.value"
input-label="Publicatie type *"
:loading="metaDataLoading"
:disabled="publicationLoading"
required />
</div>
<!-- STAGE 3 -->
<div v-if="catalogi.value?.id && metaData.value?.id">
<NcButton :disabled="loading"
@click="metaData.value = null">
Terug naar publicatie typen
</NcButton>
<NcTextField :disabled="loading"
label="Titel *"
required
:value.sync="publication.title" />
<NcTextField :disabled="loading"
label="Samenvatting *"
required
:value.sync="publication.summary" />
<NcTextArea :disabled="loading"
label="Beschrijving"
:value.sync="publication.description" />
<NcTextField :disabled="loading"
label="Reference"
:value.sync="publication.reference" />
<NcTextField :disabled="loading"
label="Categorie"
:value.sync="publication.category" />
<NcTextField :disabled="loading"
label="Portaal"
:value.sync="publication.portal" />
<span>
<p>Publicatie datum</p>
<NcDateTimePicker v-model="publication.published"
:disabled="loading"
label="Publicatie datum" />
</span>
<span class="APM-horizontal">
<NcCheckboxRadioSwitch :disabled="loading"
label="Featured"
:checked.sync="publication.featured">
Featured
</NcCheckboxRadioSwitch>
</span>
<NcTextField :disabled="loading"
label="Image"
:value.sync="publication.image" />
<b>Juridisch</b>
<NcTextField :disabled="loading"
label="Licentie"
:value.sync="publication.license" />
<NcDialog v-if="navigationStore.modal === 'publicationAdd'"
name="Publicatie toevoegen"
size="normal"
:can-close="false">
<div v-if="success !== null || error">
<NcNoteCard v-if="success" type="success">
<p>Publicatie succesvol aangemaakt</p>
</NcNoteCard>
<NcNoteCard v-if="!success" type="error">
<p>Er is iets fout gegaan bij het aanmaken van Publicatie</p>
</NcNoteCard>
<NcNoteCard v-if="error" type="error">
<p>{{ error }}</p>
</NcNoteCard>
</div>

<template #actions>
<NcButton v-if="catalogi?.value?.id && !metaData?.value?.id"
:disabled="loading"
@click="catalogi.value = null">
<template #icon>
<ArrowLeft :size="20" />
</template>
Terug naar Catalogi
</NcButton>
<NcButton v-if="catalogi.value?.id && metaData.value?.id"
:disabled="loading"
@click="metaData.value = null">
<template #icon>
<ArrowLeft :size="20" />
</template>
Terug naar publicatie type
</NcButton>
<NcButton
@click="navigationStore.setModal(false)">
<template #icon>
<Cancel :size="20" />
</template>
{{ success ? 'Sluiten' : 'Annuleer' }}
</NcButton>
<NcButton
@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/publicaties', '_blank')">
<template #icon>
<Help :size="20" />
</template>
Help
</NcButton>
<NcButton v-if="success === null"
:disabled="!publication.title || !publication.summary"
type="primary"
@click="updatePublication()">
<template #icon>
<NcLoadingIcon v-if="loading" :size="20" />
<Plus v-if="!loading" :size="20" />
</template>
Toevoegen
</NcButton>
</template>

<NcButton :disabled="(!publication.title || !catalogi?.value?.id || !metaData?.value?.id || !publication.summary) || loading"
class="apm-submit-button"
type="primary"
@click="addPublication()">
<template #icon>
<NcLoadingIcon v-if="loading" :size="20" />
<Plus v-if="!loading" :size="20" />
</template>
Toevoegen
</NcButton>
</div>
<div class="formContainer">
<div v-if="catalogi?.value?.id">
<b>Catalogus:</b> {{ catalogi.value.label }}
<NcButton @click="catalogi.value = null">
Catalogus wijzigen
</NcButton>
</div>
<div v-if=" metaData.value?.id">
<b>Publicatietype:</b> {{ metaData.value.label }}
<NcButton @click="metaData.value = null">
Publicatietype wijzigen
</NcButton>
</div>
<div v-if="success === null" class="form-group">
<!-- STAGE 1 -->
<div v-if="!catalogi?.value?.id">
<p>Publicaties horen in een <a @click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/catalogi', '_blank')">catalogus</a>, aan welke catlogus wilt u deze publicatie toevoegen?</p>
<NcSelect v-bind="catalogi"
v-model="catalogi.value"
input-label="Catalogus *"
:loading="catalogiLoading"
:disabled="publicationLoading"
required />
</div>
<!-- STAGE 2 -->
<div v-if="catalogi?.value?.id && !metaData?.value?.id">
<p>Publicaties worden gedefineerd door <a @click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/metadata', '_blank')">publicatie typen</a>, van welk publicatie type wit u een publicatie aanmaken?</p>
<NcSelect v-bind="metaData"
v-model="metaData.value"
input-label="Publicatie type *"
:loading="metaDataLoading"
:disabled="publicationLoading"
required />
</div>
<!-- STAGE 3 -->
<div v-if="catalogi.value?.id && metaData.value?.id">
<NcTextField :disabled="loading"
label="Titel *"
required
:value.sync="publication.title" />
<NcTextField :disabled="loading"
label="Samenvatting *"
required
:value.sync="publication.summary" />
<NcTextArea :disabled="loading"
label="Beschrijving"
:value.sync="publication.description" />
<NcTextField :disabled="loading"
label="Reference"
:value.sync="publication.reference" />
<NcTextField :disabled="loading"
label="Categorie"
:value.sync="publication.category" />
<NcTextField :disabled="loading"
label="Portaal"
:value.sync="publication.portal" />
<span>
<p>Publicatie datum</p>
<NcDateTimePicker v-model="publication.published"
:disabled="loading"
label="Publicatie datum" />
</span>
<span class="APM-horizontal">
<NcCheckboxRadioSwitch :disabled="loading"
label="Featured"
:checked.sync="publication.featured">
Featured
</NcCheckboxRadioSwitch>
</span>
<NcTextField :disabled="loading"
label="Image"
:value.sync="publication.image" />
<b>Juridisch</b>
<NcTextField :disabled="loading"
label="Licentie"
:value.sync="publication.license" />
</div>
</div>
</div>
</NcModal>
</NcDialog>
</template>

<script>
import {
NcButton,
NcModal,
NcDialog,
NcTextField,
NcTextArea,
NcSelect,
Expand All @@ -119,12 +155,16 @@ import {
NcNoteCard,
NcDateTimePicker,
} from '@nextcloud/vue'

import Plus from 'vue-material-design-icons/Plus.vue'
import Help from 'vue-material-design-icons/Help.vue'
import Cancel from 'vue-material-design-icons/Cancel.vue'
import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'

export default {
name: 'AddPublicationModal',
components: {
NcModal,
NcDialog,
NcTextField,
NcTextArea,
NcButton,
Expand All @@ -135,6 +175,9 @@ export default {
NcDateTimePicker,
// Icons
Plus,
Help,
Cancel,
ArrowLeft,
},
data() {
return {
Expand Down Expand Up @@ -309,6 +352,9 @@ export default {
this.metaData = {}
this.hasUpdated = false
},
openLink(url, type = '') {
window.open(url, type)
},
},
}
</script>
Expand Down
Loading
Loading