Skip to content

Commit 0600c0e

Browse files
Update angular to 20 part 1
1 parent 0aadfc9 commit 0600c0e

File tree

393 files changed

+10084
-9282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

393 files changed

+10084
-9282
lines changed

.github/ISSUE_TEMPLATE/fejl----bug-report.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,41 @@ assignees: ''
1111
[Indmeld kun 1 fejl pr. issue og tjek gerne om fejlen allerede er indmeldt //Only one bug per issue and make sure to check if the issue already exists.]
1212

1313
### Beskriv fejlen // Describe the bug
14+
1415
Vær klar og præcis i din beskrivelse af fejlen // A clear and concise description of what the bug is.
1516

1617
### Genskab fejlen // To Reproduce
18+
1719
Sådan genskabes fejlen // Steps to reproduce the behavior:
20+
1821
1. Go to '...'
1922
2. Click on '....'
2023
3. Scroll down to '....'
2124
4. See error
2225

2326
### Forventet funktion // Expected behavior
27+
2428
Beskriv klart og præcist hvordan du forventede, at det fungerede // A clear and concise description of what you expected to happen.
2529

2630
### Screenshots
31+
2732
Tilføj om muligt et eller flere billeder, der viser fejlen // If applicable, add screenshots to help explain your problem.
2833

2934
### URL
35+
3036
Angiv den URL, som fejlen opstår på - fx "../gateways/gateway-detail/60c5a8fffe7611a9" // Enter the URL at which the bug occurs - eg "../gateways/gateway-detail/60c5a8fffe7611a9".
3137

3238
### Desktop
39+
3340
Udfyld venligst følgende // Please complete the following information:
34-
Styresystem/OS: [e.g. WIN10]
35-
Browser: [e.g. Chrome, Safari]
36-
Version: [e.g. 22]
41+
Styresystem/OS: [e.g. WIN10]
42+
Browser: [e.g. Chrome, Safari]
43+
Version: [e.g. 22]
3744

3845
### Log
46+
3947
Tilføj om muligt relevant log med fejlbeskrivelser // If applicable, add relevant log with error descriptions.
4048

4149
### Supplerende oplysninger (Additional context)
50+
4251
Tilføj andre detaljer vedrørende fejlen // Add any other context about the problem here.

.github/ISSUE_TEMPLATE/ny-feature----feature-request.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ assignees: ''
1111
[Brug dette issue til at ønske tilføjelse af ny funktionalitet eller andet, der ikke allerede findes i OS2iot. Opret et issue pr. nyt ønske // Use this issue to request new functionality or other that doesn't already exist in OS2iot. Please only submit one request per issue.]
1212

1313
### Skyldes dit forslag et særligt behov eller et problem? Beskriv venligst // Is your feature request related to a certain need or problem? Please describe
14+
1415
Beskriv problemet klart og præcist. Fx jeg har ofte brug for, at kunne... // A clear and concise description of what the need or problem is. Ex. I often need to be able to...
1516

1617
### Beskriv det du gerne ser tilføjet til OS2iot // Describe the solution you'd like to add to OS2iot
18+
1719
Giv en præcis beskrivelse af, hvad der skal tilføjes // A clear and concise description of what you want to add to the design system.
1820

1921
### Beskriv de alternativer du har overvejet // Describe alternatives you've considered
22+
2023
Giv en kort og præcis beskrivelse af alle de alternativer du har overvejet og hvorfor du foreslår den løsning du gør // A clear and concise description of any alternative solutions or features you've considered, and why you've settled on that solution.
2124

2225
### Supplerende bemærkninger // Additional context
26+
2327
Tilføj yderligere beskrivelser og billeder her, der forklarer dit forslag // Add any other context or screenshots about the feature request here.

.vscode/launch.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"version": "0.2.0",
3-
"configurations": [{
3+
"configurations": [
4+
{
45
"type": "firefox",
56
"request": "launch",
67
"reAttach": true,
@@ -14,6 +15,6 @@
1415
"request": "launch",
1516
"url": "http://localhost:4200",
1617
"webRoot": "${workspaceFolder}"
17-
},
18+
}
1819
]
1920
}

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"typescript.tsdk": "node_modules\\typescript\\lib"
2+
"typescript.tsdk": "node_modules\\typescript\\lib"
33
}

angular.json

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
"assets": [
2929
"src/favicon.ico",
3030
"src/assets",
31-
{ "glob": "**/*", "input": "node_modules/monaco-editor", "output": "/assets/monaco/" }
31+
{
32+
"glob": "**/*",
33+
"input": "node_modules/monaco-editor",
34+
"output": "/assets/monaco/"
35+
}
3236
],
3337
"styles": [
3438
"./node_modules/animate.css/animate.min.css",
@@ -97,8 +101,13 @@
97101
"polyfills": "src/polyfills.ts",
98102
"tsConfig": "tsconfig.spec.json",
99103
"karmaConfig": "karma.conf.js",
100-
"assets": ["src/favicon.ico", "src/assets"],
101-
"styles": ["src/styles.scss"],
104+
"assets": [
105+
"src/favicon.ico",
106+
"src/assets"
107+
],
108+
"styles": [
109+
"src/styles.scss"
110+
],
102111
"scripts": []
103112
}
104113
},
@@ -119,5 +128,31 @@
119128
},
120129
"cli": {
121130
"analytics": "5e34252a-5088-421b-bb34-6ef89cd9f167"
131+
},
132+
"schematics": {
133+
"@schematics/angular:component": {
134+
"type": "component"
135+
},
136+
"@schematics/angular:directive": {
137+
"type": "directive"
138+
},
139+
"@schematics/angular:service": {
140+
"type": "service"
141+
},
142+
"@schematics/angular:guard": {
143+
"typeSeparator": "."
144+
},
145+
"@schematics/angular:interceptor": {
146+
"typeSeparator": "."
147+
},
148+
"@schematics/angular:module": {
149+
"typeSeparator": "."
150+
},
151+
"@schematics/angular:pipe": {
152+
"typeSeparator": "."
153+
},
154+
"@schematics/angular:resolver": {
155+
"typeSeparator": "."
156+
}
122157
}
123158
}

e2e/protractor.conf.js

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,29 @@
22
// Protractor configuration file, see link for more information
33
// https://github.com/angular/protractor/blob/master/lib/config.ts
44

5-
const { SpecReporter } = require('jasmine-spec-reporter');
5+
const { SpecReporter } = require("jasmine-spec-reporter");
66

77
/**
88
* @type { import("protractor").Config }
99
*/
1010
exports.config = {
11-
allScriptsTimeout: 11000,
12-
specs: ['./src/**/*.e2e-spec.ts'],
13-
capabilities: {
14-
browserName: 'chrome',
15-
},
16-
directConnect: true,
17-
baseUrl: 'http://localhost:4200/',
18-
framework: 'jasmine',
19-
jasmineNodeOpts: {
20-
showColors: true,
21-
defaultTimeoutInterval: 30000,
22-
print: function () {},
23-
},
24-
onPrepare() {
25-
require('ts-node').register({
26-
project: require('path').join(__dirname, './tsconfig.json'),
27-
});
28-
jasmine
29-
.getEnv()
30-
.addReporter(
31-
new SpecReporter({ spec: { displayStacktrace: true } })
32-
);
33-
},
11+
allScriptsTimeout: 11000,
12+
specs: ["./src/**/*.e2e-spec.ts"],
13+
capabilities: {
14+
browserName: "chrome",
15+
},
16+
directConnect: true,
17+
baseUrl: "http://localhost:4200/",
18+
framework: "jasmine",
19+
jasmineNodeOpts: {
20+
showColors: true,
21+
defaultTimeoutInterval: 30000,
22+
print: function () {},
23+
},
24+
onPrepare() {
25+
require("ts-node").register({
26+
project: require("path").join(__dirname, "./tsconfig.json"),
27+
});
28+
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
29+
},
3430
};

e2e/src/app.e2e-spec.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
import { AppPage } from './app.po';
2-
import { browser, logging } from 'protractor';
1+
import { AppPage } from "./app.po";
2+
import { browser, logging } from "protractor";
33

4-
describe('workspace-project App', () => {
5-
let page: AppPage;
4+
describe("workspace-project App", () => {
5+
let page: AppPage;
66

7-
beforeEach(() => {
8-
page = new AppPage();
9-
});
7+
beforeEach(() => {
8+
page = new AppPage();
9+
});
1010

11-
it('should display welcome message', () => {
12-
page.navigateTo();
13-
expect(page.getTitleText()).toEqual('OS2IoT-frontend app is running!');
14-
});
11+
it("should display welcome message", () => {
12+
page.navigateTo();
13+
expect(page.getTitleText()).toEqual("OS2IoT-frontend app is running!");
14+
});
1515

16-
afterEach(async () => {
17-
// Assert that there are no errors emitted from the browser
18-
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
19-
expect(logs).not.toContain(
20-
jasmine.objectContaining({
21-
level: logging.Level.SEVERE,
22-
} as logging.Entry)
23-
);
24-
});
16+
afterEach(async () => {
17+
// Assert that there are no errors emitted from the browser
18+
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
19+
expect(logs).not.toContain(
20+
jasmine.objectContaining({
21+
level: logging.Level.SEVERE,
22+
} as logging.Entry)
23+
);
24+
});
2525
});

e2e/src/app.po.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import { browser, by, element } from 'protractor';
1+
import { browser, by, element } from "protractor";
22

33
export class AppPage {
4-
navigateTo(): Promise<unknown> {
5-
return browser.get(browser.baseUrl) as Promise<unknown>;
6-
}
4+
navigateTo(): Promise<unknown> {
5+
return browser.get(browser.baseUrl) as Promise<unknown>;
6+
}
77

8-
getTitleText(): Promise<string> {
9-
return element(by.css('app-root .content span')).getText() as Promise<
10-
string
11-
>;
12-
}
8+
getTitleText(): Promise<string> {
9+
return element(by.css("app-root .content span")).getText() as Promise<string>;
10+
}
1311
}

e2e/tsconfig.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
2-
"extends": "../tsconfig.json",
3-
"compilerOptions": {
4-
"outDir": "../out-tsc/e2e",
5-
"module": "commonjs",
6-
"target": "es2018",
7-
"types": ["jasmine", "jasminewd2", "node"]
8-
}
2+
"extends": "../tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "../out-tsc/e2e",
5+
"module": "commonjs",
6+
"target": "es2018",
7+
"types": [
8+
"jasmine",
9+
"jasminewd2",
10+
"node"
11+
]
12+
}
913
}

karma.conf.js

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
// https://karma-runner.github.io/1.0/config/configuration-file.html
33

44
module.exports = function (config) {
5-
config.set({
6-
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
8-
plugins: [
9-
require('karma-jasmine'),
10-
require('karma-chrome-launcher'),
11-
require('karma-jasmine-html-reporter'),
12-
require('karma-coverage-istanbul-reporter'),
13-
require('@angular-devkit/build-angular/plugins/karma'),
14-
],
15-
client: {
16-
clearContext: false, // leave Jasmine Spec Runner output visible in browser
17-
},
18-
coverageIstanbulReporter: {
19-
dir: require('path').join(__dirname, './coverage/OS2IoT-frontend'),
20-
reports: ['html', 'lcovonly', 'text-summary'],
21-
fixWebpackSourcePaths: true,
22-
},
23-
reporters: ['progress', 'kjhtml'],
24-
port: 9876,
25-
colors: true,
26-
logLevel: config.LOG_INFO,
27-
autoWatch: true,
28-
browsers: ['Chrome'],
29-
singleRun: false,
30-
restartOnFileChange: true,
31-
});
5+
config.set({
6+
basePath: "",
7+
frameworks: ["jasmine", "@angular-devkit/build-angular"],
8+
plugins: [
9+
require("karma-jasmine"),
10+
require("karma-chrome-launcher"),
11+
require("karma-jasmine-html-reporter"),
12+
require("karma-coverage-istanbul-reporter"),
13+
require("@angular-devkit/build-angular/plugins/karma"),
14+
],
15+
client: {
16+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
17+
},
18+
coverageIstanbulReporter: {
19+
dir: require("path").join(__dirname, "./coverage/OS2IoT-frontend"),
20+
reports: ["html", "lcovonly", "text-summary"],
21+
fixWebpackSourcePaths: true,
22+
},
23+
reporters: ["progress", "kjhtml"],
24+
port: 9876,
25+
colors: true,
26+
logLevel: config.LOG_INFO,
27+
autoWatch: true,
28+
browsers: ["Chrome"],
29+
singleRun: false,
30+
restartOnFileChange: true,
31+
});
3232
};

0 commit comments

Comments
 (0)