Skip to content

Add json_schema column to candidate config #113

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
manuranga wants to merge 2 commits into
base: dynamic_form
Choose a base branch
from
Open

Add json_schema column to candidate config #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a6d261
Add json_schema column to candidate config
manuranga Oct 8, 2019
3f34cbb
Merge branch 'permission_yujith' of github.com:ECLK/Nomination into p…
manuranga Oct 8, 2019
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: 4 additions & 3 deletions src/manager/module/moduleManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const resultMaps = [
{
mapId: 'SeparateCandidateConfigMap',
idProperty: 'id',
properties: ['key_name', 'description']
properties: ['key_name', 'description', 'json_schema']
},
];

Expand Down Expand Up @@ -156,12 +156,13 @@ const mapToCandidateConfigModel = (templates) => {
console.log("mappedElectionTemplate",templates);

const mappedElectionTemplate = joinjs.map(templates, resultMaps, 'SeparateCandidateConfigMap', 'candidate_config_');
console.log("mappedEle",mappedElectionTemplate);
console.log("mappedConf",mappedElectionTemplate);
return _.reduce(mappedElectionTemplate, (result, election) => {
return result.push({
candidate_config_id: election.id,
key_name: election.key_name,
description: election.description
description: election.description,
json_schema: election.json_schema
});
}, List(CandidateConfig)());
}
Expand Down
4 changes: 3 additions & 1 deletion src/model/Module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ const eligibilityCheckList = Record({
const CandidateConfig = Record({
candidate_config_id: String(),
key_name: String(),
description: String()
description: String(),
json_schema: Maybe(String)

});

const ModuleList = Record({
Expand Down
5 changes: 3 additions & 2 deletions src/repository/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ const TEMPLATE_STATUS_UPDATE_QUERY = `UPDATE ELECTION_MODULE_APPROVAL

const CANDIDATE_CONFIG_SELECT_QUERY = `SELECT CC.ID AS candidate_config_id,
CC.KEY_NAME AS candidate_config_key_name,
CC.DESCRIPTION AS candidate_config_description
FROM CANDIDATE_CONFIG_DATA CAD LEFT JOIN CANDIDATE_CONFIG CC ON CAD.CANDIDATE_CONFIG_ID=CC.ID
CC.DESCRIPTION AS candidate_config_description,
CC.JSON_SCHEMA AS candidate_config_json_schema
FROM CANDIDATE_CONFIG_DATA CAD LEFT JOIN CANDIDATE_CONFIG CC ON CAD.CANDIDATE_CONFIG_ID=CC.ID
WHERE CAD.MODULE_ID=:id`;

const fetchModuleById = (moduleId) => {
Expand Down