colemanw [Tue, 10 May 2022 23:08:29 +0000 (19:08 -0400)]
Merge pull request #23416 from eileenmcnaughton/import_create_job
[REF] [Import] Create user-job records for Memership imports
Monish Deb [Tue, 10 May 2022 13:48:50 +0000 (19:18 +0530)]
Merge pull request #23418 from eileenmcnaughton/import_valid3
[Import] Use table rather than csvs for no-match & unparsed
Eileen McNaughton [Tue, 10 May 2022 08:57:26 +0000 (20:57 +1200)]
Merge pull request #23317 from seamuslee001/php81_trim_codegen
[REF] Fix PHP8.1 issue with passing NULL to trim()
Eileen McNaughton [Tue, 10 May 2022 08:07:14 +0000 (20:07 +1200)]
Use table rather than csvs for no-match & unparsed
Eileen McNaughton [Tue, 10 May 2022 07:41:12 +0000 (19:41 +1200)]
Add test for NO_MATCH flow
Seamus Lee [Thu, 28 Apr 2022 00:58:22 +0000 (10:58 +1000)]
[REF] Fix PHP8.1 issue with passing NULL to trim()
Yashodha Chaku [Tue, 10 May 2022 05:33:00 +0000 (11:03 +0530)]
Merge pull request #23385 from colemanw/defaultToIndividual
SearchKit - Default to search for individuals
Eileen McNaughton [Tue, 10 May 2022 00:10:18 +0000 (12:10 +1200)]
Add test to ensure emails are validated & remove duplicate validation
Eileen McNaughton [Mon, 9 May 2022 21:14:29 +0000 (09:14 +1200)]
[Ref][Import] Start adding testing to validation, simplify
Eileen McNaughton [Mon, 9 May 2022 12:16:23 +0000 (00:16 +1200)]
[Import][Ref] Calculate relationship type in parser
This is being calculated
here
https://github.com/civicrm/civicrm-core/blob/
c169525f72b1f956d58cec1e4a15b0f57de3eabf/CRM/Contact/Import/ImportJob.php#L132-L136
And this change moves the calculation into the
parser class so that, along with the other arrays
it can be removed as an input parameter
colemanw [Tue, 10 May 2022 00:11:33 +0000 (20:11 -0400)]
Merge pull request #23401 from eileenmcnaughton/import_data_source
(REF) Importer - Remove unused parameters. Simplify signature.
Eileen McNaughton [Thu, 21 Apr 2022 21:31:57 +0000 (09:31 +1200)]
[REF] [Import] Create user-job records for Memership imports
Eileen McNaughton [Mon, 9 May 2022 19:51:05 +0000 (07:51 +1200)]
Merge pull request #23414 from civicrm/5.50
5.50 to master
Eileen McNaughton [Mon, 9 May 2022 19:50:35 +0000 (07:50 +1200)]
Merge pull request #23412 from colemanw/inputTypes
Afform - Fix RC regression of missing input types
Eileen McNaughton [Mon, 9 May 2022 19:37:07 +0000 (07:37 +1200)]
Merge pull request #23411 from civicrm/5.50
5.50
colemanw [Mon, 9 May 2022 17:58:51 +0000 (13:58 -0400)]
Merge pull request #23410 from colemanw/api4ConformanceTestBase
[TEST ONLY] APIv4 - Remove unused extras from ConformanceTest
colemanw [Mon, 9 May 2022 17:45:08 +0000 (13:45 -0400)]
Merge pull request #23382 from eileenmcnaughton/import_simp
[REF] Import - make condition clearer
colemanw [Mon, 9 May 2022 17:43:38 +0000 (13:43 -0400)]
Merge pull request #23290 from eileenmcnaughton/import_cont
[REF] [Import] Contribution import - clarify return codes
colemanw [Mon, 9 May 2022 17:41:18 +0000 (13:41 -0400)]
Merge pull request #23406 from eileenmcnaughton/import_no_match
[REF] [Import] Summary tpl - remove always-true ifs
colemanw [Mon, 9 May 2022 17:32:12 +0000 (13:32 -0400)]
Merge pull request #23405 from eileenmcnaughton/import_in
[REF][Import] Remove some, now unused, parameters
Coleman Watts [Mon, 9 May 2022 15:59:15 +0000 (11:59 -0400)]
Afform - Fix RC regression of missing input types
This regressed because the client-side variable was renamed as
part of
47332dba8ff22aa6f08d473a0437dc02ca53458d
demeritcowboy [Mon, 9 May 2022 15:56:59 +0000 (11:56 -0400)]
Merge pull request #23407 from eileenmcnaughton/import_550
[Import] Fix 5.50 error url
Coleman Watts [Mon, 9 May 2022 15:40:56 +0000 (11:40 -0400)]
APIv4 Tests - Remove unused extras from ConformanceTest
Eileen McNaughton [Mon, 9 May 2022 11:13:20 +0000 (23:13 +1200)]
[Import] Fix 5.50 error url
Eileen McNaughton [Mon, 9 May 2022 11:00:52 +0000 (23:00 +1200)]
[REF] [Import] Summary tpl - remove always-true ifs
Eileen McNaughton [Mon, 9 May 2022 10:30:59 +0000 (22:30 +1200)]
[REF][Import] Remove some, now unused, parameters
Eileen McNaughton [Thu, 5 May 2022 22:48:28 +0000 (10:48 +1200)]
[REF] Import - make condition clearer
The mapping of fields basically breaks down into 'has a relationship' - in which
case fieldName is empy and does not have a relationship - in which
case field name is not empy. This makes that explicit -
specifically referring to relatedContactKey rather than
relying on the person reading the code
understanding that the presence of fieldName implies
whether it is a relationship
Eileen McNaughton [Sat, 23 Apr 2022 21:57:08 +0000 (09:57 +1200)]
[REF] [Import] Contribution import - clarify return codes, remove handling for unused CONFLICT
Seamus Lee [Mon, 9 May 2022 07:09:10 +0000 (17:09 +1000)]
Merge pull request #23296 from colemanw/afformRelationships
Afform - support relationships
Yashodha Chaku [Mon, 9 May 2022 03:47:21 +0000 (09:17 +0530)]
Merge pull request #23395 from eileenmcnaughton/import_cleanup
[Ref][Import] Remove now-unused code
Eileen McNaughton [Sun, 8 May 2022 09:55:20 +0000 (21:55 +1200)]
Merge pull request #23402 from colemanw/customTestBase
[REF] [TEST ONLY] APIv4 - Reorganize test classes, don't use transactions for custom field tests
colemanw [Sat, 7 May 2022 20:56:59 +0000 (16:56 -0400)]
Merge pull request #23400 from eileenmcnaughton/import_no_match
[Import] Reduce unused copy & paste
Coleman Watts [Sat, 7 May 2022 17:35:56 +0000 (13:35 -0400)]
APIv4 - Reorganize test classes, don't use transactions for custom value tests
Transactions don't work for custom field tests because schema alterations can't be inside transactions.
This moves the "implements TransactionalInterface" declaration from the base class to the test classes
so each one can opt-in individually.
Eileen McNaughton [Sat, 7 May 2022 03:07:34 +0000 (15:07 +1200)]
[Import] Fix database initialization to remove unused parameters
Eileen McNaughton [Sat, 7 May 2022 03:16:09 +0000 (15:16 +1200)]
Merge pull request #23399 from civicrm/5.50
5.50
Eileen McNaughton [Sat, 7 May 2022 02:36:50 +0000 (14:36 +1200)]
[Import] Reduce unused copy & paste
Unlike the CONFLICT return code the NO_MATCH code IS returned
- but ONLY in the contact import - in all the other imports
it is there by the virtue of copy & paste
Seamus Lee [Sat, 7 May 2022 01:19:49 +0000 (11:19 +1000)]
Merge pull request #23397 from totten/5.50-e2e-error
(E2E) `testErrorChrome` - Update assertions for page-chrome
Seamus Lee [Sat, 7 May 2022 01:12:33 +0000 (11:12 +1000)]
Merge pull request #23398 from totten/5.50-e2e-error-bd
(E2E) testErrorChrome - Skip Backdrop and D8+ (much like D7)
demeritcowboy [Sat, 7 May 2022 00:29:58 +0000 (20:29 -0400)]
Merge pull request #23393 from eileenmcnaughton/import_reg
dev/core#3447 Fix for master-only-regression
demeritcowboy [Sat, 7 May 2022 00:25:39 +0000 (20:25 -0400)]
Merge pull request #23394 from eileenmcnaughton/import_550
Import 550
Tim Otten [Fri, 6 May 2022 23:56:24 +0000 (16:56 -0700)]
Merge pull request #23396 from totten/5.50-upgrade-esc
5.50.alpha1.mysql.tpl - Escape `grouping` (reserved word in MySQL 8.0)
Tim Otten [Fri, 6 May 2022 23:35:11 +0000 (16:35 -0700)]
(E2E) testErrorChrome - Revise page-chrome check for all Drupal-style UFs
Tim Otten [Fri, 6 May 2022 22:48:43 +0000 (15:48 -0700)]
(E2E) testErrorChrome - Skip Backdrop and D8+ (much like D7)
This test was added during 5.50.alpha (#23257, #22805). It's purpose is to
assert that the page-chrome/site-wide-template is present on certain
error-messages; however, the underlying behavior was only implemented on
WordPress. It has not yet been implemented on other CMS.
Before
------
* __WordPress__: Runs testErrorChrome. Expected to pass.
* __Drupal 7__: Skip testErrorChrome (mostly) because it is expected to fail.
* __Drupal 8+, Backdrop__: Runs testErrorChrome. Fails.
After
-----
* __WordPress__: Runs testErrorChrome. Expected to pass.
* ___Drupal 7, Drupal 8+, Backdrop__: Skip testErrorChrome (mostly) because it is expected to fail.
Comment
-------
It still runs `testErrorChrome` for `permission` errors; per MM discussion, it appears that this does actually work, but we need
to tune assertion for BD+D8.
Tim Otten [Fri, 6 May 2022 22:35:04 +0000 (15:35 -0700)]
(E2E) `testErrorChrome` - Update to work with current wp-demo build
This test was added during 5.50.alpha (#23257, #22805). It's purpose is to
assert that the page-chrome/site-wide-template is present. It appears that
the markup from WordPress has changed slightly. (It may be that I
originally tested against an older version of WP.) In any event, this
relaxes the test so that it also passes on a newer WP build.
Tim Otten [Fri, 6 May 2022 22:20:35 +0000 (15:20 -0700)]
5.50.alpha1.mysql.tpl - Escape `grouping` (reserved word in MySQL 8.0.1+)
Eileen McNaughton [Fri, 6 May 2022 21:48:10 +0000 (09:48 +1200)]
Import - also export invalid as export error
I found that rows that fail validation are marked 'invalid'
rather than error & won't show on the preview screen.
I guess I could check for invalid vs error separately
- gets kinda weird though - if you leave them
in the file you are importing surely they are still errors
to see on the summary screen even though
you knew they were invalid on the Preview?
Eileen McNaughton [Fri, 6 May 2022 22:02:52 +0000 (10:02 +1200)]
[Ref][Import] Remove now-unused code
This is the first round of follow up cleanup from #23384
These properties are no longer being used
so don't need to be passed in or wrangled
Eileen McNaughton [Fri, 6 May 2022 21:44:40 +0000 (09:44 +1200)]
dev/core#3447 Fix for master-only-regression
demeritcowboy [Fri, 6 May 2022 18:13:56 +0000 (14:13 -0400)]
Merge pull request #23386 from eileenmcnaughton/import_no_var
[REF] [Import] Stop passing unused parameters
colemanw [Fri, 6 May 2022 17:26:51 +0000 (13:26 -0400)]
Merge pull request #23391 from civicrm/5.50
5.50
demeritcowboy [Fri, 6 May 2022 17:21:05 +0000 (13:21 -0400)]
Merge pull request #23389 from colemanw/getFieldsContactTypeFix
APIv4 - Fix fatal error on getFields when passing in contact id
Coleman Watts [Fri, 6 May 2022 15:37:30 +0000 (11:37 -0400)]
APIv4 - Fix fatal error on getFields when passing in contact id
Monish Deb [Fri, 6 May 2022 11:30:44 +0000 (17:00 +0530)]
Merge pull request #23384 from eileenmcnaughton/import_active
[Import] [Ref] Iterate through the mapping of fields
Eileen McNaughton [Fri, 6 May 2022 09:14:11 +0000 (21:14 +1200)]
Merge pull request #23388 from civicrm/5.50
5.50
Seamus Lee [Fri, 6 May 2022 07:11:42 +0000 (17:11 +1000)]
Merge pull request #23387 from totten/5.50-cacert
Update expired root certs (5.50)
demeritcowboy [Thu, 5 May 2022 12:30:52 +0000 (08:30 -0400)]
update expired root certs
CiviCRM [Fri, 6 May 2022 05:39:12 +0000 (05:39 +0000)]
Set version to 5.51.alpha1
CiviCRM [Fri, 6 May 2022 05:37:59 +0000 (05:37 +0000)]
Set version to 5.50.beta1
Eileen McNaughton [Fri, 6 May 2022 04:34:45 +0000 (16:34 +1200)]
[REF] [Import] Stop passing unused param
Eileen McNaughton [Thu, 5 May 2022 22:24:33 +0000 (10:24 +1200)]
[Import] [Ref] Iterate through the mapping of fields rather than a 'count'
The mapper holds an array of mappings for each of the active fields.
The active field count holds a count of this array - switching to
a foreach loop means we can stop calculating extra stuff.
This PR doesn't start ripping that out - for legibility reasons - but it
will take out a whole lotta code....
Coleman Watts [Fri, 6 May 2022 00:29:52 +0000 (20:29 -0400)]
SearchKit - Default to search for individuals
Seamus Lee [Thu, 5 May 2022 23:22:37 +0000 (09:22 +1000)]
Merge pull request #23343 from eileenmcnaughton/import_parser_job
[REF] [Import] Stop passing submittedValues as parameters
Seamus Lee [Thu, 5 May 2022 23:06:28 +0000 (09:06 +1000)]
Merge pull request #23380 from eileenmcnaughton/import_conflict
[REF] [Import] Remove another good intention - import 'conflicts'
Seamus Lee [Thu, 5 May 2022 23:06:15 +0000 (09:06 +1000)]
Merge pull request #23381 from colemanw/searchKitDateFields
SearchKit - Add date pseudo-fields
Seamus Lee [Thu, 5 May 2022 22:27:52 +0000 (08:27 +1000)]
Merge pull request #23371 from eileenmcnaughton/import_valid
[REF] [Import] extract validation functionality
Eileen McNaughton [Thu, 5 May 2022 19:59:07 +0000 (07:59 +1200)]
[REF] [Import] Remove another good intention - conflict
There is all sorts of handling for 'conflict' - but a conflict return code is never
generated
Eileen McNaughton [Tue, 3 May 2022 02:31:35 +0000 (14:31 +1200)]
[REF] [Import] Stop passing submittedValues as parameters
These parameters are all availabe via
Eileen McNaughton [Thu, 5 May 2022 04:18:38 +0000 (16:18 +1200)]
Extract validateValues
Eileen McNaughton [Thu, 5 May 2022 19:42:50 +0000 (07:42 +1200)]
Merge pull request #23378 from colemanw/searchKitNow
APIv4 - Add NOW() date function
Eileen McNaughton [Thu, 5 May 2022 19:41:58 +0000 (07:41 +1200)]
Merge pull request #23379 from samuelsov/tsOnOff
Translation - distinguish between 'On' for date and 'On'/'Off'
Coleman Watts [Thu, 5 May 2022 18:28:02 +0000 (14:28 -0400)]
SearchKit - Add date pseudo-fields
Matthew Wire [Thu, 5 May 2022 18:04:52 +0000 (19:04 +0100)]
Merge pull request #21993 from mattwire/aclcachequery2
ACLCache: Efficiency. Fix duplicate inserts
Samuel Vanhove [Thu, 5 May 2022 17:07:24 +0000 (13:07 -0400)]
Translation - distinguish between 'On' for date and 'On'/'Off'
colemanw [Thu, 5 May 2022 15:31:37 +0000 (11:31 -0400)]
Merge pull request #23369 from eileenmcnaughton/import_var
[REF] [Import] Trivial - simplify variables
Coleman Watts [Thu, 5 May 2022 14:42:20 +0000 (10:42 -0400)]
APIv4 - Add NOW() date function
Adds a function for NOW which returns the full date+time, and distinguishes
it from CURDATE which just returns the date part.
colemanw [Thu, 5 May 2022 14:48:34 +0000 (10:48 -0400)]
Merge pull request #23377 from colemanw/month
APIv4 - Add MONTH sql function
demeritcowboy [Thu, 5 May 2022 13:59:18 +0000 (09:59 -0400)]
Merge pull request #23375 from eileenmcnaughton/ref
[Ref] Get rid of private deprecated legacy function
Monish Deb [Thu, 5 May 2022 13:55:37 +0000 (19:25 +0530)]
Merge pull request #23282 from eileenmcnaughton/import_default_location_type
[REF] Do not treat site having a default location type as optional
Monish Deb [Thu, 5 May 2022 13:52:08 +0000 (19:22 +0530)]
Merge pull request #23292 from eileenmcnaughton/import_output_table
[Import] Output errors, duplicates csvs directly from the user job table
Coleman Watts [Thu, 5 May 2022 13:09:27 +0000 (09:09 -0400)]
APIv4 - Add MONTH sql function
Eileen McNaughton [Thu, 5 May 2022 11:12:58 +0000 (23:12 +1200)]
[Ref] Get rid of private deprecated legacy function
It now doesn't have enough code to justify it's own function
colemanw [Thu, 5 May 2022 11:02:48 +0000 (07:02 -0400)]
Merge pull request #23368 from eileenmcnaughton/ref
[REF] Minor code simplifcation - reduce silly lines
Eileen McNaughton [Wed, 4 May 2022 20:30:42 +0000 (08:30 +1200)]
Remove conflict download from preview
I can't see where these would arise - but definitely
not on the preview screen - which only runs basic validation
Eileen McNaughton [Sun, 24 Apr 2022 02:41:05 +0000 (14:41 +1200)]
Add output form for csv-on-the-fly
Eileen McNaughton [Thu, 21 Apr 2022 15:31:40 +0000 (03:31 +1200)]
Make tablename a property of the datasource
The datasource stores the table name on the job - we don't need to pass it around.
Also - stop cleaning up the temp table at the end - we want it to
output results but will add a cleanup routine later
Eileen McNaughton [Thu, 21 Apr 2022 04:12:07 +0000 (16:12 +1200)]
Move adding status fields on import table to datasource
Eileen McNaughton [Thu, 21 Apr 2022 03:48:56 +0000 (15:48 +1200)]
Cleanup cleanup on old tables for form re-submission
Eileen McNaughton [Thu, 5 May 2022 06:08:07 +0000 (18:08 +1200)]
[REF] [Import] Remove always NULL parameter from private function
Eileen McNaughton [Thu, 5 May 2022 09:26:36 +0000 (21:26 +1200)]
Merge pull request #23374 from eileenmcnaughton/549_up
549 to master
Tim Otten [Thu, 5 May 2022 09:16:59 +0000 (02:16 -0700)]
Merge pull request #23356 from eileenmcnaughton/pp
Ensure comma not formatted into amount
Eileen McNaughton [Thu, 5 May 2022 07:22:10 +0000 (19:22 +1200)]
Merge pull request #23366 from eileenmcnaughton/import_tpl
[REF] [Import] Remove unused tpl assign showColNames
Eileen McNaughton [Wed, 4 May 2022 07:14:19 +0000 (19:14 +1200)]
Ensure comma not formatted into amount
Probably the function doesn't add anything as params['amount']
should be correctly formatted - however,
it shouldn't add a comma - per
https://github.com/eileenmcnaughton/nz.co.fuzion.omnipaymultiprocessor/issues/227
Seamus Lee [Thu, 5 May 2022 06:00:27 +0000 (16:00 +1000)]
Merge pull request #23370 from eileenmcnaughton/import_catch
[Import] [Ref] [Minor] Simplify error handling with a try-catch block
Eileen McNaughton [Thu, 5 May 2022 03:01:52 +0000 (15:01 +1200)]
[REF] [Import] Trivial - simplify variables
Eileen McNaughton [Thu, 5 May 2022 03:55:52 +0000 (15:55 +1200)]
Simplify error handling with a try-catch block
Eileen McNaughton [Thu, 5 May 2022 03:04:55 +0000 (15:04 +1200)]
Merge pull request #23367 from eileenmcnaughton/import_prop
[Ref][Import] Remove another good intention - random email counting
Eileen McNaughton [Thu, 5 May 2022 02:52:40 +0000 (14:52 +1200)]
Merge pull request #23363 from eileenmcnaughton/import_var
[REF] [Import] Trivial - simplify variables
Eileen McNaughton [Thu, 5 May 2022 02:31:47 +0000 (14:31 +1200)]
Merge pull request #23336 from colemanw/customGroupExtends
CustomFields - Improve metadata about which custom groups belong to which entities
Eileen McNaughton [Thu, 5 May 2022 01:12:05 +0000 (13:12 +1200)]
[REF] Minor code simplifcation - reduce silly lines
Eileen McNaughton [Thu, 5 May 2022 01:06:15 +0000 (13:06 +1200)]
Merge pull request #23364 from eileenmcnaughton/rel
Minor function simplification in private function