From 5ee49c447ed219884bc63e5ae647a4346d5dc525 Mon Sep 17 00:00:00 2001 From: Zafir Rasyidi Taufik Date: Mon, 7 Jun 2021 17:27:37 +0700 Subject: [PATCH 1/6] [CHORES]Polished some features requested --- src/App/index.tsx | 9 +- .../ContactInvestigationFormStep1/index.tsx | 2 +- .../constants.ts | 178 ++++++++++-------- .../ContactInvestigationFormStep2/index.tsx | 26 +-- .../OfficerSignupFormFinishPage/index.tsx | 2 +- .../OfficerSignupFormGoogleSignin/index.tsx | 2 +- 6 files changed, 124 insertions(+), 95 deletions(-) diff --git a/src/App/index.tsx b/src/App/index.tsx index a7ec193..93c5e65 100644 --- a/src/App/index.tsx +++ b/src/App/index.tsx @@ -73,7 +73,7 @@ declare global { type AlertType = { illustration?: ImageSourcePropType; - message?: string; + message?: string | Element; } type SetAlertType = React.Dispatch> @@ -141,7 +141,7 @@ const navigationTheme = { const App = () => { console.disableYellowBox = true; const [cache, cacheDispatch] = useReducer(cacheReducer, initialCacheState); - const [token, setToken] = useState(); + const [token, setToken] = useState(); const [user, setUser] = useState(); const [shouldLoading, setShouldLoading] = useState(false); @@ -192,7 +192,10 @@ const App = () => { // Token is not valid setAlert({ illustration: WonderingIllustration, - message: "Akun anda belum diaktifkan, silakan hubungi \nppticabangkotadepok@gmail.com", + message: <> + {"Akun anda belum aktif, silahkan hubungi\n"} + ppticabangkotadepok@gmail.com + , }) setToken('') } diff --git a/src/scenes/ContactInvestigationFormStep1/index.tsx b/src/scenes/ContactInvestigationFormStep1/index.tsx index 10c810e..0c9d4ba 100644 --- a/src/scenes/ContactInvestigationFormStep1/index.tsx +++ b/src/scenes/ContactInvestigationFormStep1/index.tsx @@ -21,7 +21,7 @@ import initialCacheState from 'contexts/AppContext/cache'; const ButtonRow = styled.View` margin-top: 30px; - margin-bottom: 12px; + margin-bottom: 48px; display: flex; justify-content: flex-end; `; diff --git a/src/scenes/ContactInvestigationFormStep2/constants.ts b/src/scenes/ContactInvestigationFormStep2/constants.ts index 82c25fe..59b4434 100644 --- a/src/scenes/ContactInvestigationFormStep2/constants.ts +++ b/src/scenes/ContactInvestigationFormStep2/constants.ts @@ -1,82 +1,104 @@ const KECAMATAN_VALUES: {label: string; value: string}[] = [ - {label: 'Beji', value: 'Beji'}, - {label: 'Bojongsari', value: 'Bojongsari'}, - {label: 'Cilodong', value: 'Cilodong'}, - {label: 'Cimanggis', value: 'Cimanggis'}, - {label: 'Cinere', value: 'Cinere'}, - {label: 'Cipayung', value: 'Cipayung'}, - {label: 'Limo', value: 'Limo'}, - {label: 'Pancoran Mas', value: 'Pancoran Mas'}, - {label: 'Sawangan', value: 'Sawangan'}, - {label: 'Sukmajaya', value: 'Sukmajaya'}, - {label: 'Tapos', value: 'Tapos'}, -]; - -const KELURAHAN_VALUES: {label: string; value: string}[] = [ - {label: 'Beji', value: 'Beji'}, - {label: 'Beji Timur', value: 'Beji Timur'}, - {label: 'Kemirimuka', value: 'Kemirimuka'}, - {label: 'Kukusan', value: 'Kukusan'}, - {label: 'Pondok Cina', value: 'Pondok Cina'}, - {label: 'Tanah Baru', value: 'Tanah Baru'}, - {label: 'Bojongsari Baru', value: 'Bojongsari Baru'}, - {label: 'Bojongsari Lama', value: 'Bojongsari Lama'}, - {label: 'Curug', value: 'Curug'}, - {label: 'Duren Mekar', value: 'Duren Mekar'}, - {label: 'Duren Seribu', value: 'Duren Seribu'}, - {label: 'Pondok Petir', value: 'Pondok Petir'}, - {label: 'Serua', value: 'Serua'}, - {label: 'Cilodong', value: 'Cilodong'}, - {label: 'Jatimulya', value: 'Jatimulya'}, - {label: 'Kalibaru', value: 'Kalibaru'}, - {label: 'Kalimulya', value: 'Kalimulya'}, - {label: 'Sukamaju', value: 'Sukamaju'}, - {label: 'Cisalak Pasar', value: 'Cisalak Pasar'}, - {label: 'Curug', value: 'Curug'}, - {label: 'Harjamukti', value: 'Harjamukti'}, - {label: 'Mekarsari', value: 'Mekarsari'}, - {label: 'Pasir Gunung Selatan', value: 'Pasir Gunung Selatan'}, - {label: 'Tugu', value: 'Tugu'}, - {label: 'Cinere', value: 'Cinere'}, - {label: 'Gandul', value: 'Gandul'}, - {label: 'Pangkalan Jati', value: 'Pangkalan Jati'}, - {label: 'Pangkalan Jati Baru', value: 'Pangkalan Jati Baru'}, - {label: 'Bojong Pondok Terong', value: 'Bojong Pondok Terong'}, - {label: 'Cipayung', value: 'Cipayung'}, - {label: 'Cipayung Jaya', value: 'Cipayung Jaya'}, - {label: 'Pondok Jaya', value: 'Pondok Jaya'}, - {label: 'Ratujaya', value: 'Ratujaya'}, - {label: 'Grogol', value: 'Grogol'}, - {label: 'Krukut', value: 'Krukut'}, - {label: 'Limo', value: 'Limo'}, - {label: 'Meruyung', value: 'Meruyung'}, - {label: 'Depok', value: 'Depok'}, - {label: 'Depok Jaya', value: 'Depok Jaya'}, - {label: 'Mampang', value: 'Mampang'}, - {label: 'Pancoran Mas', value: 'Pancoran Mas'}, - {label: 'Rangkapan Jaya', value: 'Rangkapan Jaya'}, - {label: 'Rangkapan Jaya Baru', value: 'Rangkapan Jaya Baru'}, - {label: 'Bedahan', value: 'Bedahan'}, - {label: 'Cinangka', value: 'Cinangka'}, - {label: 'Kedaung', value: 'Kedaung'}, - {label: 'Pasir Putih', value: 'Pasir Putih'}, - {label: 'Pengasinan', value: 'Pengasinan'}, - {label: 'Sawangan Baru', value: 'Sawangan Baru'}, - {label: 'Sawangan Lama', value: 'Sawangan Lama'}, - {label: 'Abadijaya', value: 'Abadijaya'}, - {label: 'Bakti Jaya', value: 'Bakti Jaya'}, - {label: 'Cisalak', value: 'Cisalak'}, - {label: 'Mekar Jaya', value: 'Mekar Jaya'}, - {label: 'Sukmajaya', value: 'Sukmajaya'}, - {label: 'Tirtajaya', value: 'Tirtajaya'}, - {label: 'Cilangkap', value: 'Cilangkap'}, - {label: 'Cimpaeun', value: 'Cimpaeun'}, - {label: 'Jatijajar', value: 'Jatijajar'}, - {label: 'Leuwinanggung', value: 'Leuwinanggung'}, - {label: 'Sukamaju Baru', value: 'Sukamaju Baru'}, - {label: 'Sukatani', value: 'Sukatani'}, - {label: 'Tapos', value: 'Tapos'}, -]; + { label: 'Beji', value: 'Beji' }, + { label: 'Bojongsari', value: 'Bojongsari' }, + { label: 'Cilodong', value: 'Cilodong' }, + { label: 'Cimanggis', value: 'Cimanggis' }, + { label: 'Cinere', value: 'Cinere' }, + { label: 'Cipayung', value: 'Cipayung' }, + { label: 'Limo', value: 'Limo' }, + { label: 'Pancoran Mas', value: 'Pancoran Mas' }, + { label: 'Sawangan', value: 'Sawangan' }, + { label: 'Sukmajaya', value: 'Sukmajaya' }, + { label: 'Tapos', value: 'Tapos' }, + ]; + + const KELURAHAN_VALUES: { [key: string]: {label: string; value: string}[] } = { + 'Beji': [ + { label: 'Beji', value: 'Beji' }, + { label: 'Beji Timur', value: 'Beji Timur' }, + { label: 'Kemirimuka', value: 'Kemirimuka' }, + { label: 'Kukusan', value: 'Kukusan' }, + { label: 'Pondok Cina', value: 'Pondok Cina' }, + { label: 'Tanah Baru', value: 'Tanah Baru' }, + ], + 'Bojongsari': [ + { label: 'Bojongsari Baru', value: 'Bojongsari Baru' }, + { label: 'Bojongsari Lama', value: 'Bojongsari Lama' }, + { label: 'Curug', value: 'Curug' }, + { label: 'Duren Mekar', value: 'Duren Mekar' }, + { label: 'Duren Seribu', value: 'Duren Seribu' }, + { label: 'Pondok Petir', value: 'Pondok Petir' }, + { label: 'Serua', value: 'Serua' }, + ], + 'Cilodong': [ + { label: 'Cilodong', value: 'Cilodong' }, + { label: 'Jatimulya', value: 'Jatimulya' }, + { label: 'Kalibaru', value: 'Kalibaru' }, + { label: 'Kalimulya', value: 'Kalimulya' }, + { label: 'Sukamaju', value: 'Sukamaju' }, + ], + 'Cimanggis': [ + { label: 'Cisalak Pasar', value: 'Cisalak Pasar' }, + { label: 'Curug', value: 'Curug' }, + { label: 'Harjamukti', value: 'Harjamukti' }, + { label: 'Mekarsari', value: 'Mekarsari' }, + { label: 'Pasir Gunung Selatan', value: 'Pasir Gunung Selatan' }, + { label: 'Tugu', value: 'Tugu' }, + ], + 'Cinere': [ + { label: 'Cinere', value: 'Cinere' }, + { label: 'Gandul', value: 'Gandul' }, + { label: 'Pangkalan Jati', value: 'Pangkalan Jati' }, + { label: 'Pangkalan Jati Baru', value: 'Pangkalan Jati Baru' }, + ], + 'Cipayung': [ + { label: 'Bojong Pondok Terong', value: 'Bojong Pondok Terong' }, + { label: 'Cipayung', value: 'Cipayung' }, + { label: 'Cipayung Jaya', value: 'Cipayung Jaya' }, + { label: 'Pondok Jaya', value: 'Pondok Jaya' }, + { label: 'Ratujaya', value: 'Ratujaya' }, + ], + 'Limo': [ + { label: 'Grogol', value: 'Grogol' }, + { label: 'Krukut', value: 'Krukut' }, + { label: 'Limo', value: 'Limo' }, + { label: 'Meruyung', value: 'Meruyung' }, + ], + 'Pancoran Mas': [ + { label: 'Depok', value: 'Depok' }, + { label: 'Depok Jaya', value: 'Depok Jaya' }, + { label: 'Mampang', value: 'Mampang' }, + { label: 'Pancoran Mas', value: 'Pancoran Mas' }, + { label: 'Rangkapan Jaya', value: 'Rangkapan Jaya' }, + { label: 'Rangkapan Jaya Baru', value: 'Rangkapan Jaya Baru' }, + ], + 'Sawangan': [ + { label: 'Bedahan', value: 'Bedahan' }, + { label: 'Cinangka', value: 'Cinangka' }, + { label: 'Kedaung', value: 'Kedaung' }, + { label: 'Pasir Putih', value: 'Pasir Putih' }, + { label: 'Pengasinan', value: 'Pengasinan' }, + { label: 'Sawangan Baru', value: 'Sawangan Baru' }, + { label: 'Sawangan Lama', value: 'Sawangan Lama' }, + ], + 'Sukmajaya': [ + { label: 'Abadijaya', value: 'Abadijaya' }, + { label: 'Bakti Jaya', value: 'Bakti Jaya' }, + { label: 'Cisalak', value: 'Cisalak' }, + { label: 'Mekar Jaya', value: 'Mekar Jaya' }, + { label: 'Sukmajaya', value: 'Sukmajaya' }, + { label: 'Tirtajaya', value: 'Tirtajaya' }, + ], + 'Tapos': [ + { label: 'Cilangkap', value: 'Cilangkap' }, + { label: 'Cimpaeun', value: 'Cimpaeun' }, + { label: 'Jatijajar', value: 'Jatijajar' }, + { label: 'Leuwinanggung', value: 'Leuwinanggung' }, + { label: 'Sukamaju Baru', value: 'Sukamaju Baru' }, + { label: 'Sukatani', value: 'Sukatani' }, + { label: 'Tapos', value: 'Tapos' }, + ], + }; const JENIS_KONTAK_VALUES: {label: string; value: string}[] = [ {label: 'Serumah', value: 'Serumah'}, diff --git a/src/scenes/ContactInvestigationFormStep2/index.tsx b/src/scenes/ContactInvestigationFormStep2/index.tsx index dc2d078..bf08634 100644 --- a/src/scenes/ContactInvestigationFormStep2/index.tsx +++ b/src/scenes/ContactInvestigationFormStep2/index.tsx @@ -97,7 +97,7 @@ const ContactInvestigationFormStep2 = () => { setField("sub_district", case_subject.sub_district) setField("case_relation", case_relation) } else { - setField("sub_district", KELURAHAN_VALUES[0].value) + setField("sub_district", KELURAHAN_VALUES[0]) setField("district", KECAMATAN_VALUES[0].value) setField("case_relation", JENIS_KONTAK_VALUES[0].value) } @@ -157,20 +157,24 @@ const ContactInvestigationFormStep2 = () => { /> onFormChange('sub_district', val)} - /> - onFormChange('district', val)} + values={KECAMATAN_VALUES} + /> + onFormChange('sub_district', val)} + values={(form.fields.district.value) ? KELURAHAN_VALUES[form.fields.district.value] : KELURAHAN_VALUES[KECAMATAN_VALUES[0].value]} /> { Bila ada pertanyaan silahkan kirim ke alamat email - pengurus@ppti.id + ppticabangkotadepok@gmail.com diff --git a/src/scenes/OfficerSignupFormGoogleSignin/index.tsx b/src/scenes/OfficerSignupFormGoogleSignin/index.tsx index 9ea490d..8d460fc 100644 --- a/src/scenes/OfficerSignupFormGoogleSignin/index.tsx +++ b/src/scenes/OfficerSignupFormGoogleSignin/index.tsx @@ -166,7 +166,7 @@ const OfficerSignupFormGoogleSignin = () => { district: translateError(errors.district[0] || ""), sub_district: translateError(errors.sub_district[0] || ""), }) - } else if (response.status === 500) { + } else if (response.status === 500 || response.status === 400) { if (response.data.includes("IntegrityError")) { setServerHasError(false); } else { -- GitLab From 3eba2f90c4ab487e27846626c51edd2e3cae2977 Mon Sep 17 00:00:00 2001 From: Zafir Rasyidi Taufik Date: Mon, 7 Jun 2021 17:44:45 +0700 Subject: [PATCH 2/6] [GREEN] Passed test that failed after polishing --- src/scenes/ContactInvestigationFormStep2/index.test.tsx | 2 +- src/scenes/ContactInvestigationFormStep2/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scenes/ContactInvestigationFormStep2/index.test.tsx b/src/scenes/ContactInvestigationFormStep2/index.test.tsx index d02866d..61affe6 100644 --- a/src/scenes/ContactInvestigationFormStep2/index.test.tsx +++ b/src/scenes/ContactInvestigationFormStep2/index.test.tsx @@ -80,7 +80,7 @@ it('renders correctly', () => { const jenisKontakField = instance.root.find(elem => elem.props.name === "Jenis Kontak"); expect(jenisKontakField).toBeTruthy(); - expect(kelurahanField.props.value).toBe(KELURAHAN_VALUES[0].value); + expect(kelurahanField.props.value).toBe(KELURAHAN_VALUES[KECAMATAN_VALUES[0].value]); expect(kecamatanField.props.value).toBe(KECAMATAN_VALUES[0].value); expect(jenisKontakField.props.value).toBe(JENIS_KONTAK_VALUES[0].value); }); diff --git a/src/scenes/ContactInvestigationFormStep2/index.tsx b/src/scenes/ContactInvestigationFormStep2/index.tsx index bf08634..19b7c62 100644 --- a/src/scenes/ContactInvestigationFormStep2/index.tsx +++ b/src/scenes/ContactInvestigationFormStep2/index.tsx @@ -97,7 +97,7 @@ const ContactInvestigationFormStep2 = () => { setField("sub_district", case_subject.sub_district) setField("case_relation", case_relation) } else { - setField("sub_district", KELURAHAN_VALUES[0]) + setField("sub_district", KELURAHAN_VALUES[KECAMATAN_VALUES[0].value]) setField("district", KECAMATAN_VALUES[0].value) setField("case_relation", JENIS_KONTAK_VALUES[0].value) } -- GitLab From 1e5f720e7b43122e10767b52647cd1259d57ef62 Mon Sep 17 00:00:00 2001 From: Zafir Rasyidi Taufik Date: Mon, 7 Jun 2021 17:56:54 +0700 Subject: [PATCH 3/6] [GREEN] Try to fix test failing in pipeline --- src/scenes/ContactInvestigationFormStep2/index.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/scenes/ContactInvestigationFormStep2/index.tsx b/src/scenes/ContactInvestigationFormStep2/index.tsx index 19b7c62..ee4adab 100644 --- a/src/scenes/ContactInvestigationFormStep2/index.tsx +++ b/src/scenes/ContactInvestigationFormStep2/index.tsx @@ -157,21 +157,17 @@ const ContactInvestigationFormStep2 = () => { /> onFormChange('district', val)} values={KECAMATAN_VALUES} /> onFormChange('sub_district', val)} values={(form.fields.district.value) ? KELURAHAN_VALUES[form.fields.district.value] : KELURAHAN_VALUES[KECAMATAN_VALUES[0].value]} -- GitLab From 8f9bf2cd61a3259e3c73a8748ed1114785faac30 Mon Sep 17 00:00:00 2001 From: Zafir Rasyidi Taufik Date: Mon, 7 Jun 2021 18:06:28 +0700 Subject: [PATCH 4/6] [GREEN] Try to fix error in pipeline --- package-lock.json | 12 ++++++------ src/App/index.tsx | 7 ++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 46a1f4b..3a289d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9905,9 +9905,9 @@ }, "dependencies": { "ws": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", - "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true } } @@ -11401,9 +11401,9 @@ }, "dependencies": { "ws": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", - "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==" + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" } } }, diff --git a/src/App/index.tsx b/src/App/index.tsx index 93c5e65..6de70b8 100644 --- a/src/App/index.tsx +++ b/src/App/index.tsx @@ -73,7 +73,7 @@ declare global { type AlertType = { illustration?: ImageSourcePropType; - message?: string | Element; + message?: string; } type SetAlertType = React.Dispatch> @@ -192,10 +192,7 @@ const App = () => { // Token is not valid setAlert({ illustration: WonderingIllustration, - message: <> - {"Akun anda belum aktif, silahkan hubungi\n"} - ppticabangkotadepok@gmail.com - , + message: "Akun anda belum aktif, silahkan hubungi\nppticabangkotadepok@gmail.com" }) setToken('') } -- GitLab From 64023c32f3ae3126a6878381040b3a84c1db0d95 Mon Sep 17 00:00:00 2001 From: Zafir Rasyidi Taufik Date: Mon, 7 Jun 2021 18:11:30 +0700 Subject: [PATCH 5/6] [GREEN] Try to fix error in pipeline --- src/App/index.tsx | 7 +++++-- src/scenes/ContactInvestigationFormStep2/index.test.tsx | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/App/index.tsx b/src/App/index.tsx index 6de70b8..93c5e65 100644 --- a/src/App/index.tsx +++ b/src/App/index.tsx @@ -73,7 +73,7 @@ declare global { type AlertType = { illustration?: ImageSourcePropType; - message?: string; + message?: string | Element; } type SetAlertType = React.Dispatch> @@ -192,7 +192,10 @@ const App = () => { // Token is not valid setAlert({ illustration: WonderingIllustration, - message: "Akun anda belum aktif, silahkan hubungi\nppticabangkotadepok@gmail.com" + message: <> + {"Akun anda belum aktif, silahkan hubungi\n"} + ppticabangkotadepok@gmail.com + , }) setToken('') } diff --git a/src/scenes/ContactInvestigationFormStep2/index.test.tsx b/src/scenes/ContactInvestigationFormStep2/index.test.tsx index 61affe6..57fdfe0 100644 --- a/src/scenes/ContactInvestigationFormStep2/index.test.tsx +++ b/src/scenes/ContactInvestigationFormStep2/index.test.tsx @@ -13,6 +13,8 @@ import ReactTestRenderer, { act } from 'react-test-renderer'; import {AppContext} from 'contexts'; import { KECAMATAN_VALUES, JENIS_KONTAK_VALUES, KELURAHAN_VALUES } from './constants'; +jest.useFakeTimers(); + const Stack = createStackNavigator(); const testPropsEdit = { cache: { -- GitLab From c25c98301eff90e223d3f07f73ec021eebae0d06 Mon Sep 17 00:00:00 2001 From: Zafir Rasyidi Taufik Date: Mon, 7 Jun 2021 18:21:05 +0700 Subject: [PATCH 6/6] [GREEN] Try to fix error in pipeline --- .../constants.ts | 178 ++++++++---------- .../index.test.tsx | 4 +- .../ContactInvestigationFormStep2/index.tsx | 20 +- 3 files changed, 89 insertions(+), 113 deletions(-) diff --git a/src/scenes/ContactInvestigationFormStep2/constants.ts b/src/scenes/ContactInvestigationFormStep2/constants.ts index 59b4434..82c25fe 100644 --- a/src/scenes/ContactInvestigationFormStep2/constants.ts +++ b/src/scenes/ContactInvestigationFormStep2/constants.ts @@ -1,104 +1,82 @@ const KECAMATAN_VALUES: {label: string; value: string}[] = [ - { label: 'Beji', value: 'Beji' }, - { label: 'Bojongsari', value: 'Bojongsari' }, - { label: 'Cilodong', value: 'Cilodong' }, - { label: 'Cimanggis', value: 'Cimanggis' }, - { label: 'Cinere', value: 'Cinere' }, - { label: 'Cipayung', value: 'Cipayung' }, - { label: 'Limo', value: 'Limo' }, - { label: 'Pancoran Mas', value: 'Pancoran Mas' }, - { label: 'Sawangan', value: 'Sawangan' }, - { label: 'Sukmajaya', value: 'Sukmajaya' }, - { label: 'Tapos', value: 'Tapos' }, - ]; - - const KELURAHAN_VALUES: { [key: string]: {label: string; value: string}[] } = { - 'Beji': [ - { label: 'Beji', value: 'Beji' }, - { label: 'Beji Timur', value: 'Beji Timur' }, - { label: 'Kemirimuka', value: 'Kemirimuka' }, - { label: 'Kukusan', value: 'Kukusan' }, - { label: 'Pondok Cina', value: 'Pondok Cina' }, - { label: 'Tanah Baru', value: 'Tanah Baru' }, - ], - 'Bojongsari': [ - { label: 'Bojongsari Baru', value: 'Bojongsari Baru' }, - { label: 'Bojongsari Lama', value: 'Bojongsari Lama' }, - { label: 'Curug', value: 'Curug' }, - { label: 'Duren Mekar', value: 'Duren Mekar' }, - { label: 'Duren Seribu', value: 'Duren Seribu' }, - { label: 'Pondok Petir', value: 'Pondok Petir' }, - { label: 'Serua', value: 'Serua' }, - ], - 'Cilodong': [ - { label: 'Cilodong', value: 'Cilodong' }, - { label: 'Jatimulya', value: 'Jatimulya' }, - { label: 'Kalibaru', value: 'Kalibaru' }, - { label: 'Kalimulya', value: 'Kalimulya' }, - { label: 'Sukamaju', value: 'Sukamaju' }, - ], - 'Cimanggis': [ - { label: 'Cisalak Pasar', value: 'Cisalak Pasar' }, - { label: 'Curug', value: 'Curug' }, - { label: 'Harjamukti', value: 'Harjamukti' }, - { label: 'Mekarsari', value: 'Mekarsari' }, - { label: 'Pasir Gunung Selatan', value: 'Pasir Gunung Selatan' }, - { label: 'Tugu', value: 'Tugu' }, - ], - 'Cinere': [ - { label: 'Cinere', value: 'Cinere' }, - { label: 'Gandul', value: 'Gandul' }, - { label: 'Pangkalan Jati', value: 'Pangkalan Jati' }, - { label: 'Pangkalan Jati Baru', value: 'Pangkalan Jati Baru' }, - ], - 'Cipayung': [ - { label: 'Bojong Pondok Terong', value: 'Bojong Pondok Terong' }, - { label: 'Cipayung', value: 'Cipayung' }, - { label: 'Cipayung Jaya', value: 'Cipayung Jaya' }, - { label: 'Pondok Jaya', value: 'Pondok Jaya' }, - { label: 'Ratujaya', value: 'Ratujaya' }, - ], - 'Limo': [ - { label: 'Grogol', value: 'Grogol' }, - { label: 'Krukut', value: 'Krukut' }, - { label: 'Limo', value: 'Limo' }, - { label: 'Meruyung', value: 'Meruyung' }, - ], - 'Pancoran Mas': [ - { label: 'Depok', value: 'Depok' }, - { label: 'Depok Jaya', value: 'Depok Jaya' }, - { label: 'Mampang', value: 'Mampang' }, - { label: 'Pancoran Mas', value: 'Pancoran Mas' }, - { label: 'Rangkapan Jaya', value: 'Rangkapan Jaya' }, - { label: 'Rangkapan Jaya Baru', value: 'Rangkapan Jaya Baru' }, - ], - 'Sawangan': [ - { label: 'Bedahan', value: 'Bedahan' }, - { label: 'Cinangka', value: 'Cinangka' }, - { label: 'Kedaung', value: 'Kedaung' }, - { label: 'Pasir Putih', value: 'Pasir Putih' }, - { label: 'Pengasinan', value: 'Pengasinan' }, - { label: 'Sawangan Baru', value: 'Sawangan Baru' }, - { label: 'Sawangan Lama', value: 'Sawangan Lama' }, - ], - 'Sukmajaya': [ - { label: 'Abadijaya', value: 'Abadijaya' }, - { label: 'Bakti Jaya', value: 'Bakti Jaya' }, - { label: 'Cisalak', value: 'Cisalak' }, - { label: 'Mekar Jaya', value: 'Mekar Jaya' }, - { label: 'Sukmajaya', value: 'Sukmajaya' }, - { label: 'Tirtajaya', value: 'Tirtajaya' }, - ], - 'Tapos': [ - { label: 'Cilangkap', value: 'Cilangkap' }, - { label: 'Cimpaeun', value: 'Cimpaeun' }, - { label: 'Jatijajar', value: 'Jatijajar' }, - { label: 'Leuwinanggung', value: 'Leuwinanggung' }, - { label: 'Sukamaju Baru', value: 'Sukamaju Baru' }, - { label: 'Sukatani', value: 'Sukatani' }, - { label: 'Tapos', value: 'Tapos' }, - ], - }; + {label: 'Beji', value: 'Beji'}, + {label: 'Bojongsari', value: 'Bojongsari'}, + {label: 'Cilodong', value: 'Cilodong'}, + {label: 'Cimanggis', value: 'Cimanggis'}, + {label: 'Cinere', value: 'Cinere'}, + {label: 'Cipayung', value: 'Cipayung'}, + {label: 'Limo', value: 'Limo'}, + {label: 'Pancoran Mas', value: 'Pancoran Mas'}, + {label: 'Sawangan', value: 'Sawangan'}, + {label: 'Sukmajaya', value: 'Sukmajaya'}, + {label: 'Tapos', value: 'Tapos'}, +]; + +const KELURAHAN_VALUES: {label: string; value: string}[] = [ + {label: 'Beji', value: 'Beji'}, + {label: 'Beji Timur', value: 'Beji Timur'}, + {label: 'Kemirimuka', value: 'Kemirimuka'}, + {label: 'Kukusan', value: 'Kukusan'}, + {label: 'Pondok Cina', value: 'Pondok Cina'}, + {label: 'Tanah Baru', value: 'Tanah Baru'}, + {label: 'Bojongsari Baru', value: 'Bojongsari Baru'}, + {label: 'Bojongsari Lama', value: 'Bojongsari Lama'}, + {label: 'Curug', value: 'Curug'}, + {label: 'Duren Mekar', value: 'Duren Mekar'}, + {label: 'Duren Seribu', value: 'Duren Seribu'}, + {label: 'Pondok Petir', value: 'Pondok Petir'}, + {label: 'Serua', value: 'Serua'}, + {label: 'Cilodong', value: 'Cilodong'}, + {label: 'Jatimulya', value: 'Jatimulya'}, + {label: 'Kalibaru', value: 'Kalibaru'}, + {label: 'Kalimulya', value: 'Kalimulya'}, + {label: 'Sukamaju', value: 'Sukamaju'}, + {label: 'Cisalak Pasar', value: 'Cisalak Pasar'}, + {label: 'Curug', value: 'Curug'}, + {label: 'Harjamukti', value: 'Harjamukti'}, + {label: 'Mekarsari', value: 'Mekarsari'}, + {label: 'Pasir Gunung Selatan', value: 'Pasir Gunung Selatan'}, + {label: 'Tugu', value: 'Tugu'}, + {label: 'Cinere', value: 'Cinere'}, + {label: 'Gandul', value: 'Gandul'}, + {label: 'Pangkalan Jati', value: 'Pangkalan Jati'}, + {label: 'Pangkalan Jati Baru', value: 'Pangkalan Jati Baru'}, + {label: 'Bojong Pondok Terong', value: 'Bojong Pondok Terong'}, + {label: 'Cipayung', value: 'Cipayung'}, + {label: 'Cipayung Jaya', value: 'Cipayung Jaya'}, + {label: 'Pondok Jaya', value: 'Pondok Jaya'}, + {label: 'Ratujaya', value: 'Ratujaya'}, + {label: 'Grogol', value: 'Grogol'}, + {label: 'Krukut', value: 'Krukut'}, + {label: 'Limo', value: 'Limo'}, + {label: 'Meruyung', value: 'Meruyung'}, + {label: 'Depok', value: 'Depok'}, + {label: 'Depok Jaya', value: 'Depok Jaya'}, + {label: 'Mampang', value: 'Mampang'}, + {label: 'Pancoran Mas', value: 'Pancoran Mas'}, + {label: 'Rangkapan Jaya', value: 'Rangkapan Jaya'}, + {label: 'Rangkapan Jaya Baru', value: 'Rangkapan Jaya Baru'}, + {label: 'Bedahan', value: 'Bedahan'}, + {label: 'Cinangka', value: 'Cinangka'}, + {label: 'Kedaung', value: 'Kedaung'}, + {label: 'Pasir Putih', value: 'Pasir Putih'}, + {label: 'Pengasinan', value: 'Pengasinan'}, + {label: 'Sawangan Baru', value: 'Sawangan Baru'}, + {label: 'Sawangan Lama', value: 'Sawangan Lama'}, + {label: 'Abadijaya', value: 'Abadijaya'}, + {label: 'Bakti Jaya', value: 'Bakti Jaya'}, + {label: 'Cisalak', value: 'Cisalak'}, + {label: 'Mekar Jaya', value: 'Mekar Jaya'}, + {label: 'Sukmajaya', value: 'Sukmajaya'}, + {label: 'Tirtajaya', value: 'Tirtajaya'}, + {label: 'Cilangkap', value: 'Cilangkap'}, + {label: 'Cimpaeun', value: 'Cimpaeun'}, + {label: 'Jatijajar', value: 'Jatijajar'}, + {label: 'Leuwinanggung', value: 'Leuwinanggung'}, + {label: 'Sukamaju Baru', value: 'Sukamaju Baru'}, + {label: 'Sukatani', value: 'Sukatani'}, + {label: 'Tapos', value: 'Tapos'}, +]; const JENIS_KONTAK_VALUES: {label: string; value: string}[] = [ {label: 'Serumah', value: 'Serumah'}, diff --git a/src/scenes/ContactInvestigationFormStep2/index.test.tsx b/src/scenes/ContactInvestigationFormStep2/index.test.tsx index 57fdfe0..d02866d 100644 --- a/src/scenes/ContactInvestigationFormStep2/index.test.tsx +++ b/src/scenes/ContactInvestigationFormStep2/index.test.tsx @@ -13,8 +13,6 @@ import ReactTestRenderer, { act } from 'react-test-renderer'; import {AppContext} from 'contexts'; import { KECAMATAN_VALUES, JENIS_KONTAK_VALUES, KELURAHAN_VALUES } from './constants'; -jest.useFakeTimers(); - const Stack = createStackNavigator(); const testPropsEdit = { cache: { @@ -82,7 +80,7 @@ it('renders correctly', () => { const jenisKontakField = instance.root.find(elem => elem.props.name === "Jenis Kontak"); expect(jenisKontakField).toBeTruthy(); - expect(kelurahanField.props.value).toBe(KELURAHAN_VALUES[KECAMATAN_VALUES[0].value]); + expect(kelurahanField.props.value).toBe(KELURAHAN_VALUES[0].value); expect(kecamatanField.props.value).toBe(KECAMATAN_VALUES[0].value); expect(jenisKontakField.props.value).toBe(JENIS_KONTAK_VALUES[0].value); }); diff --git a/src/scenes/ContactInvestigationFormStep2/index.tsx b/src/scenes/ContactInvestigationFormStep2/index.tsx index ee4adab..dc2d078 100644 --- a/src/scenes/ContactInvestigationFormStep2/index.tsx +++ b/src/scenes/ContactInvestigationFormStep2/index.tsx @@ -97,7 +97,7 @@ const ContactInvestigationFormStep2 = () => { setField("sub_district", case_subject.sub_district) setField("case_relation", case_relation) } else { - setField("sub_district", KELURAHAN_VALUES[KECAMATAN_VALUES[0].value]) + setField("sub_district", KELURAHAN_VALUES[0].value) setField("district", KECAMATAN_VALUES[0].value) setField("case_relation", JENIS_KONTAK_VALUES[0].value) } @@ -157,20 +157,20 @@ const ContactInvestigationFormStep2 = () => { /> onFormChange('district', val)} - values={KECAMATAN_VALUES} + values={KELURAHAN_VALUES} + updateValue={val => onFormChange('sub_district', val)} /> onFormChange('sub_district', val)} - values={(form.fields.district.value) ? KELURAHAN_VALUES[form.fields.district.value] : KELURAHAN_VALUES[KECAMATAN_VALUES[0].value]} + value={form.fields.district.value || KECAMATAN_VALUES[0].value} + type={Field.Type.Dropdown} + values={KECAMATAN_VALUES} + updateValue={val => onFormChange('district', val)} />