Skip to content

Commit 55371d6

Browse files
mshariq-nerdmshariq-nerd
authored
Merge pull request #264 from fledge-iot/FOGL-7510
FOGL-7510: Fixed error handling issue for forkJoin on north & south modal window
2 parents 9f7b8c0 + 7255b69 commit 55371d6

File tree

9 files changed

+319
-198
lines changed

9 files changed

+319
-198
lines changed

‎angular.json‎

Lines changed: 173 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -1,174 +1,175 @@
11
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"cli": {
4-
"analytics": false
5-
},
6-
"version": 1,
7-
"newProjectRoot": "projects",
8-
"projects": {
9-
"fledge": {
10-
"projectType": "application",
11-
"schematics": {
12-
"@schematics/angular:application": {
13-
"strict": true
14-
}
15-
},
16-
"root": "",
17-
"sourceRoot": "src",
18-
"prefix": "app",
19-
"architect": {
20-
"build": {
21-
"builder": "ngx-build-plus:browser",
22-
"options": {
23-
"allowedCommonJsDependencies": [
24-
"lodash",
25-
"chart.js",
26-
"@ctrl/ngx-codemirror",
27-
"codemirror"
28-
],
29-
"outputPath": "dist",
30-
"index": "src/fledge.html",
31-
"main": "src/main.ts",
32-
"polyfills": "src/polyfills.ts",
33-
"tsConfig": "src/tsconfig.app.json",
34-
"assets": [
35-
"src/assets"
36-
],
37-
"styles": [
38-
"./node_modules/@circlon/angular-tree-component/css/angular-tree-component.css",
39-
"./node_modules/animate.css/animate.css",
40-
"./node_modules/@ng-select/ng-select/themes/default.theme.css",
41-
"src/assets/css/bulma.min.css",
42-
"src/assets/css/bulma-steps.min.css",
43-
"src/assets/css/font-awesome.min.css",
44-
"src/assets/css/bulma-tooltip.min.css",
45-
"src/styles.css"
46-
],
47-
"scripts": [
48-
"./node_modules/plotly.js/dist/plotly.js"
49-
],
50-
"extraWebpackConfig": "webpack.config.js",
51-
"commonChunk": false
52-
},
53-
"configurations": {
54-
"production": {
55-
"budgets": [
56-
{
57-
"type": "initial",
58-
"maximumWarning": "12mb",
59-
"maximumError": "15mb"
60-
},
61-
{
62-
"type": "anyComponentStyle",
63-
"maximumWarning": "15kb",
64-
"maximumError": "20kb"
65-
}
66-
],
67-
"fileReplacements": [
68-
{
69-
"replace": "src/environments/environment.ts",
70-
"with": "src/environments/environment.prod.ts"
71-
}
72-
],
73-
"outputHashing": "all",
74-
"extraWebpackConfig": "webpack.prod.config.js"
75-
},
76-
"development": {
77-
"buildOptimizer": false,
78-
"optimization": false,
79-
"vendorChunk": true,
80-
"extractLicenses": false,
81-
"sourceMap": true,
82-
"namedChunks": true
83-
}
84-
},
85-
"defaultConfiguration": "production"
86-
},
87-
"serve": {
88-
"builder": "ngx-build-plus:dev-server",
89-
"configurations": {
90-
"production": {
91-
"browserTarget": "fledge:build:production",
92-
"extraWebpackConfig": "webpack.prod.config.js"
93-
},
94-
"development": {
95-
"browserTarget": "fledge:build:development"
96-
}
97-
},
98-
"defaultConfiguration": "development",
99-
"options": {
100-
"port": 4200,
101-
"publicHost": "http://localhost:4200",
102-
"extraWebpackConfig": "webpack.config.js"
103-
}
104-
},
105-
"extract-i18n": {
106-
"builder": "ngx-build-plus:extract-i18n",
107-
"options": {
108-
"browserTarget": "fledge:build",
109-
"extraWebpackConfig": "webpack.config.js"
110-
}
111-
},
112-
"test": {
113-
"builder": "@angular-devkit/build-angular:karma",
114-
"options": {
115-
"main": "src/test.ts",
116-
"polyfills": "src/polyfills.ts",
117-
"tsConfig": "tsconfig.spec.json",
118-
"karmaConfig": "karma.conf.js",
119-
"assets": [
120-
"src/favicon.ico",
121-
"src/assets"
122-
],
123-
"styles": [
124-
"src/assets/css/bulma.min.css",
125-
"src/assets/css/bulma-steps.min.css",
126-
"src/assets/css/font-awesome.min.css",
127-
"src/assets/css/bulma-tooltip.min.css",
128-
"src/styles.css"
129-
],
130-
"scripts": []
131-
}
132-
},
133-
"lint": {
134-
"builder": "@angular-devkit/build-angular:tslint",
135-
"options": {
136-
"tsConfig": [
137-
"src/tsconfig.app.json",
138-
"src/tsconfig.spec.json"
139-
],
140-
"exclude": [
141-
"**/node_modules/**"
142-
]
143-
}
144-
}
145-
}
146-
},
147-
"fledge-e2e": {
148-
"root": "",
149-
"sourceRoot": "",
150-
"projectType": "application",
151-
"architect": {
152-
"e2e": {
153-
"builder": "@angular-devkit/build-angular:protractor",
154-
"options": {
155-
"protractorConfig": "./protractor.conf.js",
156-
"devServerTarget": "fledge:serve"
157-
}
158-
},
159-
"lint": {
160-
"builder": "@angular-devkit/build-angular:tslint",
161-
"options": {
162-
"tsConfig": [
163-
"e2e/tsconfig.e2e.json"
164-
],
165-
"exclude": [
166-
"**/node_modules/**"
167-
]
168-
}
169-
}
170-
}
171-
}
172-
},
173-
"defaultProject": "fledge"
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"cli": {
4+
"analytics": false
5+
},
6+
"version": 1,
7+
"newProjectRoot": "projects",
8+
"projects": {
9+
"fledge": {
10+
"projectType": "application",
11+
"schematics": {
12+
"@schematics/angular:application": {
13+
"strict": true
14+
}
15+
},
16+
"root": "",
17+
"sourceRoot": "src",
18+
"prefix": "app",
19+
"architect": {
20+
"build": {
21+
"builder": "ngx-build-plus:browser",
22+
"options": {
23+
"allowedCommonJsDependencies": [
24+
"lodash",
25+
"chart.js",
26+
"@ctrl/ngx-codemirror",
27+
"codemirror"
28+
],
29+
"outputPath": "dist",
30+
"index": "src/fledge.html",
31+
"main": "src/main.ts",
32+
"polyfills": "src/polyfills.ts",
33+
"tsConfig": "src/tsconfig.app.json",
34+
"assets": [
35+
"src/assets"
36+
],
37+
"styles": [
38+
"./node_modules/@circlon/angular-tree-component/css/angular-tree-component.css",
39+
"./node_modules/animate.css/animate.css",
40+
"./node_modules/@ng-select/ng-select/themes/default.theme.css",
41+
"./node_modules/bulma-toast/dist/bulma-toast.min.js",
42+
"src/assets/css/bulma.min.css",
43+
"src/assets/css/bulma-steps.min.css",
44+
"src/assets/css/font-awesome.min.css",
45+
"src/assets/css/bulma-tooltip.min.css",
46+
"src/styles.css"
47+
],
48+
"scripts": [
49+
"./node_modules/plotly.js/dist/plotly.js"
50+
],
51+
"extraWebpackConfig": "webpack.config.js",
52+
"commonChunk": false
53+
},
54+
"configurations": {
55+
"production": {
56+
"budgets": [
57+
{
58+
"type": "initial",
59+
"maximumWarning": "12mb",
60+
"maximumError": "15mb"
61+
},
62+
{
63+
"type": "anyComponentStyle",
64+
"maximumWarning": "15kb",
65+
"maximumError": "20kb"
66+
}
67+
],
68+
"fileReplacements": [
69+
{
70+
"replace": "src/environments/environment.ts",
71+
"with": "src/environments/environment.prod.ts"
72+
}
73+
],
74+
"outputHashing": "all",
75+
"extraWebpackConfig": "webpack.prod.config.js"
76+
},
77+
"development": {
78+
"buildOptimizer": false,
79+
"optimization": false,
80+
"vendorChunk": true,
81+
"extractLicenses": false,
82+
"sourceMap": true,
83+
"namedChunks": true
84+
}
85+
},
86+
"defaultConfiguration": "production"
87+
},
88+
"serve": {
89+
"builder": "ngx-build-plus:dev-server",
90+
"configurations": {
91+
"production": {
92+
"browserTarget": "fledge:build:production",
93+
"extraWebpackConfig": "webpack.prod.config.js"
94+
},
95+
"development": {
96+
"browserTarget": "fledge:build:development"
97+
}
98+
},
99+
"defaultConfiguration": "development",
100+
"options": {
101+
"port": 4200,
102+
"publicHost": "http://localhost:4200",
103+
"extraWebpackConfig": "webpack.config.js"
104+
}
105+
},
106+
"extract-i18n": {
107+
"builder": "ngx-build-plus:extract-i18n",
108+
"options": {
109+
"browserTarget": "fledge:build",
110+
"extraWebpackConfig": "webpack.config.js"
111+
}
112+
},
113+
"test": {
114+
"builder": "@angular-devkit/build-angular:karma",
115+
"options": {
116+
"main": "src/test.ts",
117+
"polyfills": "src/polyfills.ts",
118+
"tsConfig": "tsconfig.spec.json",
119+
"karmaConfig": "karma.conf.js",
120+
"assets": [
121+
"src/favicon.ico",
122+
"src/assets"
123+
],
124+
"styles": [
125+
"src/assets/css/bulma.min.css",
126+
"src/assets/css/bulma-steps.min.css",
127+
"src/assets/css/font-awesome.min.css",
128+
"src/assets/css/bulma-tooltip.min.css",
129+
"src/styles.css"
130+
],
131+
"scripts": []
132+
}
133+
},
134+
"lint": {
135+
"builder": "@angular-devkit/build-angular:tslint",
136+
"options": {
137+
"tsConfig": [
138+
"src/tsconfig.app.json",
139+
"src/tsconfig.spec.json"
140+
],
141+
"exclude": [
142+
"**/node_modules/**"
143+
]
144+
}
145+
}
146+
}
147+
},
148+
"fledge-e2e": {
149+
"root": "",
150+
"sourceRoot": "",
151+
"projectType": "application",
152+
"architect": {
153+
"e2e": {
154+
"builder": "@angular-devkit/build-angular:protractor",
155+
"options": {
156+
"protractorConfig": "./protractor.conf.js",
157+
"devServerTarget": "fledge:serve"
158+
}
159+
},
160+
"lint": {
161+
"builder": "@angular-devkit/build-angular:tslint",
162+
"options": {
163+
"tsConfig": [
164+
"e2e/tsconfig.e2e.json"
165+
],
166+
"exclude": [
167+
"**/node_modules/**"
168+
]
169+
}
170+
}
171+
}
172+
}
173+
},
174+
"defaultProject": "fledge"
174175
}

‎docs/developers-guide.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ Set API base URL in `environments/environment.prod.ts`, you can always change it
114114
| @kurkle/color | 0.1.9 | 0.1.9 | MIT |
115115
| Animate.css | 4.1.1 | 4.1.1 | MIT |
116116
| ngx-build-plus | 13.0.1 | 14.0.0 | MIT |
117+
| bulma-toast | 2.4.2 | 2.4.2 | MIT |
117118

118119
## Update Dependencies
119120

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"@kurkle/color": "^0.1.9",
3636
"@ng-select/ng-select": "^8.1.1",
3737
"animate.css": "^4.1.1",
38+
"bulma-toast": "^2.4.2",
3839
"chart.js": "^2.9.4",
3940
"codemirror": "^5.65.3",
4041
"jsonlint-mod": "^1.7.6",

0 commit comments

Comments
 (0)