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

Data persistence in candidate views #2613

Merged
merged 3 commits into from
Nov 29, 2024
Merged

Data persistence in candidate views #2613

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5522b6c
reset data
tomlovesgithub Nov 25, 2024
dd8d9d9
fix eqaulity and diversity
tomlovesgithub Nov 28, 2024
5627775
fix eqaulity and diversity
tomlovesgithub Nov 28, 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
7 changes: 5 additions & 2 deletions src/store/candidates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ export default {
}),
bindDocs: firestoreAction(async ({ bindFirestoreRef }, id) => {
await bindFirestoreRef('personalDetails', doc(collectionRef, `${id}/documents/personalDetails`), { serialize: vuexfireSerialize });
await bindFirestoreRef('characterInformation', doc(collectionRef, id, 'documents', 'characterInformation'), { serialize: vuexfireSerialize });
await bindFirestoreRef('equalityAndDiversitySurvey', doc(collectionRef, id, 'documents', 'equalityAndDiversitySurvey'), { serialize: vuexfireSerialize });
await bindFirestoreRef('characterInformation', doc(collectionRef, `${id}/documents/characterInformation`), { serialize: vuexfireSerialize });
await bindFirestoreRef('equalityAndDiversitySurvey', doc(collectionRef, `${id}/documents/equalityAndDiversitySurvey`), { serialize: vuexfireSerialize });
return;
}),
unbindDocs: firestoreAction(async ({ unbindFirestoreRef }) => {
Expand Down Expand Up @@ -89,6 +89,9 @@ export default {
},
resetRecord(state) {
state.record = null;
state.personalDetails = null;
state.characterInformation = null;
state.equalityAndDiversitySurvey = null;
},
},
state: {
Expand Down
60 changes: 35 additions & 25 deletions src/views/Candidates/CandidatesView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<div v-if="candidateRecord && !loading">
<h1
class="govuk-heading-xl govuk-!-margin-bottom-6"
>
Expand Down Expand Up @@ -55,7 +55,7 @@
/>
</dl>
<EqualityAndDiversity
:data="equalityAndDiversity"
:data="equalityAndDiversity || {}"
/>
</div>

Expand All @@ -80,6 +80,11 @@
<UpdateLoginEmail :candidate-id="getUserId" />
</div>
</div>
<div
v-else-if="loading"
>
<LoadingMessage />
</div>
</template>

<script>
Expand All @@ -91,6 +96,7 @@ import CharacterInformationSummary from '@/views/InformationReview/CharacterInfo
import EqualityAndDiversity from '@jac-uk/jac-kit/draftComponents/Candidates/EqualityAndDiversity.vue';
import UpdateLoginEmail from '@/views/Candidates/UpdateLoginEmail.vue';
import permissionMixin from '@/permissionMixin';
import LoadingMessage from '@jac-uk/jac-kit/draftComponents/LoadingMessage.vue';

export default {
name: 'CandidatesView',
Expand All @@ -102,13 +108,19 @@ export default {
PersonalDetailsSummary,
CharacterInformationSummary,
EqualityAndDiversity,
LoadingMessage,
},
mixins: [permissionMixin],
data() {
return {
editMode: false,
activeTab: 'details',
candidateId: '',
candidateRecord: null,
personalDetails: null,
characterInformation: null,
equalityAndDiversity: null,
loading: true,
};
},
computed: {
Expand Down Expand Up @@ -136,24 +148,9 @@ export default {
});
return tabs;
},
candidateRecord() {
return this.$store.state.candidates.record;
},
personalDetails() {
const localDocs = this.$store.state.candidates.personalDetails;
return localDocs || {};
},
characterInformation() {
const localDocs = this.$store.state.candidates.characterInformation;
return localDocs || {};
},
characterInformationVersion() {
return this.characterInformation._versionNumber ? this.characterInformation._versionNumber : 1;
},
equalityAndDiversity() {
const localDocs = this.$store.state.candidates.equalityAndDiversitySurvey;
return localDocs || {};
},
myFullName() {
return this.personalDetails ? this.personalDetails.fullName : this.candidateRecord.fullName;
},
Expand All @@ -165,21 +162,34 @@ export default {
},
},
async created() {
this.candidateId = this.getUserId;
this.$store.dispatch('candidates/bindDoc', this.candidateId);
this.$store.dispatch('candidates/bindDocs', this.candidateId);
this.candidateId = this.getUserId || this.$route.params.id;
await Promise.all([
this.$store.commit('candidates/resetRecord'),
this.$store.dispatch('candidates/unbindDoc'),
this.$store.dispatch('candidates/bindDoc', this.candidateId),
this.$store.dispatch('candidates/bindDocs', this.candidateId),
]).then(() => {
this.loading = false;
this.personalDetails = this.$store.state.candidates.personalDetails;
this.characterInformation = this.$store.state.candidates.characterInformation;
this.equalityAndDiversity = this.$store.state.candidates.equalityAndDiversity;
this.candidateRecord = this.$store.state.candidates.record;
});
},
unmounted() {
this.$store.dispatch('candidates/unbindDoc');
this.$store.dispatch('candidates/unbindDocs');
this.$store.commit('candidates/resetRecord');
},
methods: {
makeFullName(obj) {
if (obj.firstName && this.personalDetails.lastName) {
obj.fullName = `${obj.firstName} ${this.personalDetails.lastName}`;
}
if (obj.lastName && this.personalDetails.firstName) {
obj.fullName = `${this.personalDetails.firstName} ${obj.lastName}`;
if (obj) {
if (obj.firstName && this.personalDetails.lastName) {
obj.fullName = `${obj.firstName} ${this.personalDetails.lastName}`;
}
if (obj.lastName && this.personalDetails.firstName) {
obj.fullName = `${this.personalDetails.firstName} ${obj.lastName}`;
}
}
return obj;
},
Expand Down
Loading