Seamus Lee [Tue, 17 May 2022 07:26:33 +0000 (17:26 +1000)]
Merge pull request #23446 from colemanw/searchKitDefaultAgg
SearchKit - Pick better default for aggregate functions
Seamus Lee [Tue, 17 May 2022 07:24:25 +0000 (17:24 +1000)]
Merge pull request #23472 from colemanw/exportMaxLentgh
APIv4 - Respect max length for name with export action
colemanw [Tue, 17 May 2022 02:56:45 +0000 (22:56 -0400)]
Merge pull request #23464 from eileenmcnaughton/import_on_dup
[REF] [Import] Minor simplification
Coleman Watts [Tue, 17 May 2022 02:30:33 +0000 (22:30 -0400)]
APIv4 - Respect max length for name with export action
Eileen McNaughton [Tue, 17 May 2022 01:15:40 +0000 (13:15 +1200)]
Merge pull request #23459 from darrick/dev/core#2300
dev/core#2300 Can not use Custom Fields defined on a contact_sub_type in dedupe…
Yashodha Chaku [Mon, 16 May 2022 18:17:21 +0000 (23:47 +0530)]
Merge pull request #23463 from eileenmcnaughton/import_proc
[REF] [Import] Remove unused variable
Eileen McNaughton [Mon, 16 May 2022 08:59:17 +0000 (20:59 +1200)]
Merge pull request #23466 from totten/master-timeout-guzzle
CRM_Utils_Check - Catch Guzzle exception, same as core exception
Yashodha Chaku [Mon, 16 May 2022 06:07:42 +0000 (11:37 +0530)]
Merge pull request #23457 from eileenmcnaughton/import_more_part
Consolidate datasource form - event import
Tim Otten [Mon, 16 May 2022 06:02:57 +0000 (23:02 -0700)]
CRM_Utils_Check - Catch Guzzle exception, same as core exception
Overview
--------
`checkExtensions()` is supposed to show status-messages which report on
any out-of-date extensions. This requires a list of available updates.
Alas, the Internet is a big and scary place, and sometimes the list is
unavailable. DNS servers, HTTP servers, timeouts, yadda yadda. If it can't
get the list of extensions, it should show a status-message about this
problem.
Before
------
Throws an exception, causing a full failure in the page-view that does
the status-check.
After
-----
Catches the exception. Reports a status-message about the failure.
Comments
--------
It appears that this was probably the behavior before (ie `checkExtension()`
already has a try/catch for this kind of problem). However, the underlying
HTTP request was changed a versions back (ie from `HttpClient` to `Guzzle`)
which means that errors can get reported in other ways.
To simulate errors, I did this:
1. Run buggy/placeholder TCP service (`nc -l 8199`)
2. Hack `CRM_Extension_Browser::__construct()` to set `$this->repoUrl` to `http://localhost:8199`
3. Run `cv api System.check`
Yashodha Chaku [Mon, 16 May 2022 05:55:22 +0000 (11:25 +0530)]
Merge pull request #23289 from eileenmcnaughton/import_summ
[REF] [Import] Activity - clean up copy & paste
demeritcowboy [Sun, 15 May 2022 13:04:37 +0000 (09:04 -0400)]
Merge pull request #23462 from eileenmcnaughton/import_ex
[Import] [Ref] Remove unused variable
demeritcowboy [Sun, 15 May 2022 13:01:36 +0000 (09:01 -0400)]
Merge pull request #23460 from darrick/dev/core#492
dev/core#492 Fix Dedupe rule creation should display labels of contact types, in c…
Eileen McNaughton [Sat, 14 May 2022 21:38:04 +0000 (09:38 +1200)]
[REF] [Import] Minor simplification
At this stage value already holds the phone_type_id, location_type_id, im_provider_id, website_type_id
if any, so we don't need to throw it away & start again.
Eileen McNaughton [Sat, 14 May 2022 21:17:00 +0000 (09:17 +1200)]
[REF] [Import] Remove unused variable
Eileen McNaughton [Sat, 14 May 2022 21:13:13 +0000 (09:13 +1200)]
[Import] [Ref] Remove unused variable
Tim Otten [Sat, 14 May 2022 09:37:11 +0000 (02:37 -0700)]
Merge pull request #23455 from eileenmcnaughton/import_validate_mum
Import validate related contacts in the same way as the main contact
Darrick Servis [Fri, 13 May 2022 23:29:03 +0000 (16:29 -0700)]
Fix Dedupe rule creation should display labels of contact types, in case they have been customised.
Darrick Servis [Fri, 13 May 2022 22:13:29 +0000 (15:13 -0700)]
Fix Can not use Custom Fields defined on a contact_sub_type in dedupe rule
Eileen McNaughton [Fri, 13 May 2022 20:41:52 +0000 (08:41 +1200)]
Consolidate datasource form - event import
demeritcowboy [Fri, 13 May 2022 16:49:49 +0000 (12:49 -0400)]
Merge pull request #23420 from mattwire/custombasepage
Allow for custom base page in AJAX requests
Matthew Wire [Tue, 10 May 2022 15:41:20 +0000 (16:41 +0100)]
Use a more unique placeholder url path for CiviCRM AJAX requests
colemanw [Fri, 13 May 2022 13:06:23 +0000 (09:06 -0400)]
Merge pull request #23444 from eileenmcnaughton/import_get
[REF] [Import] Minor code cleanup
colemanw [Fri, 13 May 2022 13:04:49 +0000 (09:04 -0400)]
Merge pull request #23453 from eileenmcnaughton/import_no_map_field
Remove sets for no-longer gotten vars
Eileen McNaughton [Fri, 13 May 2022 03:15:41 +0000 (15:15 +1200)]
[Import] Apply the same contact validation to related contacts as the main contact
Eileen McNaughton [Tue, 10 May 2022 21:53:29 +0000 (09:53 +1200)]
[Import][REf] Cleanup required field checking
Eileen McNaughton [Fri, 13 May 2022 01:52:53 +0000 (13:52 +1200)]
Remove sets for no-longer gotten vars
Seamus Lee [Thu, 12 May 2022 22:54:46 +0000 (08:54 +1000)]
Merge pull request #23450 from totten/master-karma-comps
(NFC) karma - Enable all Civi components (not just CiviCase)
Seamus Lee [Thu, 12 May 2022 22:54:12 +0000 (08:54 +1000)]
Merge pull request #23448 from totten/master-typo
(NFC) CRM_Utils_Hook - Typo
Eileen McNaughton [Thu, 12 May 2022 22:15:17 +0000 (10:15 +1200)]
Merge pull request #23442 from eileenmcnaughton/import_data
[REF] [Import] Parser cleanup
Tim Otten [Thu, 12 May 2022 20:53:46 +0000 (13:53 -0700)]
(NFC) karma - Enable all Civi components (not just CiviCase)
This is a small cleanup (suggested by @colemanw) that makes the `karma.conf.js` appear more general.
It modifies the startup process for a test-runner; as long as the test-runner still gives the
same output, it should be safe.
Before
------
`karma` loads baseline Angular modules and CiviCase Angular modules.
After
-----
`karma` loads baseline Angular modules and any/all component-based Angular modules
Comment
-------
Why was it only CiviCase? Not certain... but I *think* it's because
(historically) `crmMailing.ang.php` did extra work to build `settings`, and
this extra work was a bit too heavy. That work has moved (`settings` became
`settingsFactory`) and maybe makes this safer.
Tim Otten [Thu, 12 May 2022 20:23:52 +0000 (13:23 -0700)]
(NFC) CRM_Utils_Hook - Typo
Tim Otten [Thu, 12 May 2022 20:38:48 +0000 (13:38 -0700)]
karma - Allow execution with debug_mode=1. Hide jsonFormatter.
Before
------
If you enable `debug_mode=1` and run `karma`, it produces a large number of failures:
```
PhantomJS 2.1.1 (Mac OS 0.0.0): Executed 81 of 81 (55 FAILED) (2.686 secs / 2.387 secs)
```
After
-----
If you enable `debug_mode=1` and run `karma`, it passes:
```
PhantomJS 2.1.1 (Mac OS 0.0.0): Executed 81 of 81 SUCCESS (7.232 secs / 6.95 secs)
```
Comments
--------
The `jsonFormatter` plugin is a DX nicety; when browsing a page with `?angularDebug=1` and with `debug_mode=1`, it will load extra
files so that `<crm-ui-debug>` panels look pretty. But ordinarily, loading these files is extraneous.
Eileen McNaughton [Thu, 21 Apr 2022 22:11:41 +0000 (10:11 +1200)]
[REF] [Import] Remove last instance of passing fieldTypes through get->set
Monish Deb [Thu, 12 May 2022 18:51:40 +0000 (00:21 +0530)]
Merge pull request #23332 from darrick/dupeQuery
(REF) CRM_Dedupe_BAO_DedupeRule - Support third party fields and tables in rules
Coleman Watts [Thu, 12 May 2022 16:19:40 +0000 (12:19 -0400)]
SearchKit - Pick better default for aggregate functions
Improves the metadata for SQL functions as well.
Eileen McNaughton [Thu, 12 May 2022 04:21:06 +0000 (16:21 +1200)]
Merge pull request #23441 from colemanw/api4TestCleanup
[TEST ONLY] APIv4 - ensure test records are cleaned up in non-transaction tests
Eileen McNaughton [Thu, 12 May 2022 03:19:13 +0000 (15:19 +1200)]
Merge pull request #23443 from civicrm/5.50
5.50
Coleman Watts [Wed, 11 May 2022 23:39:17 +0000 (19:39 -0400)]
APIv4 Unit test fixes - ensure test records are cleaned up in non-transaction tests
Use the new `createTestRecord` and `saveTestRecords` in non-transaction test classes
so the created records are automatically cleaned-up.
Eileen McNaughton [Thu, 12 May 2022 01:08:57 +0000 (13:08 +1200)]
Merge pull request #23436 from colemanw/searchKitPagerDefaults
SearchKit - Default to simple pager when creating new table display
Eileen McNaughton [Thu, 12 May 2022 01:08:00 +0000 (13:08 +1200)]
Merge pull request #23434 from colemanw/groupByFn
SearchKit - Allow functions in the GROUP BY clause
Eileen McNaughton [Thu, 12 May 2022 00:37:37 +0000 (12:37 +1200)]
Use submittedValues for usps
Eileen McNaughton [Thu, 12 May 2022 00:12:29 +0000 (12:12 +1200)]
[REF] [Import] Minor code cleanup
This chunk of code effectively constructs an array 'value' which holds the location
fields from the mapping. If the array is not empty then
use it as an array, otherwise use just the value
colemanw [Wed, 11 May 2022 23:58:50 +0000 (19:58 -0400)]
Merge pull request #23440 from totten/5.50-since-when
(NFC) mixin/mgd-php@1 - Twiddle `@since`
colemanw [Wed, 11 May 2022 23:58:17 +0000 (19:58 -0400)]
Merge pull request #23427 from eileenmcnaughton/get_mapped_params
[REF] [Import] Simplify if - exit loop early
Eileen McNaughton [Wed, 11 May 2022 04:58:36 +0000 (16:58 +1200)]
[REF] [Import] Move datasource interaction to datasource class
Eileen McNaughton [Wed, 11 May 2022 23:15:35 +0000 (11:15 +1200)]
Merge pull request #23439 from colemanw/dashboardUpdate
Dashboard - Efficiency tweak
Tim Otten [Wed, 11 May 2022 22:00:11 +0000 (15:00 -0700)]
(NFC) mixin/mgd-php@1 - Twiddle `@since`
Overview
--------
Switch `@since` from "modified" version to "introduced" version.
Comment
-------
The [spec for `@since`](https://docs.phpdoc.org/guide/references/phpdoc/tags/since.html)
is more open ("when an element was introduced _or_ modified"), but this matches similar
usages in the same repo.
Tim Otten [Wed, 11 May 2022 21:42:49 +0000 (14:42 -0700)]
Merge pull request #23409 from demeritcowboy/psrlog
dev/drupal#176 - Allow wider range of psr-log versions to be installed
Eileen McNaughton [Wed, 11 May 2022 21:42:24 +0000 (09:42 +1200)]
Merge pull request #23437 from colemanw/noTransform
SearchKit - Don't transform case for fieldsets on admin screen (more translation-friendly)
Eileen McNaughton [Wed, 11 May 2022 21:20:54 +0000 (09:20 +1200)]
Merge pull request #23438 from colemanw/sortInactiveDashlets
Dashboard - Sort available dashlets alphabetically, add search box
Eileen McNaughton [Wed, 11 May 2022 20:05:41 +0000 (08:05 +1200)]
Merge pull request #23435 from mlutfy/removeOldL10nDir
Translation: remove support for CiviCRM pre-4.5 l10n file locations
Coleman Watts [Wed, 11 May 2022 20:00:34 +0000 (16:00 -0400)]
Dashboard - Efficiency tweak
Use static binding for non-changing values
Coleman Watts [Wed, 11 May 2022 18:39:22 +0000 (14:39 -0400)]
Dashboard - Sort inactive dashlets by label, add search box.
This makes dashlets easier to find if there is a large number.
Coleman Watts [Wed, 11 May 2022 16:21:18 +0000 (12:21 -0400)]
SearchKit - Don't transform case for fieldsets on admin screen (more translation-friendly)
colemanw [Wed, 11 May 2022 15:33:46 +0000 (11:33 -0400)]
Merge pull request #23432 from colemanw/api4TestCleanup
[REF] APIv4 - Simplify entity creation in test suite
Coleman Watts [Wed, 11 May 2022 15:00:23 +0000 (11:00 -0400)]
SearchKit - Default to simple pager when creating new table display
Before: Pager default included "row count" and "adjustible page size".
After: Defaults to simple pager without the extras.
The extra stuff isn't always useful and can break the layout on small screens or dashlets,
so I think a better default is to exclude rather than include them.
Mathieu Lutfy [Wed, 11 May 2022 14:53:34 +0000 (10:53 -0400)]
Translation: remove support for CiviCRM pre-4.5 l10n file locations
Coleman Watts [Wed, 11 May 2022 14:30:36 +0000 (10:30 -0400)]
SearchKit - Allow functions in the GROUP BY clause
Fixes dev/core#2485
demeritcowboy [Wed, 11 May 2022 14:12:34 +0000 (10:12 -0400)]
Merge pull request #23433 from colemanw/dashletHover
Dashboard - Show full title when hovering an inactive dashlet
Coleman Watts [Wed, 11 May 2022 11:19:29 +0000 (07:19 -0400)]
APIv4 - Simplify entity creation in test suite
Removes the old v3 creation and hardcoded sample data in favor of
new `createTestRecord` and `saveTestRecords` methods which automatically
handle cleanup during tearDown.
Coleman Watts [Wed, 11 May 2022 11:55:53 +0000 (07:55 -0400)]
Dashboard - Show full title when hovering an inactive dashlet
Eileen McNaughton [Wed, 11 May 2022 02:02:37 +0000 (14:02 +1200)]
[REF] [Import] Parser cleanup - remove now unused
Eileen McNaughton [Wed, 11 May 2022 02:48:23 +0000 (14:48 +1200)]
Merge pull request #23428 from eileenmcnaughton/import_field_keys
[REF] [Import] Remove unused field get action (death to copy & paste)
demeritcowboy [Wed, 11 May 2022 02:47:28 +0000 (22:47 -0400)]
Merge pull request #23421 from eileenmcnaughton/import_obs
[Import] Stop passing unused parameter
Eileen McNaughton [Wed, 11 May 2022 01:23:38 +0000 (13:23 +1200)]
Merge pull request #23425 from eileenmcnaughton/import_member
[Ref] [Import][Member] Remove unused params
Eileen McNaughton [Wed, 11 May 2022 01:06:32 +0000 (13:06 +1200)]
[REF] [Import] Remove unused field get action
Eileen McNaughton [Wed, 11 May 2022 00:34:05 +0000 (12:34 +1200)]
[REF] [Import] Simplify if - exit loop early
Eileen McNaughton [Tue, 10 May 2022 23:44:41 +0000 (11:44 +1200)]
Merge pull request #23426 from civicrm/5.50
5.50 to master
Eileen McNaughton [Tue, 10 May 2022 23:44:04 +0000 (11:44 +1200)]
Merge pull request #23423 from totten/5.50-mixin-since
(NFC) mixin/**.php - Add @since tags
Eileen McNaughton [Tue, 10 May 2022 23:38:51 +0000 (11:38 +1200)]
[Ref] [Import][Member] Remove unused params
colemanw [Tue, 10 May 2022 23:10:02 +0000 (19:10 -0400)]
Merge pull request #23422 from totten/5.50-mgd-ver
ManagedEntities - Update version number for mgd-php
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
Tim Otten [Tue, 10 May 2022 21:50:56 +0000 (14:50 -0700)]
tools/mixin/bin/mixer - Display the `@since` data
Tim Otten [Tue, 10 May 2022 21:36:46 +0000 (14:36 -0700)]
(NFC) mixin - Add `@since` tags
Tim Otten [Tue, 10 May 2022 21:26:06 +0000 (14:26 -0700)]
ManagedEntities - Update version number for mgd-php
This is a follow-up/correction for #22959 (circa 5.50.alpha1; specifically
fdc67a75b2f20aea9f0961683bd8a59c78755d5f). The prior revision had updated the
behavior of `mgd-php`, so it should have also updated the version-number.
Eileen McNaughton [Tue, 10 May 2022 19:30:16 +0000 (07:30 +1200)]
Stop passing unused parameter
Matthew Wire [Tue, 10 May 2022 15:39:29 +0000 (16:39 +0100)]
Allow AJAX paths to work properly with a custom basepage (as can be used on WordPress frontend)
demeritcowboy [Mon, 9 May 2022 12:39:44 +0000 (08:39 -0400)]
allow more log
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