motor-admin 0.1.61 → 0.1.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -1
  3. data/lib/motor/api_query/filter.rb +11 -1
  4. data/lib/motor/version.rb +1 -1
  5. data/ui/dist/{main-fd0f75f789196ce24ffd.css.gz → main-5d0776041b10faab44aa.css.gz} +0 -0
  6. data/ui/dist/main-5d0776041b10faab44aa.js.gz +0 -0
  7. data/ui/dist/manifest.json +5 -5
  8. metadata +4 -4
  9. data/ui/dist/main-fd0f75f789196ce24ffd.js.gz +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 32c8b159e2bc232debb27c4998d0a06b78d11cb4dee7d9080bb3557f183ca788
4
- data.tar.gz: ec29e2a202609d5690deccb9ca2bc1d5b46438c80add5e5e6553cd9fb37bd02d
3
+ metadata.gz: 70f6231a19facf02d98b6bfdb05cc17d9cd3a18f21f9b34b7e75a8284a36ed3c
4
+ data.tar.gz: d57084676e7c4baf5a4fb8c200a3717dcc75ac3e3081d086636193378cd8057d
5
5
  SHA512:
6
- metadata.gz: aeb234e7240f4ea926c9890f45d0bf24da8e7d811919d9584523fc9bd384403bac20c893316285cce76f217596131c78766a4092ff03f6bea5977334e70f30db
7
- data.tar.gz: 8c11a65a3e2c33bf05918e2544624498ae396fadf83e4a6ffb549f2dcf293d7217e9a740723bb4fb342c62acb6a8e8a13c11cb086e404e8341a72ae2f5a30616
6
+ metadata.gz: 314903b5ba271f7ab9238bc561669457d55e80ce2dce28657fb3216c855e7fe2f8c045ee18b268365421f9a444c00c04fbb130756b4cf0aac7a71a2971541d42
7
+ data.tar.gz: 6e6ca476fb22039faf3f10fb3a9a911edc5234fe7fadf0a864d1e4524fb5bb026d359f0d44708af8d1553f7b47d0073c5a77a21ae3c2a74b6d8d7633bfa9c51d
data/README.md CHANGED
@@ -57,7 +57,8 @@ Custom resource actions can be added via Active Record method call, API endpoint
57
57
 
58
58
  ![Custom form](https://user-images.githubusercontent.com/5418788/119264008-1391dd80-bbea-11eb-9f14-cb405e77fb60.png)
59
59
 
60
- Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{resource_id}/apply`
60
+ Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{resource_id}/apply`.<br>
61
+ [Learn more about custom forms builder](https://github.com/omohokcoj/motor-admin/blob/master/guides/building_custom_forms.md).
61
62
 
62
63
  ### SQL Queries
63
64
 
data/lib/motor/api_query/filter.rb CHANGED
@@ -4,6 +4,7 @@ module Motor
4
4
  module ApiQuery
5
5
  module Filter
6
6
  LIKE_FILTER_VALUE_REGEXP = /\A%?(.*?)%?\z/.freeze
7
+ DISTINCT_RESTRICTED_COLUMN_TYPES = %i[json point].freeze
7
8
 
8
9
  module_function
9
10
 
@@ -12,7 +13,10 @@ module Motor
12
13
 
13
14
  normalized_params = normalize_params(Array.wrap(params))
14
15
 
15
- rel.filter(normalized_params).distinct
16
+ rel = rel.filter(normalized_params)
17
+ rel = rel.distinct if can_apply_distinct?(rel)
18
+
19
+ rel
16
20
  end
17
21
 
18
22
  def normalize_params(params)
@@ -47,6 +51,12 @@ module Motor
47
51
  end
48
52
  end
49
53
 
54
+ def can_apply_distinct?(rel)
55
+ rel.columns.none? do |column|
56
+ DISTINCT_RESTRICTED_COLUMN_TYPES.include?(column.type)
57
+ end
58
+ end
59
+
50
60
  def normalize_action(action, value)
51
61
  case action
52
62
  when 'includes'
data/lib/motor/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Motor
4
- VERSION = '0.1.61'
4
+ VERSION = '0.1.66'
5
5
  end
data/ui/dist/manifest.json CHANGED
@@ -2068,11 +2068,11 @@
2068
2068
  "mail-opened.svg": "icons/mail-opened.svg",
2069
2069
  "mail.svg": "icons/mail.svg",
2070
2070
  "mailbox.svg": "icons/mailbox.svg",
2071
- "main-fd0f75f789196ce24ffd.css.gz": "main-fd0f75f789196ce24ffd.css.gz",
2072
- "main-fd0f75f789196ce24ffd.js.LICENSE.txt": "main-fd0f75f789196ce24ffd.js.LICENSE.txt",
2073
- "main-fd0f75f789196ce24ffd.js.gz": "main-fd0f75f789196ce24ffd.js.gz",
2074
- "main.css": "main-fd0f75f789196ce24ffd.css",
2075
- "main.js": "main-fd0f75f789196ce24ffd.js",
2071
+ "main-5d0776041b10faab44aa.css.gz": "main-5d0776041b10faab44aa.css.gz",
2072
+ "main-5d0776041b10faab44aa.js.LICENSE.txt": "main-5d0776041b10faab44aa.js.LICENSE.txt",
2073
+ "main-5d0776041b10faab44aa.js.gz": "main-5d0776041b10faab44aa.js.gz",
2074
+ "main.css": "main-5d0776041b10faab44aa.css",
2075
+ "main.js": "main-5d0776041b10faab44aa.js",
2076
2076
  "man.svg": "icons/man.svg",
2077
2077
  "manual-gearbox.svg": "icons/manual-gearbox.svg",
2078
2078
  "map-2.svg": "icons/map-2.svg",
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: motor-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.61
4
+ version: 0.1.66
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pete Matsyburka
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-21 00:00:00.000000000 Z
11
+ date: 2021-06-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord-filter
@@ -1491,8 +1491,8 @@ files:
1491
1491
  - ui/dist/icons/zoom-money.svg.gz
1492
1492
  - ui/dist/icons/zoom-out.svg.gz
1493
1493
  - ui/dist/icons/zoom-question.svg.gz
1494
- - ui/dist/main-fd0f75f789196ce24ffd.css.gz
1495
- - ui/dist/main-fd0f75f789196ce24ffd.js.gz
1494
+ - ui/dist/main-5d0776041b10faab44aa.css.gz
1495
+ - ui/dist/main-5d0776041b10faab44aa.js.gz
1496
1496
  - ui/dist/manifest.json
1497
1497
  homepage:
1498
1498
  licenses: