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.

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

feat: Added column persistence to MySubmissionsTable #1507

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
95 changes: 95 additions & 0 deletions app/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/vue-fontawesome": "^3.0.3",
"@vueuse/core": "^11.1.0",
"axios": "^1.4.0",
"bootstrap-scss": "^5.3.1",
"crypto-js": "^4.1.1",
Expand Down
2 changes: 0 additions & 2 deletions app/frontend/src/components/forms/SubmissionsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ const debounceTime = ref(300);
const deleteItem = ref({});
// Show only deleted items
const deletedOnly = ref(false);
const filterData = ref([]);
const search = ref('');
const filterIgnore = ref([
{
Expand Down Expand Up @@ -503,7 +502,6 @@ async function restoreMultipleSubs() {

async function updateFilter(data) {
showColumnsDialog.value = false;
filterData.value = data;
let preferences = {
columns: [],
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const properties = defineProps({
},
});

const filterData = ref([]);
const filterIgnore = ref([
{
key: 'confirmationId',
Expand All @@ -32,7 +31,8 @@ const showColumnsDialog = ref(false);

const formStore = useFormStore();

const { form, formFields, submissionList, isRTL } = storeToRefs(formStore);
const { form, formFields, mySubmissionPreferences, submissionList, isRTL } =
storeToRefs(formStore);

//------------------------ TABLE HEADERS
// These are headers that will be available by default for the
Expand Down Expand Up @@ -102,11 +102,11 @@ const HEADERS = computed(() => {
let headers = BASE_HEADERS.value;

// The user selected some columns
if (filterData.value.length > 0) {
if (USER_PREFERENCES.value.length > 0) {
headers = headers.filter(
(header) =>
// It must be in the user selected columns
filterData.value.some((fd) => fd === header.key) ||
USER_PREFERENCES.value.some((up) => up === header.key) ||
// except if it's in the filter ignore
filterIgnore.value.some((fd) => fd.key === header.key)
);
Expand Down Expand Up @@ -181,6 +181,21 @@ const isCopyFromExistingSubmissionEnabled = computed(
() => form.value && form.value.enableCopyExistingSubmission
);

// These are columns that the user has previously selected
// through the select columns dialog. These are columns
// that they wish to see in the table in this view.
const USER_PREFERENCES = computed(() => {
let preselectedData = [];
if (
mySubmissionPreferences.value?.preferences?.formId &&
mySubmissionPreferences.value.preferences.formId == properties.formId &&
mySubmissionPreferences.value?.preferences?.columns
) {
preselectedData = mySubmissionPreferences.value.preferences.columns;
}
return preselectedData;
});

onBeforeMount(async () => {
await Promise.all([
await formStore.fetchForm(properties.formId),
Expand Down Expand Up @@ -280,14 +295,20 @@ async function populateSubmissionsTable() {
}

async function updateFilter(data) {
filterData.value = data;
let preferences = {
formId: properties.formId,
columns: [],
};
data.forEach((d) => {
preferences.columns.push(d);
});
mySubmissionPreferences.value.preferences = preferences;
showColumnsDialog.value = false;
}

defineExpose({
BASE_FILTER_HEADERS,
BASE_HEADERS,
filterData,
filterIgnore,
getCurrentStatus,
getStatusDate,
Expand Down
2 changes: 2 additions & 0 deletions app/frontend/src/store/form.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useLocalStorage } from '@vueuse/core';
import { defineStore } from 'pinia';
import { i18n } from '~/internationalization';
import {
Expand Down Expand Up @@ -116,6 +117,7 @@ export const useFormStore = defineStore('form', {
subscriptionData: genInitialSubscribeDetails(),
totalSubmissions: 0,
userFormPreferences: {},
mySubmissionPreferences: useLocalStorage('mySubmissionPreferences', {}),
version: {},
userLabels: [],
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ describe('MySubmissionsTable.vue', () => {
],
};
formStore.formFields = [];
formStore.mySubmissionPreferences = {
preferences: {
formId: formId,
columns: [],
},
};
});

it('renders', async () => {
Expand Down Expand Up @@ -171,7 +177,7 @@ describe('MySubmissionsTable.vue', () => {
};
formStore.formFields = ['formField1', 'formField2'];

wrapper.vm.filterData = [
formStore.mySubmissionPreferences.preferences.columns = [
'createdBy',
'username',
'status',
Expand Down Expand Up @@ -732,12 +738,12 @@ describe('MySubmissionsTable.vue', () => {

wrapper.vm.showColumnsDialog = true;

expect(wrapper.vm.filterData).toEqual([]);
expect(formStore.mySubmissionPreferences.preferences.columns).toEqual([]);
expect(wrapper.vm.showColumnsDialog).toBeTruthy();

wrapper.vm.updateFilter(['createdBy']);

expect(wrapper.vm.filterData).toEqual(['createdBy']);
expect(formStore.mySubmissionPreferences.preferences.columns).toEqual(['createdBy']);
expect(wrapper.vm.showColumnsDialog).toBeFalsy();
});
});