Commit Graph

6769 Commits

Author SHA1 Message Date
Dharmakeerthi Lasantha
1c0288d3fb Merge branch 'policy-type-creation' into 'master'
Add policy type

Closes product-iots#145

See merge request entgra/carbon-device-mgt!182
2019-10-03 17:26:31 +00:00
Pahansith Gunathilake
db8645e6c5 Add policy type 2019-10-03 17:26:31 +00:00
Saad Sahibjan
d683d0c93f Merge branch 'master' into 'master'
Fix incorrect device view issue for different ownerships.

Closes product-iots#135

See merge request entgra/carbon-device-mgt!273
2019-10-03 10:09:06 +00:00
lasanthaDLPDS
2d58d69d2f Fix incorrect device view issue for different ownerships. 2019-10-03 15:38:07 +05:30
Milan Perera
fe23ab711c Merge branch 'master' into 'master'
Master

Closes product-iots#172

See merge request entgra/carbon-device-mgt!267
2019-09-30 14:32:15 +00:00
milanperera
576ccd2363 Fix issues in fix-172 2019-09-30 15:54:12 +02:00
milanperera
a044bbd385 fix entgra/product-iots#172 2019-09-30 15:47:50 +02:00
Charitha Goonetilleke
4c78c1bf13 Merge branch 'master' into 'master'
Fix device-type features edit issue

See merge request entgra/carbon-device-mgt!266
2019-09-30 07:13:17 +00:00
Turcy
f28d42d7ce Fix device-type features edit issue 2019-09-30 12:14:35 +05:30
Dharmakeerthi Lasantha
6f21f472b6 Merge branch 'GroupNameCase' into 'master'
Fix Null pointer exception in group management

See merge request entgra/carbon-device-mgt!265
2019-09-27 15:46:41 +00:00
ausamriyaaz
2c27830ecc Fix Null pointer exception 2019-09-27 15:42:01 +05:30
Dharmakeerthi Lasantha
0dac130e91 Show the applied policies when click view button on policy compliance 2019-09-27 05:51:59 +00:00
Vinojini Paramasivam
3dcf19dffa Show the applied policies when click view button on policy compliance 2019-09-27 05:51:59 +00:00
Milan Perera
513b8efaee Merge branch 'fix-141' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt!263
2019-09-26 20:34:23 +00:00
milanperera
a716d28046 Fix build failure 2019-09-26 22:33:26 +02:00
Milan Perera
3747e98be3 Merge branch 'fix-141' into 'master'
Fix for entgra/product-iots#141

Closes product-iots#141

See merge request entgra/carbon-device-mgt!260
2019-09-26 09:33:29 +00:00
Dharmakeerthi Lasantha
6344ff4950 Change search by group name to case insensitive 2019-09-26 04:11:55 +00:00
Vinojini Paramasivam
8b61bbabea Change search by group name to case insensitive 2019-09-26 04:11:55 +00:00
milanperera
5e19455882 Fix for entgra/product-iots#141 2019-09-25 16:26:19 +02:00
Dharmakeerthi Lasantha
73793b5971 Fix device management test failures 2019-09-19 21:11:51 +00:00
Amanda Randombage
a82b4763e2 Fix device management test failures 2019-09-19 21:11:51 +00:00
Saad Sahibjan
d6bc33b0a2 Merge branch 'permanent-delete' into 'master'
Permanent delete API modification

## Purpose
> Delete multple devices from one API call.

## Goals
> Avoid invoking the API multiple times to delete a set of devices.

## Approach
> Delete the records of the devices as batch operations in the core level via a DEeviceDAO object and in the plugin level by creating a DeviceManager object for each device type.

## Documentation
> N/A

## Automation tests
 - Unit tests 
   > None
 - Integration tests
   > None

## Security checks
 - Followed secure coding standards? (yes)
 - Ran FindSecurityBugs plugin and verified report? (no)
 - Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? (yes)

## Related MRs
> https://gitlab.com/entgra/carbon-device-mgt/merge_requests/198

## Test environment
> N/A

## Learning
> N/A

See merge request entgra/carbon-device-mgt!241
2019-09-19 18:08:56 +00:00
Amanda Randombage
ff2c038688 Modify permanent delete API to support list of devices 2019-09-19 18:08:56 +00:00
Charitha Goonetilleke
5c2af197d3 Merge branch 'master' into 'master'
Fixing issues in the /query-devices API

See merge request entgra/carbon-device-mgt!243
2019-09-19 05:21:35 +00:00
Ace
647099f8a9 Adding debug logs to query-devices API 2019-09-19 10:22:47 +05:30
Ace
8086a54a1a Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-19 08:34:58 +05:30
Ace
7838eaf97b Modifying group devices API to retrieve properties 2019-09-19 07:59:45 +05:30
Charitha Goonetilleke
c3490c129a Fix issue in deploying event streams 2019-09-16 06:48:01 +00:00
Ace
fc03c404ad Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-14 13:03:06 +05:30
Saad Sahibjan
0af060f5b8 Merge branch 'master' into 'master'
Fix server starting issue

See merge request entgra/carbon-device-mgt!244
2019-09-12 16:54:34 +00:00
lasanthaDLPDS
cebc18bef6 Fix server starting issue
This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
2019-09-12 22:20:55 +05:30
Ace
def206d17e Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-11 16:18:27 +05:30
Ace
82447ef865 Fixing issues with query-devices 2019-09-11 16:18:13 +05:30
Charitha Goonetilleke
11e6e11714 Merge branch 'master' into 'master'
Sort device analytics data

Closes product-iots#140

See merge request entgra/carbon-device-mgt!238
2019-09-11 06:23:21 +00:00
Turcy
e33f28bf8a Sort device analytics data 2019-09-09 23:49:24 +05:30
Charitha Goonetilleke
71488410d4 Merge branch 'master' into 'master'
Rest api to deploy DAS components

See merge request entgra/carbon-device-mgt!226
2019-09-09 15:03:49 +00:00
Charitha Goonetilleke
12e19b9862 Merge branch 'master' into 'master'
Make device analytics timestamp human-readable

Closes product-iots#139

See merge request entgra/carbon-device-mgt!234
2019-09-09 14:46:01 +00:00
Yohan Avishke
234c2ee104 Resolve issue with wrong license header 2019-09-09 20:08:33 +05:30
Yohan Avishke
3dff9fef80 Create Endpoints to deploy DAS artifacts as Strings
Four new endpoints were created to deploy DAS artifacts. These apis will accept JSON payloads and convert them to Strings and will use those to deploy artifacts. These endpoints are different from the existing endpoints due to accepting different payloads and using different stubs to deploy.
2019-09-09 19:51:40 +05:30
Milan Perera
299ae580ee Merge branch '3.7.0-fixes' into 'master'
Add DM_DEVICE_CERTIFICATE table script to main DB scripts

Closes product-iots#63

See merge request entgra/carbon-device-mgt!236
2019-09-08 20:01:27 +00:00
milanperera
1cc5209c4e Add certificate mgt table creation 2019-09-08 21:58:17 +02:00
Turcy
0af18b0255 Make device analytics timestamp human-readable 2019-09-05 16:27:37 +05:30
Charitha Goonetilleke
860072842e Merge branch 'master' into 'master'
Introducing a group properties table & ability to add/remove group properties

See merge request entgra/carbon-device-mgt!225
2019-09-03 16:24:36 +00:00
Yohan Avishke
bed68289b5 Make stream persisting optional
At the moment of creating a stream it will be persisted by default. This was made a optional choice by using a query flag through this commit.
2019-09-02 10:10:22 +05:30
Yohan Avishke
35b03d387c fix: Change in file name
File name of AttributeDataType was changed to AttributeType to resolve some conflicts with import statements.
2019-09-02 00:47:25 +05:30
Yohan Avishke
6def2e1efa Merge branch 'master' of https://gitlab.com/YohanAvishke/carbon-device-mgt 2019-09-02 00:05:32 +05:30
Yohan Avishke
bdf74ac041 API to integrate functionality of DAS
Four endpoints to publish stream, receiver, publisher and siddhi script were added to the device.mgt.api. This commit contains implementation of the above end points, jax-rs beans, custom exceptions and common methods used for the endpoints.
These changes were done in order to decouple the DAS ui from Entgra products.
These endpoints will function by consuming JSON payloads to, generate custom artifacts and deploying them depending on the payload.

BREAKING CHANGE: Four endpoints to publish stream, receiver, publisher and siddhi script were added to the device.mgt.api
2019-09-01 23:57:51 +05:30
Ace
48a0801faf Fixing test failures 2019-08-30 15:24:19 +05:30
Ace
91746c4d04 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-08-30 12:44:42 +05:30
Ace
5f3c069694 introducing a group properties table & ability to add/remove group properties 2019-08-30 12:42:09 +05:30