aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-os-chef
diff options
context:
space:
mode:
authorIdan Amit <ia096e@intl.att.com>2018-01-15 14:31:42 +0200
committerMichael Lando <ml636r@att.com>2018-01-16 16:58:47 +0000
commit5197c8b7b3cf7576f1198e4b59a7d6484e793107 (patch)
tree55e938e420d863fac9f1c92901f4e7c2e34787c4 /sdc-os-chef
parentfd19ae43d9f057f9ce51d48f95ef3f5f60173f22 (diff)
Designer-view component for top-nav
Create a designer-view component for opening a designer view from the top-nav Updated the API to return the designers as a list and not as an object Created a designer-frame component that will get a designer url to open in the dedicated position Change-Id: Ic42f7695277e88aacdeaa74d4d0f95b49ce44999 Issue-ID: SDC-884 Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'sdc-os-chef')
-rw-r--r--sdc-os-chef/environments/Template.json10
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb22
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb28
3 files changed, 38 insertions, 22 deletions
diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index d184712a4d..d39eba33b6 100644
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -45,13 +45,19 @@
"dcae_host": "yyy",
"dcae_port": "yyy",
"dcae_path": "yyy",
- "dcae_protocol": "yyy"
+ "dcae_state_url": "yyy",
+ "dcae_protocol": "yyy",
+ "dcae_button_position": ["xxx", "yyy"],
+ "dcae_tab_presentation": ["xxx", "yyy"]
},
"WORKFLOW": {
"workflow_host": "yyy",
"workflow_port": "yyy",
"workflow_path": "yyy",
- "workflow_protocol": "yyy"
+ "workflow_state_url": "yyy",
+ "workflow_protocol": "yyy",
+ "workflow_button_position": ["xxx", "yyy"],
+ "workflow_tab_presentation": ["xxx", "yyy"]
}
}
},
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
index 7dcf260d31..0d12e3b589 100644
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
+++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
@@ -23,14 +23,20 @@ template "designers-fe-config" do
group "jetty"
mode "0755"
variables({
- :dcae_host => node['Designers']['DCAE']['dcae_host'],
- :dcae_port => node['Designers']['DCAE']['dcae_port'],
- :dcae_path => node['Designers']['DCAE']['dcae_path'],
- :dcae_protocol => node['Designers']['DCAE']['dcae_protocol'],
- :workflow_host => node['Designers']['WORKFLOW']['workflow_host'],
- :workflow_port => node['Designers']['WORKFLOW']['workflow_port'],
- :workflow_path => node['Designers']['WORKFLOW']['workflow_path'],
- :workflow_protocol => node['Designers']['WORKFLOW']['workflow_protocol']
+ :dcae_host => node['Designers']['DCAE']['dcae_host'],
+ :dcae_port => node['Designers']['DCAE']['dcae_port'],
+ :dcae_path => node['Designers']['DCAE']['dcae_path'],
+ :dcae_state_url => node['Designers']['DCAE']['dcae_state_url'],
+ :dcae_protocol => node['Designers']['DCAE']['dcae_protocol'],
+ :dcae_button_location => node['Designers']['DCAE']['dcae_button_location'],
+ :dcae_tab_presentation => node['Designers']['DCAE']['dcae_tab_presentation'],
+ :workflow_host => node['Designers']['WORKFLOW']['workflow_host'],
+ :workflow_port => node['Designers']['WORKFLOW']['workflow_port'],
+ :workflow_path => node['Designers']['WORKFLOW']['workflow_path'],
+ :workflow_state_url => node['Designers']['WORKFLOW']['workflow_state_url'],
+ :workflow_protocol => node['Designers']['WORKFLOW']['workflow_protocol'],
+ :workflow_button_location => node['Designers']['WORKFLOW']['workflow_button_location'],
+ :workflow_tab_presentation => node['Designers']['WORKFLOW']['workflow_tab_presentation']
})
end
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb
index b5092728ba..f8a7999704 100644
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb
+++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb
@@ -1,13 +1,17 @@
designersList:
- DCAE:
- displayName: DCAE
- designerHost: <%= @dcae_host %>
- designerPort: <%= @dcae_port %>
- designerPath: <%= @dcae_path %>
- designerProtocol: <%= @dcae_protocol %>
- WORKFLOW:
- displayName: WORKFLOW
- designerHost: <%= @workflow_host %>
- designerPort: <%= @workflow_port %>
- designerPath: <%= @workflow_path %>
- designerProtocol: <%= @workflow_protocol %> \ No newline at end of file
+ - displayName: DCAE
+ designerHost: <%= @dcae_host %>
+ designerPort: <%= @dcae_port %>
+ designerPath: <%= @dcae_path %>
+ designerStateUrl: <%= @dcae_state_url %>
+ designerProtocol: <%= @dcae_protocol %>
+ designerButtonLocation: <%= @dcae_button_location %>
+ designerTabPresentation: <%= @dcae_tab_presentation %>
+ - displayName: WORKFLOW
+ designerHost: <%= @workflow_host %>
+ designerPort: <%= @workflow_port %>
+ designerPath: <%= @workflow_path %>
+ designerStateUrl: <%= @workflow_state_url %>
+ designerProtocol: <%= @workflow_protocol %>
+ designerButtonLocation: <%= @workflow_button_location %>
+ designerTabPresentation: <%= @workflow_tab_presentation %> \ No newline at end of file