Skip to content
Merged
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
8 changes: 4 additions & 4 deletions src/components/CitizenSummarySidesheet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ describe('CitizenSummarySidesheet', () => {
});

test('loads summary data correctly', async () => {
readSpy.mockResolvedValueOnce({ data: [baseCitizen] });
readSpy.mockResolvedValueOnce(baseCitizen);

wrapper = createWrapper();
await wrapper.setProps({ modelValue: true });

await vi.waitFor(() =>
expect(readSpy).toHaveBeenCalledWith({ search_string: '12345678900' })
expect(readSpy).toHaveBeenCalledWith({ id: '12345678900' })
);

await vi.waitFor(() =>
Expand All @@ -125,7 +125,7 @@ describe('CitizenSummarySidesheet', () => {
});

test('pregnant badge is show correctly', async () => {
readSpy.mockResolvedValueOnce({ data: [baseCitizen] });
readSpy.mockResolvedValueOnce(baseCitizen);

wrapper = createWrapper();
await wrapper.setProps({ modelValue: true });
Expand All @@ -150,7 +150,7 @@ describe('CitizenSummarySidesheet', () => {

expect(wrapper.find('[data-testid="summary-skeleton"]').exists()).toBe(true);

resolveRead({ data: [baseCitizen] });
resolveRead(baseCitizen);
await vi.waitFor(() =>
expect(wrapper.find('[data-testid="summary-skeleton"]').exists()).toBe(false)
);
Expand Down
8 changes: 4 additions & 4 deletions src/components/CitizenSummarySidesheet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ watch(model, (newValue) => {

async function fetchCitizen() {
isLoading.value = true;
citizenService.read({ search_string: props.citizen })
.then(({ data }) => {
if (data.length === 0 || !data[0]) {
citizenService.read({ id: props.citizen })
.then((data) => {
if (!data) {
return;
}

internalCitizen.value = new CitizenModel(data[0]);
internalCitizen.value = new CitizenModel(data);
})
.finally(() => isLoading.value = false);
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/EditCitizenSidesheet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ watch(model, (newValue) => {

async function fetchCitizen() {
isLoading.value = true;
citizenService.read({ search_string: props.citizen })
.then(({ data }) => {
if (data.length === 0) {
citizenService.read({ id: props.citizen })
.then((data) => {
if (!data) {
return;
}

[selectedCitizen.value] = data;
selectedCitizen.value = data;
})
.finally(() => isLoading.value = false);
}
Expand Down
5 changes: 2 additions & 3 deletions src/services/citizen/citizen.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type {
} from './citizen.types';
import { makeCitizen, makeCitizens } from './citizen.mock';
import { getConfig, type CitizenComponentsConfig, type Endpoints } from '../../config';
// @ts-ignore
import { removeCpfMask, removeCnsMask } from '@sysvale/foundry';
import axios from 'axios';
import isCustomEndpointSet from '@/utils/isCustomEndpointSet';
Expand Down Expand Up @@ -63,9 +64,7 @@ export class CitizenService {
}

try {
const response = await this.apiCall('index', {
params,
});
const response = await this.apiCall('index', params);

return response;
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion src/services/citizen/citizen.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,5 @@ export interface CreateCitizenResponse {
}

export interface ReadCitizenParams {
search_string: string;
id: string;
}
Loading