Merge 0e580b6 into d43689e

__mocks__/crd_fetch.json

@@ -741,14 +741,29 @@
                     "description": "Layout that will be displayed",
                     "type": "object"
                   },
-                  "name": {
+                  "viewName": {
                     "description": "The name showed in the sidebar",
                     "type": "string"
                   },
-                  "templates": {
+                  "crds": {
                     "description": "Collection of CR template views",
                     "type": "array",
-                    "items": {"type":"object","properties":{"kind":{"description":"The kind of a CRD we want to put in the view","type":"string"},"name":{"description":"The name showed in the custom view for this CRD","type":"string"},"template":{"description":"The path of a type template CRD custom resource (if default use the template in the CRD)","type":"string"}}}
+                    "items": {
+                      "type":"object",
+                      "properties":{
+                        "crdName":{
+                          "description":"The kind of a CRD we want to put in the view",
+                          "type":"string"
+                        },
+                        "crdAltName":{
+                          "description":"The name showed in the custom view for this CRD",
+                          "type":"string"
+                        },
+                        "template":{
+                          "description":"The path of a type template CRD custom resource (if default use the template in the CRD)",
+                          "type":"string"}
+                      }
+                    }
                   }
                 }
               }

__mocks__/crd_fetch_long.json

@@ -871,14 +871,29 @@
                         "description": "Layout that will be displayed",
                         "type": "object"
                       },
-                      "name": {
+                      "viewName": {
                         "description": "The name showed in the sidebar",
                         "type": "string"
                       },
-                      "templates": {
+                      "crds": {
                         "description": "Collection of CR template views",
                         "type": "array",
-                        "items": {"type":"object","properties":{"kind":{"description":"The kind of a CRD we want to put in the view","type":"string"},"name":{"description":"The name showed in the custom view for this CRD","type":"string"},"template":{"description":"The path of a type template CRD custom resource (if default use the template in the CRD)","type":"string"}}}
+                        "items": {
+                          "type":"object",
+                          "properties":{
+                            "crdName":{
+                              "description":"The kind of a CRD we want to put in the view",
+                              "type":"string"
+                            },
+                            "crdAltName":{
+                              "description":"The name showed in the custom view for this CRD",
+                              "type":"string"
+                            },
+                            "template":{
+                              "description":"The path of a type template CRD custom resource (if default use the template in the CRD)",
+                              "type":"string"}
+                          }
+                        }
                       }
                     }
                   }

__mocks__/views.json

@@ -10,14 +10,14 @@
         "selfLink": "/apis/test/v1/namespaces/default/views/awesome-view"
       },
       "spec": {
-        "name": "Liqo View",
-        "templates": [
+        "viewName": "Liqo View",
+        "crds": [
           {
-            "name": "Test",
-            "kind": "advertisements.protocol.liqo.io"
+            "crdAltName": "Test",
+            "crdName": "advertisements.protocol.liqo.io"
           },
           {
-            "kind": "tunnelendpoints.liqonet.liqo.io"
+            "crdName": "tunnelendpoints.liqonet.liqo.io"
           }
         ]
       }

__mocks__/views_alt_template.json

@@ -10,17 +10,17 @@
         "selfLink": "/apis/test/v1/namespaces/default/views/awesome-view"
       },
       "spec": {
-        "name": "Liqo View",
-        "templates": [
+        "viewName": "Liqo View",
+        "crds": [
           {
-            "name": "Test",
-            "kind": "advertisements.protocol.liqo.io"
+            "crdAltName": "Test",
+            "crdName": "advertisements.protocol.liqo.io"
           },
           {
-            "kind": "tunnelendpoints.liqonet.liqo.io"
+            "crdName": "tunnelendpoints.liqonet.liqo.io"
           },
           {
-            "kind": "liqodashtests.dashboard.liqo.com",
+            "crdName": "liqodashtests.dashboard.liqo.com",
             "template": "dashboard.liqo.com/v1/histocharts/histo-test"
           }
         ]

__mocks__/views_empty.json

@@ -10,8 +10,8 @@
         "selfLink": "/apis/test/v1/namespaces/default/views/awesome-view"
       },
       "spec": {
-        "name": "Liqo View",
-        "templates": []
+        "viewName": "Liqo View",
+        "crds": []
       }
     }
   ],

__mocks__/views_modified.json

@@ -10,17 +10,17 @@
         "selfLink": "/apis/test/v1/namespaces/default/views/awesome-view"
       },
       "spec": {
-        "name": "Liqo View",
-        "templates": [
+        "viewName": "Liqo View",
+        "crds": [
           {
-            "name": "Test",
-            "kind": "advertisements.protocol.liqo.io"
+            "crdAltName": "Test",
+            "crdName": "advertisements.protocol.liqo.io"
           },
           {
-            "kind": "tunnelendpoints.liqonet.liqo.io"
+            "crdName": "tunnelendpoints.liqonet.liqo.io"
           },
           {
-            "kind": "liqodashtests.dashboard.liqo.com"
+            "crdName": "liqodashtests.dashboard.liqo.com"
           }
         ]
       }

__mocks__/views_withLayout.json

@@ -29,12 +29,12 @@
             }
           ]
         },
-        "templates": [
+        "crds": [
           {
-            "kind": "advertisements.protocol.liqo.io"
+            "crdName": "advertisements.protocol.liqo.io"
           },
           {
-            "kind": "foreignclusters.discovery.liqo.io"
+            "crdName": "foreignclusters.discovery.liqo.io"
           }
         ]
       }

kubernetes/config/dashboard-ingress.yaml

@@ -1,22 +1,20 @@
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-production
   labels:
     app: liqo-dashboard
   name: liqo-dashboard-content
   namespace: liqo
 spec:
   rules:
-    - host: liqodashboard.crown-labs.ipv6.polito.it
+    - host: example.liqodashboard.com
       http:
         paths:
           - backend:
               serviceName: liqo-dashboard
-              servicePort: 80
+              servicePort: 443
             path: /
   tls:
     - hosts:
-        - liqodashboard.crown-labs.ipv6.polito.it
-      secretName: dashboard-cert
+        - example.liqodashboard.com
+      secretName: liqo-dashboard-certificate

kubernetes/crd/template-view-crd.yaml → kubernetes/crd/dashboard.liqo.io_views.yaml

@@ -31,34 +31,34 @@ spec:
           type: object
         spec:
           properties:
-            name:
-              description: The name showed in the sidebar
+            viewName:
+              description: The name of the view showed in the sidebar
               type: string
             layout:
-              description: Layout that will be displayed
+              description: Layout of the view
               type: object
-            templates:
-              description: Collection of CR template views
+            crds:
+              description: Collection of CRDs to show
               items:
                 properties:
-                  name:
+                  crdAltName:
                     description: The name showed in the custom view for this CRD
                     type: string
-                  kind:
-                    description: The kind of a CRD we want to put in the view
+                  crdName:
+                    description: The name of the CRD that will be in the view
                     type: string
                   template:
-                    description: The path of a type template CRD custom resource (if default use the template in the CRD)
+                    description: The path of a type template CRD custom resource (if empty will use the template specified in the CRD)
                     type: string
                 type: object
               type: array
           type: object
       type: object
-  version: v1
+  version: v1alpha1
   versions:
-  - name: v1
-    served: true
-    storage: true
+    - name: v1alpha1
+      served: true
+      storage: true
 status:
   acceptedNames:
     kind: ""

src/CRD/CRD.js

@@ -3,9 +3,9 @@ import './CRD.css';
 import './CRDList.css';
 import {
   Space,
-  Badge, Breadcrumb, Button, Layout, Dropdown,
-  notification, Tabs, Tag, Typography, Popover, Row, Tooltip,
-  Col, Descriptions, Switch, Pagination, Empty, Rate, message, Drawer, Card, Divider
+  Badge, Button, Layout, Dropdown,
+  notification, Tag, Typography, Tooltip,
+  Descriptions, Switch, Pagination, Empty, Rate, Drawer, Card, Divider
 } from 'antd';
 import CR from './CR';
 import { Link } from 'react-router-dom';
@@ -195,10 +195,10 @@ class CRD extends Component {
     let cv = this.state.customViews.find(item => {
       return item.metadata.name === e;
     });
-    if(cv.spec.templates){
-      return !!cv.spec.templates.find(item => {
+    if(cv.spec.crds){
+      return !!cv.spec.crds.find(item => {
         if(item)
-          return item.kind === this.state.CRD.metadata.name;
+          return item.crdName === this.state.CRD.metadata.name;
       });
     }
   }
@@ -211,24 +211,24 @@ class CRD extends Component {
     let index = -1;
 
     /** Search if the CRD is in the view */
-    if(cv.spec.templates){
-      index = cv.spec.templates.indexOf(
-        cv.spec.templates.find(item => {
+    if(cv.spec.crds){
+      index = cv.spec.crds.indexOf(
+        cv.spec.crds.find(item => {
           if(item)
-            return item.kind === this.state.CRD.metadata.name;
+            return item.crdName === this.state.CRD.metadata.name;
         }));
     } else {
-      cv.spec.templates = [];
+      cv.spec.crds = [];
     }
 
     /** If the CRD is in the view, remove it
      *  or else, add it in the view
      */
     if(index !== -1){
-      cv.spec.templates[index] = null;
+      cv.spec.crds[index] = null;
     } else {
-      cv.spec.templates.push({
-        kind: this.state.CRD.metadata.name
+      cv.spec.crds.push({
+        crdName: this.state.CRD.metadata.name
       });
     }
 
@@ -266,10 +266,10 @@ class CRD extends Component {
         items.push(
           <Menu.Item key={item.metadata.name} onClick={this.handleClick_addToView}>
             {
-              item.spec.name ? (
+              item.spec.viewName ? (
                 <span style={this.checkAlreadyInView(item.metadata.name) ? {
                   color: 'red'
-                } : null}>{ item.spec.name }</span>
+                } : null}>{ item.spec.viewName }</span>
               ) : (
                 <span style={this.checkAlreadyInView(item.metadata.name) ? {
                   color: 'red'
@@ -321,12 +321,10 @@ class CRD extends Component {
             !this.props.onCustomView ? (
               <div style={{float: "right"}}>
                 <Space align={'center'}>
-                  <Tooltip title={'Add or Remove to View'} placement={'topRight'}>
-                    <div aria-label={'dropdown-CRD'}>
+                  <Tooltip title={'Add or Remove to View'} placement={'topLeft'}>
                       <Dropdown.Button overlay={menu} placement="bottomCenter"
                                        style={{paddingTop: 6}}
                                        trigger={['click']} icon={<LayoutOutlined />} />
-                    </div>
                   </Tooltip>
                   <Tooltip title={'Edit design'} placement={'top'}>
                     <Button icon={<PictureOutlined />} type="primary"

src/common/SideBar.js

@@ -65,8 +65,8 @@ class SideBar extends Component {
               }}>
               <LayoutOutlined style={{ fontSize: '20px' }} />
               {
-                item.spec.name ? (
-                  <span>{ item.spec.name }</span>
+                item.spec.viewName ? (
+                  <span>{ item.spec.viewName }</span>
                 ) : (
                   <span>{ item.metadata.name }</span>
                 )

src/services/ApiManager.js

@@ -78,7 +78,7 @@ export default class ApiManager {
     });
   }
 
-  /** Get the CRDs for the group crd-template.liqo.com */
+  /** Get the CRDs for the group dashboard.liqo.com */
   getTemplates() {
     let templates = [];
     this.CRDs.forEach(CRD => {
@@ -91,31 +91,26 @@ export default class ApiManager {
 
   /** Load Custom Views CRs */
   loadCustomViewsCRs() {
-    let CRD = {
-      spec: {
-        group: 'crd-template.liqo.com',
-        version: 'v1',
-        names: {
-          plural: 'views'
-        }
-      }
+    let CRD = this.getCRDfromKind('View');
+
+    if(CRD){
+      /** First get all the CR */
+      this.getCustomResourcesAllNamespaces(CRD)
+        .then((res) => {
+            this.customViews = res.body.items;
+
+            /** update CVs in the views */
+            this.manageCallbackCVs(this.customViews);
+
+            /** Then set up a watch to watch changes in the CR of the CRD */
+            this.watchSingleCRD(
+              CRD.spec.group,
+              CRD.spec.version,
+              CRD.spec.names.plural,
+              this.CVsNotifyEvent);
+          }
+        );
     }
-    /** First get all the CR */
-    this.getCustomResourcesAllNamespaces(CRD)
-      .then((res) => {
-        this.customViews = res.body.items;
-
-        /** update CVs in the views */
-        this.manageCallbackCVs(this.customViews);
-
-        /** Then set up a watch to watch changes in the CR of the CRD */
-        this.watchSingleCRD(
-          CRD.spec.group,
-          CRD.spec.version,
-          CRD.spec.names.plural,
-          this.CVsNotifyEvent);
-        }
-      );
   }
 
   /**