Skip to content

AB#118869 - ABC - Add record inline in resources questions #2811

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

Open
wants to merge 1 commit into
base: next
Choose a base branch
from
Open

AB#118869 - ABC - Add record inline in resources questions #2811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 22 additions & 36 deletions libs/shared/src/lib/components/ui/core-grid/core-grid.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,43 +617,29 @@ export class CoreGridComponent
.subscribe(({ data }) => {
const queryName = data.resource.singleQueryName;
if (queryName) {
const query = this.queryBuilder.buildQuery(
{
query: {
...this.settings.query,
name: queryName,
},
},
true
const editedRecord = get(data, queryName);
const dataItem = this.gridData.data.find(
(x) => x.id === item.id
);
if (query) {
this.apollo
.query<any>({
query,
variables: {
id: item.id,
data: editedData,
},
})
.pipe(takeUntil(this.destroy$))
.subscribe(({ data }) => {
const dataItem = this.gridData.data.find(
(x) => x.id === item.id
);
// Update data item element
Object.assign(dataItem, get(data, queryName));
// Update data item raw value ( used by inline edition )
dataItem._meta.raw = editedData;
item.saved = false;
const index = this.updatedItems.findIndex(
(x) => x.id === item.id
);
this.updatedItems.splice(index, 1, {
id: item.id,
...editedData,
});
this.loadItems();
});
if (dataItem) {
Object.assign(dataItem, editedRecord);
dataItem._meta = dataItem._meta || {};
const currentRaw = dataItem._meta.raw || {};
dataItem._meta.raw = { ...currentRaw, ...editedData };
item.saved = false;
const idx = this.updatedItems.findIndex(
(x) => x.id === item.id
);
const mergedForSave = {
id: item.id,
...currentRaw,
...editedData,
};
if (idx >= 0) {
this.updatedItems.splice(idx, 1, mergedForSave);
} else {
this.updatedItems.push(mergedForSave);
}
}
}
});
Expand Down
95 changes: 94 additions & 1 deletion libs/shared/src/lib/survey/components/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { QuestionResource } from '../types';
import {
buildAddButton,
buildSearchButton,
buildInlineAddButton,
processNewCreatedRecords,
setUpActionsButtonWrapper,
} from './utils';
Expand Down Expand Up @@ -164,6 +165,13 @@ export const init = (
}
};

const visibleIfResourceAndDisplayGridAndAddRecord = (obj: any) => {
if (!obj || !obj.resource || !obj.displayAsGrid || !obj.addRecord) {
return false;
}
return true;
};

const component = {
name: 'resources',
title: 'Resources',
Expand Down Expand Up @@ -256,7 +264,7 @@ export const init = (
category: 'Custom Questions',
dependsOn: 'resource',
visibleIf: visibleIfResource,
visibleIndex: 3,
visibleIndex: 2,
});
Serializer.addProperty('resources', {
name: 'addRecord:boolean',
Expand All @@ -266,6 +274,14 @@ export const init = (
visibleIf: visibleIfResource,
visibleIndex: 2,
});
Serializer.addProperty('resources', {
name: 'addInlineRecord:boolean',
displayName: 'Add inline records',
category: 'Custom Questions',
dependsOn: ['resource', 'displayAsGrid', 'addRecord'],
visibleIf: visibleIfResourceAndDisplayGridAndAddRecord,
visibleIndex: 4,
});
Serializer.addProperty('resources', {
name: 'canDelete:boolean',
displayName: 'Delete records',
Expand Down Expand Up @@ -557,12 +573,51 @@ export const init = (
);
actionsButtons.appendChild(addBtn);

const inlineAddBtn = buildInlineAddButton(
question,
true,
ngZone,
document,
apollo
);
actionsButtons.appendChild(inlineAddBtn);

question.registerFunctionOnPropertyValueChanged(
'addInlineRecord',
() => {
inlineAddBtn.style.display =
question.addInlineRecord &&
question.displayAsGrid &&
question.addRecord &&
question.addTemplate &&
!question.isReadOnly
? ''
: 'none';
}
);
inlineAddBtn.style.display =
question.addInlineRecord &&
question.displayAsGrid &&
question.addRecord &&
question.addTemplate &&
!question.isReadOnly
? ''
: 'none';

// actionsButtons.style.display = ((!question.addRecord || !question.addTemplate) && !question.gridFieldsSettings) ? 'none' : '';
question.registerFunctionOnPropertyValueChanged(
'addTemplate',
() => {
addBtn.style.display =
question.addRecord && question.addTemplate ? '' : 'none';
inlineAddBtn.style.display =
question.addInlineRecord &&
question.displayAsGrid &&
question.addRecord &&
question.addTemplate &&
!question.isReadOnly
? ''
: 'none';
}
);
question.registerFunctionOnPropertyValueChanged('addRecord', () => {
Expand All @@ -572,6 +627,15 @@ export const init = (
!question.isReadOnly
? ''
: 'none';

inlineAddBtn.style.display =
question.addInlineRecord &&
question.displayAsGrid &&
question.addRecord &&
question.addTemplate &&
!question.isReadOnly
? ''
: 'none';
});
}
}
Expand All @@ -582,6 +646,19 @@ export const init = (
if (question.resource && question.canSearch) {
searchBtn.style.display = 'block';
}
const inlineAddBtn = parentElement.querySelector(
'#actionsButtons button[data-action="inline-add"]'
);
if (inlineAddBtn) {
(inlineAddBtn as HTMLButtonElement).style.display =
question.addInlineRecord &&
question.displayAsGrid &&
question.addRecord &&
question.addTemplate &&
!question.isReadOnly
? ''
: 'none';
}
});
question.registerFunctionOnPropertyValueChanged('canSearch', () => {
if (question.displayAsGrid) {
Expand Down Expand Up @@ -618,6 +695,19 @@ export const init = (
searchBtn.style.display = 'block';
}
}
const inlineAddBtn = parentElement.querySelector(
'#actionsButtons button[data-action="inline-add"]'
);
if (inlineAddBtn) {
(inlineAddBtn as HTMLButtonElement).style.display =
question.addInlineRecord &&
question.displayAsGrid &&
question.addRecord &&
question.addTemplate &&
!question.isReadOnly
? ''
: 'none';
}
});
question.registerFunctionOnPropertiesValueChanged(
[
Expand Down Expand Up @@ -680,6 +770,9 @@ export const init = (
setGridInputs(grid.instance, question);
question.survey?.onValueChanged.add((_: any, options: any) => {
if (options.name === question.name) {
if ((grid.instance as CoreGridComponent).hasChanges) {
return;
}
setGridInputs(grid.instance, question);
}
});
Expand Down
110 changes: 110 additions & 0 deletions libs/shared/src/lib/survey/components/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import { UntypedFormControl } from '@angular/forms';
import { CompositeFilterDescriptor } from '@progress/kendo-data-query';
import { SurveyModel, surveyLocalization } from 'survey-core';
import { Question } from '../types';
import { Apollo } from 'apollo-angular';
import { ADD_RECORD } from '../../components/form-modal/graphql/mutations';
import { firstValueFrom } from 'rxjs';

/**
* Build the search button for resource and resources components
Expand Down Expand Up @@ -218,6 +221,113 @@ export const buildAddButton = (
return addButton;
};

/**
* Build the inline add button for resource and resources components
*
* @param question The question object
* @param multiselect Indicate if we need multiselect
* @param ngZone Angular Service to execute code inside Angular environment
* @param document Document
* @param apollo Apollo client
* @returns The button DOM element
*/
export const buildInlineAddButton = (
question: Question,
multiselect: boolean,
ngZone: NgZone,
document: Document,
apollo: Apollo
): any => {
const inlineAddButton = document.createElement('button');
inlineAddButton.innerText = surveyLocalization.getString(
'oort:addInlineRecord',
(question.survey as SurveyModel).locale
);
inlineAddButton.className = 'sd-btn !px-3 !py-1';
inlineAddButton.setAttribute('data-action', 'inline-add');

if (
question.addInlineRecord &&
question.displayAsGrid &&
question.addRecord &&
question.addTemplate &&
!question.isReadOnly
) {
inlineAddButton.onclick = async () => {
const result = await firstValueFrom(
apollo.mutate<{ addRecord: any }>({
mutation: ADD_RECORD,
variables: {
form: question.addTemplate,
data: {},
display: false,
},
})
);

const created = result.data?.addRecord;
if (!created) return;

ngZone.run(() => {
const createdId = created.id;
question.template = question.addTemplate;
question.draftData = {
...question.draftData,
[createdId]: created.data || {},
};

if (multiselect) {
const newItem = {
value: createdId,
text: created.data?.[(question as any).displayField],
} as any;
question.contentQuestion.choices = [
newItem,
...question.contentQuestion.choices,
];
question.newCreatedRecords = question.newCreatedRecords
? question.newCreatedRecords.concat(createdId)
: [createdId];
question.value = Array.isArray(question.value)
? (question.value as any[]).concat(createdId)
: question.value
? [question.value, createdId]
: [createdId];
} else {
const newItem = {
value: createdId,
text: created.data?.[(question as any).displayField],
} as any;
question.contentQuestion.choices = [
newItem,
...question.contentQuestion.choices,
];
question.newCreatedRecords = createdId;
question.value = createdId;
}
});
};
}

inlineAddButton.style.display =
question.addInlineRecord &&
question.displayAsGrid &&
question.addRecord &&
question.addTemplate &&
!question.isReadOnly
? ''
: 'none';

question.registerFunctionOnPropertyValueChanged(
'readOnly',
(value: boolean) => {
inlineAddButton.style.display = value ? 'none' : '';
}
);

return inlineAddButton;
};

/**
* Updates the newCreatedRecords for resource and resources questions
*
Expand Down
7 changes: 7 additions & 0 deletions libs/shared/src/lib/survey/localization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ const SURVEY_LOCALIZABLE_STRINGS = [
fr: 'Ajouter un enregistrement',
},
},
{
key: 'addInlineRecord',
locales: {
en: 'Add inline record',
fr: 'Ajouter un enregistrement en ligne',
},
},
{
key: 'fileLimitations',
locales: {
Expand Down
1 change: 1 addition & 0 deletions libs/shared/src/lib/survey/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export interface QuestionResource
displayField: null | string;
relatedName?: string;
addRecord?: boolean;
addInlineRecord?: boolean;
canSearch?: boolean;
addTemplate?: any;
placeholder?: string;
Expand Down