From 5322519a1eecb0bb253d5d27865fdde7a8dc727d Mon Sep 17 00:00:00 2001 From: leandrofars Date: Wed, 24 Apr 2024 14:37:09 -0300 Subject: [PATCH] feat: block cwmp access in frontend + add cwmp profile to compose --- README.md | 2 +- deploy/compose/docker-compose.yaml | 1 + .../overview/overview-latest-orders.js | 20 +++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c0e9104..09d2632 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ This repository aims to promote the development of a multi-vendor management pla Run app using Docker Compose:
 user@user-laptop:~$ cd oktopus/deploy/compose
-user@user-laptop:~/oktopus/deploy/compose$ COMPOSE_PROFILES=nats,controller,mqtt,stomp,ws,adapter,frontend,portainer docker compose up -d
+user@user-laptop:~/oktopus/deploy/compose$ COMPOSE_PROFILES=nats,controller,cwmp,mqtt,stomp,ws,adapter,frontend,portainer docker compose up -d
 
Oktopus deployment in Kubernetes still is in beta phase: Instructions for Kubernetes deployment

UI will open at port 3000: diff --git a/deploy/compose/docker-compose.yaml b/deploy/compose/docker-compose.yaml index 97a5f6c..559a094 100644 --- a/deploy/compose/docker-compose.yaml +++ b/deploy/compose/docker-compose.yaml @@ -186,6 +186,7 @@ services: networks: usp_network: ipv4_address: 172.16.235.16 + profiles: [cwmp] networks: usp_network: diff --git a/frontend/src/sections/overview/overview-latest-orders.js b/frontend/src/sections/overview/overview-latest-orders.js index 7d4369f..6f85c03 100644 --- a/frontend/src/sections/overview/overview-latest-orders.js +++ b/frontend/src/sections/overview/overview-latest-orders.js @@ -97,18 +97,18 @@ export const OverviewLatestOrders = (props) => { - { - if (order.Status == 2){ - router.push("devices/"+order.SN+"/discovery") + { order.Status == 2 && (order.Mqtt == 0 && order.Websockets == 0 && order.Stomp == 0) ? : { + if (order.Status == 2){ + router.push("devices/"+order.SN+"/discovery") + } } } - } - > - - + > + + } );