#0 config - Updated covalent and angular versions to 1.0-b4 and 4.1.3

rsanchez

2017-06-08 36f95137d5018c8042b8aecdfb6578860314bc31

#0 config - Updated covalent and angular versions to 1.0-b4 and 4.1.3

 securis/src/main/webapp/jspm.browser.js
..
..
@@ -1,6 +1,6 @@
1
1
 SystemJS.config({
2
-    "paths": {
3
-      "github:": "jspm_packages/github/",
4
-      "npm:": "jspm_packages/npm/"
2
+    paths: {
3
+        "github:": "jspm_packages/github/",
4
+        "npm:": "jspm_packages/npm/"
5
5
     }
6
6
 });
 securis/src/main/webapp/jspm.config.js
..
..
@@ -36,8 +36,8 @@
36
36
     }
37
37
   },
38
38
   map: {
39
-    "@angular/animations/browser": "npm:@angular/animations@4.0.2/bundles/animations-browser.umd.min.js",
40
-    "@angular/platform-browser/animations": "npm:@angular/platform-browser@4.0.2/bundles/platform-browser-animations.umd.min.js",
39
+    "@angular/animations/browser": "npm:@angular/animations@4.1.3/bundles/animations-browser.umd.min.js",
40
+    "@angular/platform-browser/animations": "npm:@angular/platform-browser@4.1.3/bundles/platform-browser-animations.umd.min.js",
41
41
     "app": "src/app"
42
42
   }
43
43
 });
..
..
@@ -49,19 +49,19 @@
49
49
     "npm:*.json"
50
50
   ],
51
51
   map: {
52
-    "@angular/animations": "npm:@angular/animations@4.0.2",
53
-    "@angular/common": "npm:@angular/common@4.0.2",
54
-    "@angular/compiler": "npm:@angular/compiler@4.0.2",
55
-    "@angular/core": "npm:@angular/core@4.0.2",
56
-    "@angular/forms": "npm:@angular/forms@4.0.2",
57
-    "@angular/http": "npm:@angular/http@4.0.2",
58
-    "@angular/material": "npm:@angular/material@2.0.0-beta.3",
59
-    "@angular/platform-browser": "npm:@angular/platform-browser@4.0.2",
60
-    "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@4.0.2",
61
-    "@angular/router": "npm:@angular/router@4.0.2",
62
-    "@covalent/core": "npm:@covalent/core@1.0.0-beta.3-1",
63
-    "@covalent/dynamic-forms": "npm:@covalent/dynamic-forms@1.0.0-beta.3-1",
64
-    "@covalent/http": "npm:@covalent/http@1.0.0-beta.3-1",
52
+    "@angular/animations": "npm:@angular/animations@4.1.3",
53
+    "@angular/common": "npm:@angular/common@4.1.3",
54
+    "@angular/compiler": "npm:@angular/compiler@4.1.3",
55
+    "@angular/core": "npm:@angular/core@4.1.3",
56
+    "@angular/forms": "npm:@angular/forms@4.1.3",
57
+    "@angular/http": "npm:@angular/http@4.1.3",
58
+    "@angular/material": "npm:@angular/material@2.0.0-beta.6",
59
+    "@angular/platform-browser": "npm:@angular/platform-browser@4.1.3",
60
+    "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@4.1.3",
61
+    "@angular/router": "npm:@angular/router@4.1.3",
62
+    "@covalent/core": "npm:@covalent/core@1.0.0-beta.4",
63
+    "@covalent/dynamic-forms": "npm:@covalent/dynamic-forms@1.0.0-beta.4",
64
+    "@covalent/http": "npm:@covalent/http@1.0.0-beta.4",
65
65
     "angular-in-memory-web-api": "npm:angular-in-memory-web-api@0.3.1",
66
66
     "angular-safeguard": "npm:angular-safeguard@1.0.1",
67
67
     "assert": "npm:jspm-nodelibs-assert@0.2.1",
..
..
@@ -317,17 +317,15 @@
317
317
         "process": "npm:process@0.11.9"
318
318
       }
319
319
     },
320
-    "npm:@covalent/core@1.0.0-beta.3-1": {
320
+    "npm:@covalent/dynamic-forms@1.0.0-beta.4": {
321
321
       "map": {
322
-        "@angular/flex-layout": "npm:@angular/flex-layout@2.0.0-beta.7",
323
-        "@angular/material": "npm:@angular/material@2.0.0-beta.3"
322
+        "@covalent/core": "npm:@covalent/core@1.0.0-beta.4"
324
323
       }
325
324
     },
326
-    "npm:@covalent/dynamic-forms@1.0.0-beta.3-1": {
325
+    "npm:@angular/material@2.0.0-beta.6": {
327
326
       "map": {
328
-        "@covalent/core": "npm:@covalent/core@1.0.0-beta.3-1"
327
+        "tslib": "npm:tslib@1.7.1"
329
328
       }
330
329
     }
331
330
   }
332
-  
333
331
 });
 securis/src/main/webapp/package.json
..
..
@@ -22,21 +22,21 @@
22
22
   },
23
23
   "keywords": [],
24
24
   "author": "",
25
-  "license": "MIT",
25
+  "license": "Commercial",
26
26
   "dependencies": {
27
-    "@angular/animations": "~4.0.2",
28
-    "@angular/common": "^4.0.2",
29
-    "@angular/compiler": "~4.0.2",
30
-    "@angular/core": "~4.0.2",
31
-    "@angular/forms": "~4.0.2",
32
-    "@angular/http": "~4.0.2",
33
-    "@angular/material": "^2.0.0-beta.3",
34
-    "@angular/platform-browser": "~4.0.2",
35
-    "@angular/platform-browser-dynamic": "~4.0.2",
36
-    "@angular/router": "^4.0.2",
37
-    "@covalent/core": "^1.0.0-beta.3",
38
-    "@covalent/dynamic-forms": "^1.0.0-beta.3",
39
-    "@covalent/http": "^1.0.0-beta.3",
27
+    "@angular/core": "~4.1.3",
28
+    "@angular/animations": "~4.1.3",
29
+    "@angular/common": "^4.1.3",
30
+    "@angular/compiler": "~4.1.3",
31
+    "@angular/forms": "~4.1.3",
32
+    "@angular/http": "~4.1.3",
33
+    "@angular/router": "^4.1.3",
34
+    "@angular/platform-browser": "~4.1.3",
35
+    "@angular/platform-browser-dynamic": "~4.1.3",
36
+    "@angular/material": "^2.0.0-beta.4",
37
+    "@covalent/core": "^1.0.0-beta.4",
38
+    "@covalent/dynamic-forms": "^1.0.0-beta.4",
39
+    "@covalent/http": "^1.0.0-beta.4",
40
40
     "angular-in-memory-web-api": "~0.2.4",
41
41
     "angular-safeguard": "^1.0.1",
42
42
     "core-js": "^2.4.1",
..
..
@@ -72,9 +72,8 @@
72
72
     "name": "securis",
73
73
     "main": "src/main.js",
74
74
     "dependencies": {
75
-      "@angular/animations": "npm:@angular/animations@^4.0.2",
76
-      "@angular/material": "npm:@angular/material@^2.0.0-beta.3",
77
-      "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^4.0.2",
75
+      "@angular/animations": "npm:@angular/animations@^4.1.3",
76
+      "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^4.1.3",
78
77
       "@covalent/core": "npm:@covalent/core@^1.0.0-beta.3-1",
79
78
       "@covalent/dynamic-forms": "npm:@covalent/dynamic-forms@^1.0.0-beta.3-1",
80
79
       "@covalent/http": "npm:@covalent/http@^1.0.0-beta.3-1",
..
..
@@ -94,12 +93,13 @@
94
93
       "typescript": "npm:typescript@^2.2.2"
95
94
     },
96
95
     "peerDependencies": {
97
-      "@angular/common": "npm:@angular/common@4.0.2",
98
-      "@angular/compiler": "npm:@angular/compiler@^4.0.2",
99
-      "@angular/core": "npm:@angular/core@4.0.2",
100
-      "@angular/forms": "npm:@angular/forms@^4.0.0",
101
-      "@angular/http": "npm:@angular/http@^4.0.0",
102
-      "@angular/platform-browser": "npm:@angular/platform-browser@4.0.2",
96
+      "@angular/common": "npm:@angular/common@^4.0.0",
97
+      "@angular/compiler": "npm:@angular/compiler@^4.1.3",
98
+      "@angular/core": "npm:@angular/core@4.1.3",
99
+      "@angular/forms": "npm:@angular/forms@^4.1.3",
100
+      "@angular/http": "npm:@angular/http@^4.1.3",
101
+      "@angular/material": "npm:@angular/material@^2.0.0-beta.3",
102
+      "@angular/platform-browser": "npm:@angular/platform-browser@4.1.3",
103
103
       "@angular/router": "npm:@angular/router@^4.0.0",
104
104
       "assert": "npm:jspm-nodelibs-assert@^0.2.0",
105
105
       "buffer": "npm:jspm-nodelibs-buffer@^0.2.0",
..
..
@@ -124,12 +124,11 @@
124
124
           "test.js"
125
125
         ]
126
126
       },
127
-      "npm:reflect-metadata@0.1.10": {
128
-        "jspmNodeConversion": false,
129
-        "map": {
130
-          "crypto": {
131
-            "node": "@node/crypto",
132
-            "default": "@empty"
127
+      "npm:tslib@1.7.1": {
128
+        "format": "cjs",
129
+        "meta": {
130
+          "tslib.js": {
131
+            "esModule": true
133
132
           }
134
133
         }
135
134
       },
 securis/src/main/webapp/src/app/app.module.ts
..
..
@@ -5,8 +5,10 @@
5
5
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
6
6
 import { FormsModule }   from '@angular/forms';
7
7
 import { MaterialModule } from '@angular/material';
8
-import { CovalentCoreModule } from '@covalent/core';
9
-import { CovalentHttpModule } from '@covalent/http';
8
+import { CovalentPagingModule, CovalentLayoutModule, CovalentNotificationsModule, CovalentMenuModule,CovalentFileModule,CovalentDataTableModule,
9
+          CovalentDialogsModule, CovalentCommonModule, CovalentChipsModule, CovalentExpansionPanelModule, CovalentLoadingModule, CovalentMediaModule,
10
+          CovalentSearchModule } from '@covalent/core';
11
+import { CovalentHttpModule } from '@covalent/http'; 
10
12
 import { CovalentDynamicFormsModule } from '@covalent/dynamic-forms'; 
11
13
 
12
14
 import { LockerModule, DRIVERS } from 'angular-safeguard'; 
..
..
@@ -64,9 +66,11 @@
64
66
     HttpModule,
65
67
     FormsModule,
66
68
     MaterialModule,
67
-    CovalentCoreModule.forRoot(),
69
+    CovalentPagingModule, CovalentLayoutModule, CovalentNotificationsModule, CovalentMenuModule,CovalentFileModule,CovalentDataTableModule,
70
+    CovalentDialogsModule, CovalentCommonModule, CovalentChipsModule, CovalentExpansionPanelModule, CovalentLoadingModule, CovalentMediaModule,
71
+    CovalentSearchModule, 
68
72
     CovalentHttpModule.forRoot(),
69
-    CovalentDynamicFormsModule.forRoot(),
73
+    CovalentDynamicFormsModule,
70
74
     ToastModule.forRoot(),
71
75
     appRoutes,
72
76
   ],
 securis/src/main/webapp/src/app/resources/packs.ts
..
..
@@ -86,13 +86,13 @@
86
86
     super($L, http, 'pack');
87
87
   }
88
88
 
89
-  public get(filter?: PacksFilter) {
89
+  public get(filter?: PacksFilter | number) {
90
+      if (!filter || typeof filter === "number") {
91
+        return super.get(filter);
92
+      }
90
93
       let searchParams = new MySearchParams(filter);
91
94
       let url = `${this.resource}/?${searchParams}`;
92
95
       return this.http.get(url).map(response => response.json()).catch(err => super.processErrorResponse(err));
93
-	}
94
-  public get(id: number) {
95
-      return super.get(id);
96
96
 	}
97
97
 
98
98