Skip to content

chore(#10546): add constant for contact document type #10614

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
akshaypatra00 wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −22
Open

chore(#10546): add constant for contact document type #10614

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
1 change: 1 addition & 0 deletions shared-libs/constants/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const CONTACT_TYPES = {
const DOC_TYPES = {
TOKEN_LOGIN: 'token_login',
TRANSLATIONS: 'translations',
CONTACT: 'contact',
};

// HTTP Headers
Expand Down
4 changes: 2 additions & 2 deletions shared-libs/contact-types-utils/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { CONTACT_TYPES } = require('@medic/constants');
const { CONTACT_TYPES, DOC_TYPES } = require('@medic/constants');

const HARDCODED_PERSON_TYPE = 'person';
const HARDCODED_TYPES = [
Expand All @@ -21,7 +21,7 @@ const getTypeId = (doc) => {
if (!doc) {
return;
}
return doc.type === 'contact' ? doc.contact_type : doc.type;
return doc.type === DOC_TYPES.CONTACT ? doc.contact_type : doc.type;
};

const getTypeById = (config, typeId) => {
Expand Down
15 changes: 8 additions & 7 deletions webapp/src/js/bootstrapper/offline-ddocs/medic-offline-freetext/contacts_by_type_freetext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
module.exports.map = (doc) => {
const skip = [ '_id', '_rev', 'type', 'refid', 'geolocation' ];
const { DOC_TYPES } = require('@medic/constants');
Copy link
Member

@dianabarsan dianabarsan Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CouchDb view maps can't require unfortunately. So this file shouldn't be changed.

const skip = ['_id', '_rev', 'type', 'refid', 'geolocation'];
const keyShouldBeSkipped = key => skip.indexOf(key) !== -1 || /_date$/.test(key);

const usedKeys = [];
const emitMaybe = function(type, key, value) {
const emitMaybe = function (type, key, value) {
if (usedKeys.indexOf(key) === -1 && // Not already used
key.length > 2 // Not too short
) {
usedKeys.push(key);
emit([ type, key ], value);
emit([type, key], value);
}
};

Expand All @@ -32,17 +33,17 @@ module.exports.map = (doc) => {
};

const getType = () => {
if (doc.type !== 'contact') {
if (doc.type !== DOC_TYPES.CONTACT) {
return doc.type;
}

return doc.contact_type;
};

const getTypeIndex = type => {
const types = [ 'district_hospital', 'health_center', 'clinic', 'person' ];
const types = ['district_hospital', 'health_center', 'clinic', 'person'];
const typeIndex = types.indexOf(type);
if (typeIndex === -1 && doc.type === 'contact') {
if (typeIndex === -1 && doc.type === DOC_TYPES.CONTACT) {
return type;
}

Expand All @@ -60,5 +61,5 @@ module.exports.map = (doc) => {
const order = `${dead} ${muted} ${idx} ${doc.name && doc.name.toLowerCase()}`;
Object
.keys(doc)
.forEach(key => emitField(type, key, doc[key], order));
.forEach(key => emitField(type, key, doc[key], order));
};
19 changes: 10 additions & 9 deletions webapp/src/ts/reducers/contacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { createReducer, on } from '@ngrx/store';

import { DOC_TYPES } from '@medic/constants';
import { UniqueSortedList } from '@mm-reducers/utils';
import { ContactTypesService } from '@mm-services/contact-types.service';
import { Actions } from '@mm-actions/contacts';
Expand All @@ -16,7 +17,7 @@ const initialState = {
};

const getContactTypeOrder = (contact) => {
if (contact.type === 'contact') {
if (contact.type === DOC_TYPES.CONTACT) {
const idx = ContactTypesService.HARDCODED_TYPES().indexOf(contact.contact_type);
if (idx !== -1) {
// matches a hardcoded type - order by the index
Expand Down Expand Up @@ -72,7 +73,7 @@ const updateContacts = (state, newContacts) => {
};

const removeContact = (state, contact) => {
const contacts = [ ...state.contacts];
const contacts = [...state.contacts];
const contactsById = new Map(state.contactsById);

const list = new UniqueSortedList(contacts, contactsById, orderBy);
Expand Down Expand Up @@ -130,7 +131,7 @@ const updateSelectedContactsTasks = (state, tasks) => {
});
return { ...group, contacts };
});
return { ...state, selected: { ...state.selected, tasks: mappedTasks, children }};
return { ...state, selected: { ...state.selected, tasks: mappedTasks, children } };
};

const receiveSelectedContactTargetDoc = (state, targetDoc) => {
Expand All @@ -148,18 +149,18 @@ const _contactsReducer = createReducer(
on(Actions.removeContactFromList, (state, { payload: { contact } }) => removeContact(state, contact)),
on(Actions.setSelectedContact, (state, { payload: { selected } }) => setSelectedContact(state, selected)),
on(Actions.setLoadingSelectedContact, (state) => setLoadingSelectedContact(state)),
on(Actions.setContactsLoadingSummary, (state, { payload: { value }}) => setContactsLoadingSummary(state, value)),
on(Actions.receiveSelectedContactChildren, (state, { payload: { children }}) => {
on(Actions.setContactsLoadingSummary, (state, { payload: { value } }) => setContactsLoadingSummary(state, value)),
on(Actions.receiveSelectedContactChildren, (state, { payload: { children } }) => {
return receiveSelectedContactChildren(state, children);
}),
on(Actions.receiveSelectedContactReports, (state, { payload: { reports }}) => {
on(Actions.receiveSelectedContactReports, (state, { payload: { reports } }) => {
return receiveSelectedContactReports(state, reports);
}),
on(Actions.updateSelectedContactSummary, (state, { payload: { summary }}) => {
on(Actions.updateSelectedContactSummary, (state, { payload: { summary } }) => {
return updateSelectedContactSummary(state, summary);
}),
on(Actions.updateSelectedContactsTasks, (state, { payload: { tasks }}) => updateSelectedContactsTasks(state, tasks)),
on(Actions.receiveSelectedContactTargetDoc, (state, { payload: { targetDoc }}) => {
on(Actions.updateSelectedContactsTasks, (state, { payload: { tasks } }) => updateSelectedContactsTasks(state, tasks)),
on(Actions.receiveSelectedContactTargetDoc, (state, { payload: { targetDoc } }) => {
return receiveSelectedContactTargetDoc(state, targetDoc);
}),
);
Expand Down
9 changes: 5 additions & 4 deletions webapp/src/ts/services/contact-types.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
import { DOC_TYPES } from '@medic/constants';
import * as contactTypesUtils from '@medic/contact-types-utils';

import { SettingsService } from '@mm-services/settings.service';
Expand All @@ -7,7 +8,7 @@ import { SettingsService } from '@mm-services/settings.service';
providedIn: 'root'
})
export class ContactTypesService {
constructor(private settingsService:SettingsService) {
constructor(private settingsService: SettingsService) {
}

static HARDCODED_TYPES() {
Expand All @@ -26,7 +27,7 @@ export class ContactTypesService {
/**
* Returns a Promise to resolve an array of configured contact types.
*/
getAll () {
getAll() {
return this.settingsService
.get()
.then(config => contactTypesUtils.getContactTypes(config));
Expand All @@ -48,7 +49,7 @@ export class ContactTypesService {
if (!type) {
return false;
}
return type === 'contact' || // configurable hierarchy
return type === DOC_TYPES.CONTACT || // configurable hierarchy
contactTypesUtils.isHardcodedType(type); // hardcoded
}

Expand Down Expand Up @@ -119,7 +120,7 @@ export class ContactTypesService {
if (!typeId || !types?.length) {
return false;
}
return !!types.find((type:ContactType) => type?.id === typeId);
return !!types.find((type: ContactType) => type?.id === typeId);
}
}

Expand Down
Loading