MG-94 - Add storage for dashboards #104

felixgateru · 2024-01-30T18:04:18Z

What type of PR is this?

What does this do?

Adds postgress implementation for storage of dashboards

Which issue(s) does this PR fix/relate to?

Resolves Add storage for dashboards #94

Have you included tests for your changes?

Yes
No, and this is why: will do so

Did you document any new/modified functionality?

Yes
No, and this is why:

Notes

ui/service.go

ui/web/static/js/dashboards.js

ui/web/templates/dashboard.html

ui/dashboards.go

ui/api/logging.go

Signed-off-by: felix.gateru <[email protected]>

ui/api/logging.go

ianmuchyri · 2024-02-02T12:45:52Z

ui/api/logging.go

+			lm.logger.Warn("View dashboards failed to complete successfully", args...)
+			return
+		}
+		lm.logger.Info("View dashboards completed successfully", args...)


Suggested change

lm.logger.Info("View dashboards completed successfully", args...)

lm.logger.Info("View dashboard completed successfully", args...)

ui/api/logging.go

ui/api/metrics.go

ui/service.go

postgres/dashboards.go

Signed-off-by: felix.gateru <[email protected]>

ui/service.go

ui/api/metrics.go

ui/api/logging.go

Signed-off-by: felix.gateru <[email protected]>

docker/docker-compose.yml

docker/.env

internal/postgres/postgres.go

internal/env/parser.go

postgres/dashboards.go

ui/api/logging.go

Signed-off-by: felix.gateru <[email protected]>

ui/service.go

ui/dashboards.go

docker/.env

docker/docker-compose.yml

Signed-off-by: felix.gateru <[email protected]>

ianmuchyri · 2024-02-05T12:10:45Z

ui/service.go

+		return btpl.Bytes(), errors.Wrap(ErrFailedRetrieveUserID, err)
+	}
+
+	entropy := rand.New(rand.NewSource(time.Now().UnixNano()))


for uniformity of the id's I suggest you use the Magistrala format for uuid: https://github.com/absmach/magistrala/blob/main/pkg/uuid/uuid.go

ianmuchyri · 2024-02-05T12:13:44Z

postgres/dashboards.go

+
+// Retrieve all dashboards for a user using a user id.
+func (r *repo) RetrieveAll(ctx context.Context, page ui.DashboardPageMeta) (ui.DashboardPage, error) {
+	q := `SELECT dashboard_id, created_by, dashboard_name, description, metadata, created_at, updated_at FROM dashboards WHERE created_by = :created_by LIMIT :limit OFFSET :offset`


ORDER BY created_at to retrieve beginning with the latest dashboard

Signed-off-by: felix.gateru <[email protected]>

ianmuchyri · 2024-02-05T13:42:25Z

docker/docker-compose.yml

+      restart: on-failure
+      command: postgres -c "max_connections=${MG_POSTGRES_MAX_CONNECTIONS}"
+      ports:
+        - 6044:5432


Suggested change

- 6044:5432

- 6042:5432

ianmuchyri · 2024-02-05T13:45:30Z

postgres/dashboards.go

+	q := `
+    INSERT INTO dashboards (dashboard_id, created_by, dashboard_name, description, metadata, layout, created_at, updated_at)
+    VALUES (:dashboard_id, :created_by, :dashboard_name, :description, :metadata, :layout, :created_at, :updated_at)
+	RETURNING dashboard_id, created_by, dashboard_name, description, metadata, layout, created_at, updated_at`


Suggested change

RETURNING dashboard_id, created_by, dashboard_name, description, metadata, layout, created_at, updated_at`

RETURNING dashboard_id, created_by, dashboard_name, description, metadata, layout, created_at

Signed-off-by: felix.gateru <[email protected]>

dborovcanin · 2024-02-05T15:21:54Z

postgres/init.go

+						dashboard_id VARCHAR(36) NOT NULL,
+						created_by VARCHAR(36) NOT NULL,
+						dashboard_name VARCHAR(255) NOT NULL,
+						description TEXT,


No need for a dashboard prefix for ID and name.

dborovcanin · 2024-02-05T15:25:25Z

ui/api/endpoint.go

+		}
+
+		return uiRes{
+			code: http.StatusOK,


Since we do not return anything else, the correct code would be No Content. Source: https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/DELETE.

dborovcanin · 2024-02-05T15:27:57Z

postgres/init.go

+						created_by VARCHAR(36) NOT NULL,
+						dashboard_name VARCHAR(255) NOT NULL,
+						description TEXT,
+						metadata TEXT,


For other entities it is added as the option for extension, but we probably do not need metadata for dashboards. Please remove.

Signed-off-by: felix.gateru <[email protected]>

* Add postgres storage to dashboards Signed-off-by: felix.gateru <[email protected]> * Implement CRUD operations for dashboards Signed-off-by: felix.gateru <[email protected]> * Add Dashboard Name as a database field Signed-off-by: felix.gateru <[email protected]> * Fix db bug Signed-off-by: felix.gateru <[email protected]> * Fix retreive all error Signed-off-by: felix.gateru <[email protected]> * Refactor list dashboars response Signed-off-by: felix.gateru <[email protected]> * Revert port configuration to default Signed-off-by: felix.gateru <[email protected]> * Fix list dashboards bug Signed-off-by: felix.gateru <[email protected]> * Enhance update request Signed-off-by: felix.gateru <[email protected]> * Add standalone config Signed-off-by: felix.gateru <[email protected]> * Add created and updated time stamps Signed-off-by: felix.gateru <[email protected]> * Refactor dashboards.go Signed-off-by: felix.gateru <[email protected]> * Change dashboard id from ulid to uuid Signed-off-by: felix.gateru <[email protected]> * Change config urls Signed-off-by: felix.gateru <[email protected]> * cleaning up Signed-off-by: felix.gateru <[email protected]> * Revert config urls Signed-off-by: felix.gateru <[email protected]> * Rename dashboard id and name Signed-off-by: felix.gateru <[email protected]> --------- Signed-off-by: felix.gateru <[email protected]>

felixgateru changed the base branch from main to dashboards January 30, 2024 18:07

dborovcanin added the dashboards Dashboards label Jan 31, 2024

dborovcanin force-pushed the dashboards branch from 1a749a9 to c0a7326 Compare January 31, 2024 11:45

felixgateru force-pushed the NOISSUE_storage branch 6 times, most recently from 27993e3 to 230edae Compare February 1, 2024 08:29

dborovcanin force-pushed the dashboards branch from c0a7326 to 9743af1 Compare February 1, 2024 09:20

felixgateru force-pushed the NOISSUE_storage branch 2 times, most recently from 2db28a2 to 9e93b0d Compare February 1, 2024 13:08

felixgateru marked this pull request as ready for review February 1, 2024 13:10

ianmuchyri requested changes Feb 1, 2024

View reviewed changes

ui/service.go Show resolved Hide resolved

ui/web/static/js/dashboards.js Outdated Show resolved Hide resolved

ui/web/templates/dashboard.html Outdated Show resolved Hide resolved

ui/dashboards.go Outdated Show resolved Hide resolved

ui/api/logging.go Outdated Show resolved Hide resolved

felixgateru force-pushed the NOISSUE_storage branch from 3e92b86 to 65ab229 Compare February 1, 2024 16:11

dborovcanin force-pushed the dashboards branch from 9743af1 to e687f0d Compare February 1, 2024 16:39

felixgateru force-pushed the NOISSUE_storage branch from 65ab229 to e9c47a9 Compare February 1, 2024 16:58

ianmuchyri mentioned this pull request Feb 2, 2024

MG-99 - Facilitate listing of all dashboards #108

Merged

10 tasks

felixgateru added 5 commits February 2, 2024 15:24

Add postgres storage to dashboards

19db8b1

Signed-off-by: felix.gateru <[email protected]>

Implement CRUD operations for dashboards

9c7ae03

Signed-off-by: felix.gateru <[email protected]>

Add Dashboard Name as a database field

ea57e84

Signed-off-by: felix.gateru <[email protected]>

Fix db bug

dc1a415

Signed-off-by: felix.gateru <[email protected]>

Fix retreive all error

1850085

Signed-off-by: felix.gateru <[email protected]>

felixgateru force-pushed the NOISSUE_storage branch from e9c47a9 to 1850085 Compare February 2, 2024 12:28

ianmuchyri requested changes Feb 2, 2024

View reviewed changes

felixgateru added 2 commits February 2, 2024 17:15

Refactor list dashboars response

8a1c230

Signed-off-by: felix.gateru <[email protected]>

Revert port configuration to default

0269a8b

Signed-off-by: felix.gateru <[email protected]>

ianmuchyri requested changes Feb 2, 2024

View reviewed changes

ui/service.go Outdated Show resolved Hide resolved

ui/api/metrics.go Outdated Show resolved Hide resolved

ui/api/logging.go Outdated Show resolved Hide resolved

felixgateru added 2 commits February 2, 2024 18:52

Fix list dashboards bug

5e6ae85

Signed-off-by: felix.gateru <[email protected]>

Enhance update request

d59de1b

Signed-off-by: felix.gateru <[email protected]>

ianmuchyri requested a review from Musilah February 4, 2024 10:40

Add standalone config

be8b9c1

Signed-off-by: felix.gateru <[email protected]>

ianmuchyri requested changes Feb 5, 2024

View reviewed changes

Add created and updated time stamps

4bb8f0e

Signed-off-by: felix.gateru <[email protected]>

ianmuchyri requested changes Feb 5, 2024

View reviewed changes

Refactor dashboards.go

ff2ce8b

Signed-off-by: felix.gateru <[email protected]>

felixgateru force-pushed the NOISSUE_storage branch from 2a7b52b to ff2ce8b Compare February 5, 2024 11:21

ianmuchyri requested changes Feb 5, 2024

View reviewed changes

felixgateru added 2 commits February 5, 2024 15:50

Change dashboard id from ulid to uuid

311b6a0

Signed-off-by: felix.gateru <[email protected]>

Change config urls

4622a51

Signed-off-by: felix.gateru <[email protected]>

ianmuchyri requested changes Feb 5, 2024

View reviewed changes

felixgateru added 2 commits February 5, 2024 16:51

cleaning up

01dff91

Signed-off-by: felix.gateru <[email protected]>

Revert config urls

d43c344

Signed-off-by: felix.gateru <[email protected]>

ianmuchyri approved these changes Feb 5, 2024

View reviewed changes

Musilah approved these changes Feb 5, 2024

View reviewed changes

dborovcanin requested changes Feb 5, 2024

View reviewed changes

Rename dashboard id and name

b27e412

Signed-off-by: felix.gateru <[email protected]>

dborovcanin approved these changes Feb 5, 2024

View reviewed changes

dborovcanin merged commit 0610abe into absmach:dashboards Feb 5, 2024

ianmuchyri mentioned this pull request Feb 7, 2024

Add storage for dashboards #94

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MG-94 - Add storage for dashboards #104

MG-94 - Add storage for dashboards #104

felixgateru commented Jan 30, 2024

ianmuchyri Feb 2, 2024

ianmuchyri Feb 5, 2024

ianmuchyri Feb 5, 2024

ianmuchyri Feb 5, 2024

ianmuchyri Feb 5, 2024

dborovcanin Feb 5, 2024

dborovcanin Feb 5, 2024

dborovcanin Feb 5, 2024

	lm.logger.Info("View dashboards completed successfully", args...)
	lm.logger.Info("View dashboard completed successfully", args...)

	RETURNING dashboard_id, created_by, dashboard_name, description, metadata, layout, created_at, updated_at`
	RETURNING dashboard_id, created_by, dashboard_name, description, metadata, layout, created_at

MG-94 - Add storage for dashboards #104

MG-94 - Add storage for dashboards #104

Conversation

felixgateru commented Jan 30, 2024

What type of PR is this?

What does this do?

Which issue(s) does this PR fix/relate to?

Have you included tests for your changes?

Did you document any new/modified functionality?

Notes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment