-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CHANGESET: twelve-pets-lay. Added contact field - different from memb…
…er field - WIP #56
- Loading branch information
1 parent
aec4069
commit 822e37a
Showing
34 changed files
with
525 additions
and
279 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
--- | ||
'@uidu/data-controls': patch | ||
'@uidu/data-fields': patch | ||
'@uidu/data-manager': patch | ||
'@uidu/table': patch | ||
'@uidu/select': patch | ||
--- | ||
|
||
Added contact field - different from member field - WIP #56 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
packages/data/data-fields/src/components/contact/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { faUsers } from '@fortawesome/free-solid-svg-icons'; | ||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; | ||
import loadable from '@loadable/component'; | ||
import React from 'react'; | ||
import { FormattedMessage } from 'react-intl'; | ||
import { Field } from '../../types'; | ||
|
||
const FilterForm = loadable(() => import('../../filters/TextFilterForm')); | ||
|
||
const Contact: Field = { | ||
kind: 'contact', | ||
name: <FormattedMessage id="field.contact.name" defaultMessage="Contact" />, | ||
icon: <FontAwesomeIcon icon={faUsers} />, | ||
description: ( | ||
<FormattedMessage | ||
id="field.contact.description" | ||
defaultMessage="A contact field represents a person or an organization - a contact" | ||
/> | ||
), | ||
filterForm: FilterForm, | ||
}; | ||
|
||
export default Contact; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import FieldDate from '@uidu/field-date'; | ||
import Select from '@uidu/select'; | ||
import React from 'react'; | ||
import { injectIntl } from 'react-intl'; | ||
import { filtersByType } from './utils'; | ||
|
||
function DateFilterForm({ | ||
onChange, | ||
filter = {} as any, | ||
index = 0, | ||
intl, | ||
...rest | ||
}) { | ||
const filters = filtersByType(intl, 'date'); | ||
return ( | ||
<> | ||
<div className="form-row"> | ||
<div className="col-4"> | ||
<Select | ||
isClearable={false} | ||
layout="elementOnly" | ||
value={filter.type || filters[0].id} | ||
name={`filters[${index}][type]`} | ||
options={filters} | ||
/> | ||
</div> | ||
<div className="col-8"> | ||
<FieldDate | ||
layout="elementOnly" | ||
name={`filters[${index}][filter]`} | ||
value={filter.filter} | ||
onChange={(name, value) => { | ||
console.log(value); | ||
if (value !== '') { | ||
onChange(name, value); | ||
} | ||
}} | ||
autoFocus | ||
/> | ||
</div> | ||
</div> | ||
</> | ||
); | ||
} | ||
|
||
export default injectIntl(DateFilterForm); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
// export { default as DateFilterForm } from './DateFilterForm'; | ||
export { default as DateFilterForm } from './DateFilterForm'; | ||
export { default as NumberFilterForm } from './NumberFilterForm'; | ||
export { default as SelectFilterForm } from './SelectFilterForm'; | ||
export { default as TextFilterForm } from './TextFilterForm'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.