Skip to content
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

Jump to bottom

Move isCustomFieldDescription guard into the customField directory #936

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Move isCustomFieldDescription guard into the customField directory #936

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
c957f1a
Move isCustomFieldDescription guard into the customField directory
wwahammy Oct 29, 2024
9694729
remove extra line break
wwahammy Oct 29, 2024
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
9 changes: 9 additions & 0 deletions client/js/nonprofits/donate/parseFields/customField/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
// License: LGPL-3.0-or-later
import { parseCustomField } from "./legacy";
import has from 'lodash/has';
import get from 'lodash/get';

export interface CustomFieldDescription {
name: NonNullable<string>;
label: NonNullable<string>;
type: 'supporter';
}

export function isCustomFieldDescription(item:unknown) : item is CustomFieldDescription {
return typeof item == 'object' &&
has(item, 'name') &&
has(item, 'label') &&
['supporter'].includes(get(item, 'type'));
}


export default parseCustomField;
12 changes: 2 additions & 10 deletions client/js/nonprofits/donate/parseFields/customFields/JsonStringParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
// License: LGPL-3.0-or-later
import has from 'lodash/has';
import get from 'lodash/get';
import { parse } from 'json5';
import { CustomFieldDescription } from '../customField';
import { CustomFieldDescription, isCustomFieldDescription } from '../customField';

function isCustomFieldDesc(item:unknown) : item is CustomFieldDescription {
return typeof item == 'object' &&
has(item, 'name') &&
has(item, 'label') &&
['supporter'].includes(get(item, 'type'));
}
export default class JsonStringParser {
public errors:SyntaxError[] = [];
public readonly results: CustomFieldDescription[] = [];
Expand All @@ -27,7 +19,7 @@ export default class JsonStringParser {
const result = parse(this.fieldsString)
if (result instanceof Array) {
result.forEach((i) => {
if (isCustomFieldDesc(i)) {
if (isCustomFieldDescription(i)) {
this.results.push({ ...i});
}

Expand Down
Loading