Commit Graph

8154 Commits

Author SHA1 Message Date
pasindu
26a2950f85 Fix webapp publisher issues 2023-10-23 18:06:41 +05:30
pasindu
383eed95e8 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into sync-master 2023-10-23 12:45:44 +05:30
pasindu
a46ab4c355 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420 2023-10-20 00:43:12 +05:30
Rajitha Kumara
a7387fda31 Add missed role key 2023-10-19 23:36:57 +05:30
Rajitha Kumara
30f7a32c55 Fix unmodifiable list referencing issue 2023-10-19 23:32:30 +05:30
pasindu
518bc7271a Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420 2023-10-19 14:34:14 +05:30
Lasantha Dharmakeerthi
8385c0c836 Fixes in API publishing flow 2023-10-18 08:56:17 +00:00
Sasini_Sandamali
3631acfe45 Add new get device activities API 2023-10-18 12:51:14 +05:30
Charitha Goonetilleke
31889b4a05 Merge branch 'master' into master 2023-10-18 04:43:04 +00:00
tcdlpds
8fa8cca776 Remove jaggery modules 2023-10-18 08:26:09 +05:30
pasindu
1325780e3b Map JsonObject to dto classes in publisher API documentation 2023-10-17 12:25:28 +05:30
pasindu
fa37fa33cc Map JsonObject to dto classes in publisher API revesion 2023-10-17 12:25:28 +05:30
pasindu
bdf1e97d84 Map Json object return types to dto classes in Publisher 2023-10-17 12:25:28 +05:30
pasindu
565a7614ad Change JSON object return methods:Scopes 2023-10-17 12:25:28 +05:30
pasindu
1eda7bd237 Fixes in API publishing flow 2023-10-17 12:25:28 +05:30
9767f7e90f Add validation for user deletion (#244)
## Purpose
* Fixes https://roadmap.entgra.net/issues/10337

## Description
* Add validation to check whether the user has enrolled devices

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/244
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-10-17 04:20:12 +00:00
Charitha Goonetilleke
e3e9ad851c Merge branch 'master' into master 2023-10-16 05:54:10 +00:00
Inosh Perara
15de6d397e Merge pull request 'Add permission updating logic' (#254) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/254
2023-10-16 05:39:04 +00:00
Oshani Silva
c3cc4fe6d4 Add fix for search operation (#251)
fixes https://roadmap.entgra.net/issues/10279

Co-authored-by: osh <osh.silva@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/251
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-10-16 05:21:44 +00:00
tcdlpds
1b0ad156b2 Add Java Doc comments 2023-10-16 10:36:51 +05:30
8696ec9343 Merge pull request 'Modify get Geofence API to get total count' (#243) from pramilaniroshan/device-mgt-core:add-geofence-count into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/243
2023-10-16 04:27:46 +00:00
akeela_azhar
22b9897a4b Add permission updating logic 2023-10-16 08:00:42 +05:30
Rajitha Kumara
3a63f948a0 Add admin role when adding shared scopes 2023-10-15 14:25:37 +05:30
98954c9374 Merge pull request 'Add default perm config' (#252) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/252
2023-10-13 05:47:00 +00:00
tcdlpds
49747efa18 Add default perm config 2023-10-13 09:39:44 +05:30
Viranga Gunarathna
d63f2a3f24 mapping permissions with scopes 2023-10-12 15:25:20 +05:30
amalka.subasinghe
54cdab5085 Improvements to the device sub type impl 2023-10-12 11:54:23 +05:30
Inosh Perara
db80546a5a Merge pull request 'Fix scope attaching issue' (#247) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/247
2023-10-11 10:16:06 +00:00
tcdlpds
58670028c0 Fix scope attaching issue 2023-10-11 06:54:46 +05:30
8813619929 Merge pull request 'Add scope perm mapping logic' (#235) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/235
2023-10-08 15:35:35 +00:00
tcdlpds
563077fbfb Add scope perm mapping logic 2023-10-08 19:36:52 +05:30
616c70face Merge pull request 'Fix delete groups with Geo Fence references issue' (#223) from ThilinaPremachandra/device-mgt-core:Bug#10236#issue36 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/223
2023-10-06 09:53:30 +00:00
51f1bf1280 Merge pull request 'Fix analytics publishing for Windows devices' (#240) from navodzoysa/device-mgt-core:fix-windows-analytics into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/240
2023-10-06 09:24:23 +00:00
77823e2839 Modify get Geofence API to get total count 2023-10-06 08:04:38 +05:30
navodzoysa
03a0539d92 Fix incorrect grafana permission annotations 2023-10-02 23:19:32 +05:30
navodzoysa
f8e3fb90e6 Fix analytics publishing for Windows devices 2023-10-02 23:15:16 +05:30
Viranga Gunarathna
9e0427021e Duplicate keys for same permission in different files 2023-09-28 20:14:10 +05:30
Viranga Gunarathna
6c8c2efb80 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into scope-fixes 2023-09-28 00:17:27 +05:30
Viranga Gunarathna
48a72e80e9 Modify scope keys 2023-09-27 23:48:16 +05:30
osh
3c658f0afe Fix ownership issue in device deletion 2023-09-26 17:42:37 +05:30
Inosh Perara
50887c12f9 Merge pull request 'Add device deletion scenario for billing' (#226) from osh.silva/device-mgt-core:billing-delete-9713 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/226
2023-09-26 05:02:50 +00:00
Rajitha Kumara
69efff10bd Implement state checking and csrf protection
## Purpose

* Fixes for http://roadmap.entgra.net/issues/9846

Co-authored-by: rajitha <rajitha@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/232
Co-authored-by: Rajitha Kumara <rajitha@entgra.io>
Co-committed-by: Rajitha Kumara <rajitha@entgra.io>
2023-09-25 09:51:11 +00:00
Sasini_Sandamali
bb0369cde9 Update addOperation and sql files 2023-09-21 09:53:11 +05:30
795d26f4b0 Merge pull request 'Fix error showing on startup in task-mgt' (#229) from prathabanKavin/device-mgt-core:mssqltaskmgt into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/229
2023-09-20 05:56:08 +00:00
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
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