diff --git a/entitlements/sample/allow_acmefox_.txt b/entitlements/sample/allow_acmefox_.txt index 3d625a0..0299661 100644 --- a/entitlements/sample/allow_acmefox_.txt +++ b/entitlements/sample/allow_acmefox_.txt @@ -9,4 +9,5 @@ menu-005-002 menu-005-003 menu-099-001 menu-099-002 -apps2 \ No newline at end of file +apps2 +menu_no_roles \ No newline at end of file diff --git a/entitlements/sample/allow_acmefox_etal.txt b/entitlements/sample/allow_acmefox_etal.txt index 3d625a0..0299661 100644 --- a/entitlements/sample/allow_acmefox_etal.txt +++ b/entitlements/sample/allow_acmefox_etal.txt @@ -9,4 +9,5 @@ menu-005-002 menu-005-003 menu-099-001 menu-099-002 -apps2 \ No newline at end of file +apps2 +menu_no_roles \ No newline at end of file diff --git a/entitlements/sample/allow_acmefox_jack.txt b/entitlements/sample/allow_acmefox_jack.txt index 3d625a0..0299661 100644 --- a/entitlements/sample/allow_acmefox_jack.txt +++ b/entitlements/sample/allow_acmefox_jack.txt @@ -9,4 +9,5 @@ menu-005-002 menu-005-003 menu-099-001 menu-099-002 -apps2 \ No newline at end of file +apps2 +menu_no_roles \ No newline at end of file diff --git a/entitlements/sample/allow_acmefox_mark.txt b/entitlements/sample/allow_acmefox_mark.txt index 7ea14da..5d58733 100644 --- a/entitlements/sample/allow_acmefox_mark.txt +++ b/entitlements/sample/allow_acmefox_mark.txt @@ -24,4 +24,5 @@ apps2 apps2-002 apps2-002-001 apps2-002-002 -apps2-002-003 \ No newline at end of file +apps2-002-003 +menu_no_roles \ No newline at end of file diff --git a/entitlements/sample/allow_foo.bar_.txt b/entitlements/sample/allow_foo.bar_.txt index 9c76ce0..b3e2fdf 100644 --- a/entitlements/sample/allow_foo.bar_.txt +++ b/entitlements/sample/allow_foo.bar_.txt @@ -1,3 +1,4 @@ home1 menu-001-001 -menu-001-002 \ No newline at end of file +menu-001-002 +menu_no_roles \ No newline at end of file diff --git a/entitlements/sample/allow_foo.bar_mark.txt b/entitlements/sample/allow_foo.bar_mark.txt index 9c76ce0..b3e2fdf 100644 --- a/entitlements/sample/allow_foo.bar_mark.txt +++ b/entitlements/sample/allow_foo.bar_mark.txt @@ -1,3 +1,4 @@ home1 menu-001-001 -menu-001-002 \ No newline at end of file +menu-001-002 +menu_no_roles \ No newline at end of file diff --git a/entitlements/sample/allow_selfserve_.txt b/entitlements/sample/allow_selfserve_.txt index 7ea14da..5d58733 100644 --- a/entitlements/sample/allow_selfserve_.txt +++ b/entitlements/sample/allow_selfserve_.txt @@ -24,4 +24,5 @@ apps2 apps2-002 apps2-002-001 apps2-002-002 -apps2-002-003 \ No newline at end of file +apps2-002-003 +menu_no_roles \ No newline at end of file diff --git a/entitlements/sample/allow_selfserve_etal.txt b/entitlements/sample/allow_selfserve_etal.txt index ca7786f..95cc2d5 100644 --- a/entitlements/sample/allow_selfserve_etal.txt +++ b/entitlements/sample/allow_selfserve_etal.txt @@ -37,4 +37,5 @@ apps3-002-003 apps3-003 apps3-003-001 apps3-003-002 -apps3-003-003 \ No newline at end of file +apps3-003-003 +menu_no_roles \ No newline at end of file diff --git a/entitlements/sample/allow_selfserve_mark.txt b/entitlements/sample/allow_selfserve_mark.txt index 7ea14da..5d58733 100644 --- a/entitlements/sample/allow_selfserve_mark.txt +++ b/entitlements/sample/allow_selfserve_mark.txt @@ -24,4 +24,5 @@ apps2 apps2-002 apps2-002-001 apps2-002-002 -apps2-002-003 \ No newline at end of file +apps2-002-003 +menu_no_roles \ No newline at end of file diff --git a/menu/en_menu_selfserve.json b/menu/en_menu_selfserve.json index 0b6ccc6..0a52655 100644 --- a/menu/en_menu_selfserve.json +++ b/menu/en_menu_selfserve.json @@ -48,6 +48,7 @@ { "id": "menu-002-001", "intent": "/content/viewaccounts.html", + "functionId": "/content/viewaccounts.html", "label": "View", "target": "Accounts", "icon": "fa-eye", @@ -56,6 +57,7 @@ { "id": "menu-002-002", "intent": "/content/transfer.html", + "functionId": "/content/transfer.html", "label": "Transfer", "target": "Payment", "icon": "fa-exchange-alt", @@ -64,6 +66,7 @@ { "id": "menu-002-003", "intent": "/content/payment.html", + "functionId": "/content/payment.html", "label": "Payment", "target": "Payment", "icon": "fa-money-check-dollar", @@ -81,6 +84,7 @@ { "id": "menu-003-001", "intent": "https://news.com.au", + "functionId": "menu-external-news", "label": "News (AU)", "target": "news", "icon": "fa-envelope", @@ -89,6 +93,7 @@ { "id": "menu-003-002", "intent": "https://bbc.co.uk/news", + "functionId": "menu-external-news", "label": "BBC", "target": "news", "icon": "fa-radio", @@ -97,6 +102,7 @@ { "id": "menu-003-003", "intent": "https://smh.com.au", + "functionId": "menu-external-news", "label": "SMH", "target": "news", "icon": "fa-envelope-open", @@ -105,6 +111,7 @@ { "id": "menu-003-004", "intent": "https://abc.net.au/news", + "functionId": "menu-external-news", "label": "ABC news", "target": "news", "icon": "fa-envelope-open", @@ -113,6 +120,7 @@ { "id": "menu-003-005", "intent": "https://cnn.com", + "functionId": "menu-external-news", "label": "CNN", "target": "news", "icon": "fa-envelope-open", @@ -120,9 +128,8 @@ } ], "id": "menu-003", - "intent": "/accounts", + "intent": "", "label": "News", - "target": "_blank", "icon": "fa-newspaper", "tenant": "" }, @@ -411,6 +418,16 @@ "tenant": "" } ] + }, + { + "id": "menu_no_roles", + "intent": "/content/noroles.html", + "intentStatus": "hidden", + "functionId": "menu_no_roles", + "label": "Error", + "target": "error", + "icon": "fa-eye", + "tenant": "" } ] } \ No newline at end of file diff --git a/menu/menu_selfserve.json b/menu/menu_selfserve.json index eff06cf..0a52655 100644 --- a/menu/menu_selfserve.json +++ b/menu/menu_selfserve.json @@ -2,14 +2,28 @@ "id": "menu-selfserve", "intent": "", "label": "L0 Menu", + "application": "selfserve", + "applicationLabel": "L0 Self Serve", "children": [ { "id": "home1", - "label": "Welcome Home", + "label": "Welcome {{.digital_id}}", "target": "_blank", "icon": "fa-home", + "application": "home1", + "applicationLabel": "Home", "tenant": "", "children": [ + { + "id": "menu-001-001", + "label": "Dashboard {{.organisation}}", + "functionId": "menu-001-001", + "intent": "/content/dashboard.html", + "target": "Home", + "icon": "fa-tachometer-alt", + "iconActive": "fa-chart-line", + "tenant": "" + }, { "id": "menu-001-002", "label": "Alternate Dashboard", @@ -18,16 +32,6 @@ "target": "Home", "icon": "fa-chart-line", "tenant": "" - }, - { - "id": "menu-001-001", - "label": "DML Dashboard", - "functionId": "menu-001-001", - "intent": "/content/dashboard.html", - "target": "Home", - "icon": "fa-tachometer-alt", - "iconActive": "fa-chart-line", - "tenant": "" } ] }, @@ -35,6 +39,8 @@ "id": "apps1", "intent": "", "label": "Apps 1", + "application": "apps1", + "applicationLabel": "Apps 1", "functionId": "apps1", "children": [ { @@ -42,6 +48,7 @@ { "id": "menu-002-001", "intent": "/content/viewaccounts.html", + "functionId": "/content/viewaccounts.html", "label": "View", "target": "Accounts", "icon": "fa-eye", @@ -50,6 +57,7 @@ { "id": "menu-002-002", "intent": "/content/transfer.html", + "functionId": "/content/transfer.html", "label": "Transfer", "target": "Payment", "icon": "fa-exchange-alt", @@ -58,6 +66,7 @@ { "id": "menu-002-003", "intent": "/content/payment.html", + "functionId": "/content/payment.html", "label": "Payment", "target": "Payment", "icon": "fa-money-check-dollar", @@ -75,6 +84,7 @@ { "id": "menu-003-001", "intent": "https://news.com.au", + "functionId": "menu-external-news", "label": "News (AU)", "target": "news", "icon": "fa-envelope", @@ -83,6 +93,7 @@ { "id": "menu-003-002", "intent": "https://bbc.co.uk/news", + "functionId": "menu-external-news", "label": "BBC", "target": "news", "icon": "fa-radio", @@ -91,6 +102,7 @@ { "id": "menu-003-003", "intent": "https://smh.com.au", + "functionId": "menu-external-news", "label": "SMH", "target": "news", "icon": "fa-envelope-open", @@ -99,6 +111,7 @@ { "id": "menu-003-004", "intent": "https://abc.net.au/news", + "functionId": "menu-external-news", "label": "ABC news", "target": "news", "icon": "fa-envelope-open", @@ -107,6 +120,7 @@ { "id": "menu-003-005", "intent": "https://cnn.com", + "functionId": "menu-external-news", "label": "CNN", "target": "news", "icon": "fa-envelope-open", @@ -114,9 +128,8 @@ } ], "id": "menu-003", - "intent": "/accounts", + "intent": "", "label": "News", - "target": "_blank", "icon": "fa-newspaper", "tenant": "" }, @@ -224,7 +237,8 @@ "id": "menu-099-002", "intent": "/content/contact.html", "label": "Contact", - "target": "Support", + "target": "support", + "targetLabel": "Support", "icon": "fa-phone", "functionId": "menu-099-002", "tenant": "" @@ -242,6 +256,8 @@ "id": "apps2", "intent": "", "label": "Apps 2", + "application": "apps2", + "applicationLabel": "Apps 2", "functionId": "", "children": [ { @@ -286,6 +302,8 @@ "id": "apps3", "intent": "", "label": "Self serve", + "application": "apps3", + "applicationLabel": "Self serve", "functionId": "", "children": [ { @@ -400,6 +418,16 @@ "tenant": "" } ] + }, + { + "id": "menu_no_roles", + "intent": "/content/noroles.html", + "intentStatus": "hidden", + "functionId": "menu_no_roles", + "label": "Error", + "target": "error", + "icon": "fa-eye", + "tenant": "" } ] } \ No newline at end of file