Commit Graph

10593 Commits

Author SHA1 Message Date
0068a26b58 Merge pull request 'Fix added for loading device groups' (#228) from prathabanKavin/device-mgt-core:sqldevicegroupfix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/228
2023-09-20 05:55:38 +00:00
f4c0e5f929 Merge pull request 'Fix dbscripts causing errors on startup with MSSQL' (#225) from prathabanKavin/device-mgt-core:mssqldbscriptfix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/225
2023-09-20 05:28:36 +00:00
Charitha Goonetilleke
664dfd21c9 Warn about orphan scopes 2023-09-18 00:50:40 +00:00
fccae9b8c0 Add Devices filtering by a Custom Property feature to API and dao layer (#208)
## Purpose
* Related ticket https://roadmap.entgra.net/issues/10262

## Description

This modifed API accept any custom property key value pair as a encoded JSON String for filtering devices

/devicescustomProperty=%7B%22FIRMWARE_APP_VERSION%22%3A%22122%22%2C%22FIRMWARE_VERSION%22%3A%22123%22%7D

## Add Custom property to mdm-ui-config.xml

```
<DeviceInfoConfigurations>
	<DeviceInfoItem>
            <DefinedValue>FIRMWARE_VERSION</DefinedValue>
            <DisplayValue>label_firmware_version</DisplayValue>
            <Type>deviceDetailsMap</Type>
        </DeviceInfoItem>
        <DeviceInfoItem>
            <DefinedValue>FIRMWARE_APP_VERSION</DefinedValue>
            <DisplayValue>label_app_version</DisplayValue>
            <Type>deviceDetailsMap</Type>
        </DeviceInfoItem>
        <DeviceInfoItem>
            <DefinedValue>FIRMWARE_SYSTEM_VERSION</DefinedValue>
            <DisplayValue>label_firmware_system_version</DisplayValue>
            <Type>deviceDetailsMap</Type>
        </DeviceInfoItem>
</DeviceInfoConfigurations>
```

DefinedValue = Key_value in DM_DEVECE_INFO table
DisplayValue = UI display text for filtering
Type = Dont change

Co-authored-by: pramilaniroshan <pramila@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/208
Co-authored-by: Pramila Niroshan <pramila@entgra.io>
Co-committed-by: Pramila Niroshan <pramila@entgra.io>
2023-09-15 04:02:34 +00:00
osh
8bc0fa37de Add cost calculation for carbon super 2023-09-14 14:35:18 +05:30
osh
5371c5268b Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into billing-delete-9713 2023-09-13 14:50:32 +05:30
osh
6fd84dcbef Comment out cost related code 2023-09-13 14:50:23 +05:30
prathabanKavin
4fc6eb2aa4 Fix error showing on startup in task-mgt 2023-09-13 08:15:36 +05:30
prathabanKavin
661feadcd5 Fix added for loading device groups 2023-09-12 22:09:31 +05:30
Charitha Goonetilleke
ea6744288a Merge pull request 'Modify View Activities endpoint' (#227) from Sasini_Sandamali/device-mgt-core-forked:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/227
2023-09-12 11:28:51 +00:00
Sasini_Sandamali
4a6e0ce727 Update get Activities to increase the performance 2023-09-12 16:14:54 +05:30
Sasini_Sandamali
26a049473c Modify View Activities endpoint by including operation id 2023-09-12 16:02:31 +05:30
Charitha Goonetilleke
9011273ff4 Apply role permission mapping along with scope role mapping 2023-09-12 11:55:29 +05:30
osh
0abf955fe0 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into billing-delete-9713 2023-09-12 08:32:09 +05:30
osh
5d06485a25 Add device deletion scenario for billing 2023-09-12 08:31:47 +05:30
prathabanKavin
42ef84e8a3 Fix table DM_TRACCAR_UNSYNCED_DEVICES 2023-09-11 08:51:04 +05:30
prathabanKavin
94b0278471 Fix dbscripts causing errors on startup 2023-09-11 08:47:10 +05:30
Amalka Subasinghe
64cb1be253 Merge pull request 'Fix API publisher to update scopes including already existing roles' (#224) from pasindu/device-mgt-core:Bug10322 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/224
2023-09-08 09:19:05 +00:00
pasindu
ef47f0c20a Update scopes including already existing roles 2023-09-08 11:36:05 +05:30
ThilinaPremachandra
44c7d324de Fix: delete group with GeoFence references issue 2023-09-07 11:29:10 +05:30
0fbe062e49 Fix the SSL error when invoking internal API via HttpClient (#215)
Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/215
2023-09-05 07:58:13 +00:00
Inosh Perara
320d012f5a Merge pull request 'Fix the API to check if a device is enrolled' (#222) from arshana790/device-mgt-core-fork:status into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/222
2023-09-05 07:09:01 +00:00
Arshana
d20c95a55c Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into status 2023-09-05 11:03:41 +05:30
Arshana
9c7fd9027e Fix the API to check if a device is enrolled 2023-09-05 11:02:57 +05:30
Charitha Goonetilleke
b761bdd5ea Merge pull request 'URL permission issue fixes (Removed * from root URLs)' (#221) from thameera/device-mgt-core:permission_issue into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/221
2023-09-04 07:29:24 +00:00
Thameera
680f57ade5 URL permission issue fixes (Removed * from root URLs) 2023-09-04 12:32:07 +05:30
Lasantha Dharmakeerthi
693e3a51d5 Remove custom properties from device table column selection 2023-09-01 06:15:37 +00:00
shamalka
203475f87d Remove custom properties from device table column selection 2023-09-01 11:41:33 +05:30
913f6175af Merge pull request 'Change location publishing logic' (#218) from shamalka1/device-mgt-core:location-fix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/218
2023-08-28 08:46:47 +00:00
shamalka
dc40351293 Change location publishing logic 2023-08-28 13:43:11 +05:30
builder
7c66f6b693 [maven-release-plugin] prepare for next development iteration 2023-08-28 10:11:49 +05:30
builder
b9f12e49ee [maven-release-plugin] prepare release v5.0.30 2023-08-28 10:11:44 +05:30
Inosh Perara
28b18941aa Merge pull request 'Add hierarchical group count API' (#214) from ThilinaPremachandra/device-mgt-core:Bug#10300 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/214
2023-08-28 04:11:43 +00:00
ThilinaPremachandra
7b1907cd90 resolve comments 2023-08-28 09:35:00 +05:30
Charitha Goonetilleke
6d3127a008 Merge pull request 'improvements to heart beat, push notification task and operation timeout task' (#217) from amalka.subasinghe/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/217
2023-08-28 03:58:40 +00:00
Charitha Goonetilleke
c144507b6c Merge branch 'master' into master 2023-08-28 03:21:55 +00:00
builder
7c0adfbc89 [maven-release-plugin] prepare for next development iteration 2023-08-24 21:17:36 +05:30
builder
f7c3e129c4 [maven-release-plugin] prepare release v5.0.29 2023-08-24 21:17:31 +05:30
amalka.subasinghe
d4c3af5d12 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core 2023-08-24 16:32:03 +05:30
amalka.subasinghe
9ecdd486f8 imrpoved heart beat to handle cluster formation changed 2023-08-24 16:31:42 +05:30
amalka.subasinghe
1d7700ab5c imrpoved heart beat to handle cluster formation changed 2023-08-24 16:31:17 +05:30
amalka.subasinghe
21606bc5cd operation timeout task updated to execute only in elected node 2023-08-24 16:30:24 +05:30
amalka.subasinghe
349fce4e63 improved push notofication task to get allocated operations when heart beat enabled 2023-08-24 16:29:22 +05:30
amalka.subasinghe
cf3d50edf9 added new method getAllocatedOperationMappingsByStatus 2023-08-24 16:28:28 +05:30
Lasantha Dharmakeerthi
a2b59c2a35 Add improvements to certificate component 2023-08-24 10:55:24 +00:00
navodzoysa
dbc73d18ed Add improvements to certificate component 2023-08-24 16:05:14 +05:30
nishan
017c70fa08 Fix Certificate test case and delete and search option 2023-08-24 13:28:35 +05:30
ThilinaPremachandra
7a7974eb36 Add: hierarchical group count API 2023-08-24 10:58:46 +05:30
7afe7fca08 Merge pull request 'Add app details for UNMANAGED_APP_UNINSTALL' (#210) from osh.silva/device-mgt-core:unmanaged-install-9211 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/210
2023-08-23 10:08:27 +00:00
d83b417a0b Merge branch 'master' into unmanaged-install-9211 2023-08-23 09:57:24 +00:00