Skip to content

Commit e1de284

Browse files
wip
1 parent 463861f commit e1de284

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

app/Filament/Admin/Schemas/InstitutionResourceSchema.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,14 @@ public static function getFormSchemaForDetails(): array
9595
->label(__('organization.field.county'))
9696
->placeholder(__('organization.placeholders.county'))
9797
->searchable()
98+
->options(County::pluck('name', 'id')->toArray())
9899
->getSearchResultsUsing(fn (string $search): array => County::query()
99100
->where('name', 'like', "%{$search}%")
100101
->limit(50)
101102
->get()
102103
->pluck('name', 'id')
103104
->toArray())
105+
->getOptionLabelUsing(fn ($value) => County::find($value)?->name)
104106
->required()
105107
->live()
106108
->afterStateUpdated(fn (Set $set) => $set('city_id', null)),
@@ -109,6 +111,7 @@ public static function getFormSchemaForDetails(): array
109111
->label(__('organization.field.city'))
110112
->placeholder(__('placeholder.city'))
111113
->searchable()
114+
->options([])
112115
->required()
113116
->disabled(fn (Get $get) => ! $get('county_id'))
114117
->getSearchResultsUsing(function (string $search, Get $get): array {
@@ -124,6 +127,7 @@ public static function getFormSchemaForDetails(): array
124127
->pluck('name_with_uat', 'id')
125128
->toArray();
126129
})
130+
->getOptionLabelUsing(fn ($value) => City::find($value)?->name_with_uat ?? City::find($value)?->name)
127131
->live(),
128132

129133
TextInput::make('address')

app/Filament/Organizations/Resources/BeneficiaryResource/Pages/DetailedEvaluation/EditBeneficiaryPartner.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,14 @@ protected function getFormSchema(): array
8787
->label(__('field.county'))
8888
->placeholder(__('placeholder.county'))
8989
->searchable()
90+
->options(County::pluck('name', 'id')->toArray())
9091
->getSearchResultsUsing(fn (string $search): array => County::query()
9192
->where('name', 'like', "%{$search}%")
9293
->limit(50)
9394
->get()
9495
->pluck('name', 'id')
9596
->toArray())
97+
->getOptionLabelUsing(fn ($value) => County::find($value)?->name)
9698
->live()
9799
->afterStateUpdated(function (Set $set, Get $get) {
98100
$set('legal_residence.city_id', null);
@@ -106,6 +108,7 @@ protected function getFormSchema(): array
106108
->label(__('field.city'))
107109
->placeholder(__('placeholder.city'))
108110
->searchable()
111+
->options([])
109112
->disabled(fn (Get $get) => ! $get('legal_residence.county_id'))
110113
->getSearchResultsUsing(function (string $search, Get $get): array {
111114
if (! $get('legal_residence.county_id')) {
@@ -120,6 +123,7 @@ protected function getFormSchema(): array
120123
->pluck('name_with_uat', 'id')
121124
->toArray();
122125
})
126+
->getOptionLabelUsing(fn ($value) => City::find($value)?->name_with_uat ?? City::find($value)?->name)
123127
->live()
124128
->afterStateUpdated(function (Set $set, Get $get, $state) {
125129
if ($get('same_as_legal_residence')) {
@@ -166,12 +170,14 @@ protected function getFormSchema(): array
166170
->label(__('field.county'))
167171
->placeholder(__('placeholder.county'))
168172
->searchable()
173+
->options(County::pluck('name', 'id')->toArray())
169174
->getSearchResultsUsing(fn (string $search): array => County::query()
170175
->where('name', 'like', "%{$search}%")
171176
->limit(50)
172177
->get()
173178
->pluck('name', 'id')
174179
->toArray())
180+
->getOptionLabelUsing(fn ($value) => County::find($value)?->name)
175181
->live()
176182
->afterStateUpdated(fn (Set $set) => $set('effective_residence.city_id', null))
177183
->disabled(fn (Get $get) => $get('same_as_legal_residence')),
@@ -180,6 +186,7 @@ protected function getFormSchema(): array
180186
->label(__('field.city'))
181187
->placeholder(__('placeholder.city'))
182188
->searchable()
189+
->options([])
183190
->disabled(fn (Get $get) => $get('same_as_legal_residence') || ! $get('effective_residence.county_id'))
184191
->getSearchResultsUsing(function (string $search, Get $get): array {
185192
if (! $get('effective_residence.county_id')) {
@@ -194,6 +201,7 @@ protected function getFormSchema(): array
194201
->pluck('name_with_uat', 'id')
195202
->toArray();
196203
})
204+
->getOptionLabelUsing(fn ($value) => City::find($value)?->name_with_uat ?? City::find($value)?->name)
197205
->live(),
198206

199207
TextInput::make('effective_residence.address')

app/Filament/Organizations/Resources/BeneficiaryResource/Pages/EditBeneficiaryIdentity.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,14 @@ public static function getBeneficiaryIdentityFormSchema(?Beneficiary $parentBene
222222
->label(__('field.county'))
223223
->placeholder(__('placeholder.county'))
224224
->searchable()
225+
->options(County::pluck('name', 'id')->toArray())
225226
->getSearchResultsUsing(fn (string $search): array => County::query()
226227
->where('name', 'like', "%{$search}%")
227228
->limit(50)
228229
->get()
229230
->pluck('name', 'id')
230231
->toArray())
232+
->getOptionLabelUsing(fn ($value) => County::find($value)?->name)
231233
->live()
232234
->afterStateUpdated(function (Set $set, Get $get) {
233235
$set('legal_residence.city_id', null);
@@ -241,6 +243,7 @@ public static function getBeneficiaryIdentityFormSchema(?Beneficiary $parentBene
241243
->label(__('field.city'))
242244
->placeholder(__('placeholder.city'))
243245
->searchable()
246+
->options([])
244247
->disabled(fn (Get $get) => ! $get('legal_residence.county_id'))
245248
->getSearchResultsUsing(function (string $search, Get $get): array {
246249
if (! $get('legal_residence.county_id')) {
@@ -255,6 +258,7 @@ public static function getBeneficiaryIdentityFormSchema(?Beneficiary $parentBene
255258
->pluck('name_with_uat', 'id')
256259
->toArray();
257260
})
261+
->getOptionLabelUsing(fn ($value) => City::find($value)?->name_with_uat ?? City::find($value)?->name)
258262
->live()
259263
->afterStateUpdated(function (Set $set, Get $get, $state) {
260264
if ($get('same_as_legal_residence')) {
@@ -315,12 +319,14 @@ public static function getBeneficiaryIdentityFormSchema(?Beneficiary $parentBene
315319
->label(__('field.county'))
316320
->placeholder(__('placeholder.county'))
317321
->searchable()
322+
->options(County::pluck('name', 'id')->toArray())
318323
->getSearchResultsUsing(fn (string $search): array => County::query()
319324
->where('name', 'like', "%{$search}%")
320325
->limit(50)
321326
->get()
322327
->pluck('name', 'id')
323328
->toArray())
329+
->getOptionLabelUsing(fn ($value) => County::find($value)?->name)
324330
->live()
325331
->afterStateUpdated(fn (Set $set) => $set('effective_residence.city_id', null))
326332
->disabled(fn (Get $get) => $get('same_as_legal_residence')),
@@ -329,6 +335,7 @@ public static function getBeneficiaryIdentityFormSchema(?Beneficiary $parentBene
329335
->label(__('field.city'))
330336
->placeholder(__('placeholder.city'))
331337
->searchable()
338+
->options([])
332339
->disabled(fn (Get $get) => $get('same_as_legal_residence') || ! $get('effective_residence.county_id'))
333340
->getSearchResultsUsing(function (string $search, Get $get): array {
334341
if (! $get('effective_residence.county_id')) {
@@ -343,6 +350,7 @@ public static function getBeneficiaryIdentityFormSchema(?Beneficiary $parentBene
343350
->pluck('name_with_uat', 'id')
344351
->toArray();
345352
})
353+
->getOptionLabelUsing(fn ($value) => City::find($value)?->name_with_uat ?? City::find($value)?->name)
346354
->live(),
347355

348356
TextInput::make('effective_residence.address')

0 commit comments

Comments
 (0)