nick
2 years ago
164 changed files with 5925 additions and 6951 deletions
File diff suppressed because one or more lines are too long
@ -1,68 +1,69 @@ |
|||
{ |
|||
"root": true, |
|||
"ignorePatterns": [ |
|||
"projects/**/*" |
|||
], |
|||
"overrides": [ |
|||
{ |
|||
"files": [ |
|||
"*.ts" |
|||
], |
|||
"parserOptions": { |
|||
"project": [ |
|||
"tsconfig.json", |
|||
"e2e/tsconfig.json" |
|||
], |
|||
"createDefaultProgram": true |
|||
}, |
|||
"extends": [ |
|||
"plugin:@angular-eslint/ng-cli-compat", |
|||
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on", |
|||
"plugin:@angular-eslint/template/process-inline-templates" |
|||
], |
|||
"rules": { |
|||
"@typescript-eslint/explicit-member-accessibility": [ |
|||
"off", |
|||
{ |
|||
"accessibility": "explicit" |
|||
} |
|||
], |
|||
"arrow-parens": [ |
|||
"off", |
|||
"always" |
|||
], |
|||
"@angular-eslint/component-selector": [ |
|||
"error", |
|||
{ |
|||
"prefix": [ "tb" ] |
|||
} |
|||
], |
|||
"id-blacklist": [ |
|||
"error", |
|||
"any", |
|||
"Number", |
|||
"String", |
|||
"string", |
|||
"Boolean", |
|||
"boolean", |
|||
"Undefined", |
|||
"undefined" |
|||
], |
|||
"import/order": "off", |
|||
"@typescript-eslint/member-ordering": "off", |
|||
"no-underscore-dangle": "off", |
|||
"@typescript-eslint/naming-convention": "off", |
|||
"jsdoc/newline-after-description": 0 |
|||
} |
|||
}, |
|||
{ |
|||
"files": [ |
|||
"*.html" |
|||
], |
|||
"extends": [ |
|||
"plugin:@angular-eslint/template/recommended" |
|||
], |
|||
"rules": {} |
|||
} |
|||
] |
|||
"root": true, |
|||
"ignorePatterns": [ |
|||
"projects/**/*" |
|||
], |
|||
"overrides": [ |
|||
{ |
|||
"files": [ |
|||
"*.ts", |
|||
"*.tsx" |
|||
], |
|||
"parserOptions": { |
|||
"project": [ |
|||
"tsconfig.json" |
|||
], |
|||
"createDefaultProgram": true |
|||
}, |
|||
"extends": [ |
|||
"plugin:@angular-eslint/recommended", |
|||
"plugin:@angular-eslint/template/process-inline-templates" |
|||
], |
|||
"rules": { |
|||
"@typescript-eslint/explicit-member-accessibility": [ |
|||
"off", |
|||
{ |
|||
"accessibility": "explicit" |
|||
} |
|||
], |
|||
"arrow-parens": [ |
|||
"off", |
|||
"always" |
|||
], |
|||
"@angular-eslint/component-selector": [ |
|||
"error", |
|||
{ |
|||
"prefix": [ |
|||
"tb" |
|||
] |
|||
} |
|||
], |
|||
"id-blacklist": [ |
|||
"error", |
|||
"any", |
|||
"Number", |
|||
"String", |
|||
"string", |
|||
"Boolean", |
|||
"boolean", |
|||
"Undefined", |
|||
"undefined" |
|||
], |
|||
"import/order": "off", |
|||
"@typescript-eslint/member-ordering": "off", |
|||
"no-underscore-dangle": "off", |
|||
"@typescript-eslint/naming-convention": "off", |
|||
"jsdoc/newline-after-description": 0 |
|||
} |
|||
}, |
|||
{ |
|||
"files": [ |
|||
"*.html" |
|||
], |
|||
"extends": [ |
|||
"plugin:@angular-eslint/template/recommended" |
|||
], |
|||
"rules": {} |
|||
} |
|||
] |
|||
} |
|||
|
|||
@ -1,43 +0,0 @@ |
|||
/* |
|||
* Copyright © 2016-2024 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
// Protractor configuration file, see link for more information
|
|||
// https://github.com/angular/protractor/blob/master/lib/config.ts
|
|||
|
|||
const { SpecReporter } = require("jasmine-spec-reporter"); |
|||
|
|||
exports.config = { |
|||
allScriptsTimeout: 11000, |
|||
specs: [ |
|||
"./src/**/*.e2e-spec.ts", |
|||
], |
|||
capabilities: { |
|||
"browserName": "chrome", |
|||
}, |
|||
directConnect: true, |
|||
baseUrl: "http://localhost:4200/", |
|||
framework: "jasmine", |
|||
jasmineNodeOpts: { |
|||
showColors: true, |
|||
defaultTimeoutInterval: 30000, |
|||
print: function() {}, |
|||
}, |
|||
onPrepare() { |
|||
require("ts-node").register({ |
|||
project: require("path").join(__dirname, "./tsconfig.e2e.json"), |
|||
}); |
|||
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); |
|||
}, |
|||
}; |
|||
@ -1,39 +0,0 @@ |
|||
///
|
|||
/// Copyright © 2016-2024 The Thingsboard Authors
|
|||
///
|
|||
/// Licensed under the Apache License, Version 2.0 (the "License");
|
|||
/// you may not use this file except in compliance with the License.
|
|||
/// You may obtain a copy of the License at
|
|||
///
|
|||
/// http://www.apache.org/licenses/LICENSE-2.0
|
|||
///
|
|||
/// Unless required by applicable law or agreed to in writing, software
|
|||
/// distributed under the License is distributed on an "AS IS" BASIS,
|
|||
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||
/// See the License for the specific language governing permissions and
|
|||
/// limitations under the License.
|
|||
///
|
|||
|
|||
import { AppPage } from './app.po'; |
|||
import { browser, logging } from 'protractor'; |
|||
|
|||
describe('workspace-project App', () => { |
|||
let page: AppPage; |
|||
|
|||
beforeEach(() => { |
|||
page = new AppPage(); |
|||
}); |
|||
|
|||
it('should display welcome message', () => { |
|||
page.navigateTo(); |
|||
expect(page.getTitleText()).toEqual('Welcome to tb-license-server!'); |
|||
}); |
|||
|
|||
afterEach(async () => { |
|||
// Assert that there are no errors emitted from the browser
|
|||
const logs = await browser.manage().logs().get(logging.Type.BROWSER); |
|||
expect(logs).not.toContain(jasmine.objectContaining({ |
|||
level: logging.Level.SEVERE, |
|||
} as logging.Entry)); |
|||
}); |
|||
}); |
|||
@ -1,27 +0,0 @@ |
|||
///
|
|||
/// Copyright © 2016-2024 The Thingsboard Authors
|
|||
///
|
|||
/// Licensed under the Apache License, Version 2.0 (the "License");
|
|||
/// you may not use this file except in compliance with the License.
|
|||
/// You may obtain a copy of the License at
|
|||
///
|
|||
/// http://www.apache.org/licenses/LICENSE-2.0
|
|||
///
|
|||
/// Unless required by applicable law or agreed to in writing, software
|
|||
/// distributed under the License is distributed on an "AS IS" BASIS,
|
|||
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||
/// See the License for the specific language governing permissions and
|
|||
/// limitations under the License.
|
|||
///
|
|||
|
|||
import { browser, by, element } from 'protractor'; |
|||
|
|||
export class AppPage { |
|||
navigateTo() { |
|||
return browser.get(browser.baseUrl) as Promise<any>; |
|||
} |
|||
|
|||
getTitleText() { |
|||
return element(by.css('tb-root h1')).getText() as Promise<string>; |
|||
} |
|||
} |
|||
@ -1,13 +0,0 @@ |
|||
{ |
|||
"extends": "../tsconfig.json", |
|||
"compilerOptions": { |
|||
"outDir": "../out-tsc/app", |
|||
"module": "commonjs", |
|||
"target": "es5", |
|||
"types": [ |
|||
"jasmine", |
|||
"jasminewd2", |
|||
"node" |
|||
] |
|||
} |
|||
} |
|||
@ -1,8 +1,8 @@ |
|||
diff --git a/node_modules/@angular/core/fesm2020/core.mjs b/node_modules/@angular/core/fesm2020/core.mjs
|
|||
index e9a9b75..17044d9 100755
|
|||
--- a/node_modules/@angular/core/fesm2020/core.mjs
|
|||
+++ b/node_modules/@angular/core/fesm2020/core.mjs
|
|||
@@ -11053,13 +11053,13 @@ function findDirectiveDefMatches(tView, tNode) {
|
|||
diff --git a/node_modules/@angular/core/fesm2022/core.mjs b/node_modules/@angular/core/fesm2022/core.mjs
|
|||
index 0fa881f..b844dfa 100755
|
|||
--- a/node_modules/@angular/core/fesm2022/core.mjs
|
|||
+++ b/node_modules/@angular/core/fesm2022/core.mjs
|
|||
@@ -12868,13 +12868,13 @@ function findDirectiveDefMatches(tView, tNode) {
|
|||
if (isNodeMatchingSelectorList(tNode, def.selectors, /* isProjectionMode */ false)) { |
|||
matches || (matches = []); |
|||
if (isComponentDef(def)) { |
|||
File diff suppressed because one or more lines are too long
@ -1,51 +0,0 @@ |
|||
diff --git a/node_modules/@mat-datetimepicker/core/esm2020/datetimepicker/clock.mjs b/node_modules/@mat-datetimepicker/core/esm2020/datetimepicker/clock.mjs
|
|||
index e3457ea..a069460 100644
|
|||
--- a/node_modules/@mat-datetimepicker/core/esm2020/datetimepicker/clock.mjs
|
|||
+++ b/node_modules/@mat-datetimepicker/core/esm2020/datetimepicker/clock.mjs
|
|||
@@ -259,9 +259,9 @@ export class MatDatetimepickerClockComponent {
|
|||
value = 0; |
|||
} |
|||
// Don't close the minutes view if an invalid minute is clicked. |
|||
- if (!this._minutes.find((m) => m?.['value'] === value)?.['enabled']) {
|
|||
- return;
|
|||
- }
|
|||
+ // if (!this._minutes.find((m) => m?.['value'] === value)?.['enabled']) {
|
|||
+ // return;
|
|||
+ // }
|
|||
date = this._adapter.createDatetime(this._adapter.getYear(this.activeDate), this._adapter.getMonth(this.activeDate), this._adapter.getDate(this.activeDate), this._adapter.getHour(this.activeDate), value); |
|||
} |
|||
this._timeChanged = true; |
|||
diff --git a/node_modules/@mat-datetimepicker/core/fesm2015/mat-datetimepicker-core.mjs b/node_modules/@mat-datetimepicker/core/fesm2015/mat-datetimepicker-core.mjs
|
|||
index 7699ff6..01aad13 100644
|
|||
--- a/node_modules/@mat-datetimepicker/core/fesm2015/mat-datetimepicker-core.mjs
|
|||
+++ b/node_modules/@mat-datetimepicker/core/fesm2015/mat-datetimepicker-core.mjs
|
|||
@@ -951,9 +951,9 @@ class MatDatetimepickerClockComponent {
|
|||
value = 0; |
|||
} |
|||
// Don't close the minutes view if an invalid minute is clicked. |
|||
- if (!((_b = this._minutes.find((m) => (m === null || m === void 0 ? void 0 : m['value']) === value)) === null || _b === void 0 ? void 0 : _b['enabled'])) {
|
|||
- return;
|
|||
- }
|
|||
+ // if (!((_b = this._minutes.find((m) => (m === null || m === void 0 ? void 0 : m['value']) === value)) === null || _b === void 0 ? void 0 : _b['enabled'])) {
|
|||
+ // return;
|
|||
+ // }
|
|||
date = this._adapter.createDatetime(this._adapter.getYear(this.activeDate), this._adapter.getMonth(this.activeDate), this._adapter.getDate(this.activeDate), this._adapter.getHour(this.activeDate), value); |
|||
} |
|||
this._timeChanged = true; |
|||
diff --git a/node_modules/@mat-datetimepicker/core/fesm2020/mat-datetimepicker-core.mjs b/node_modules/@mat-datetimepicker/core/fesm2020/mat-datetimepicker-core.mjs
|
|||
index 809a57d..f712b84 100644
|
|||
--- a/node_modules/@mat-datetimepicker/core/fesm2020/mat-datetimepicker-core.mjs
|
|||
+++ b/node_modules/@mat-datetimepicker/core/fesm2020/mat-datetimepicker-core.mjs
|
|||
@@ -946,9 +946,9 @@ class MatDatetimepickerClockComponent {
|
|||
value = 0; |
|||
} |
|||
// Don't close the minutes view if an invalid minute is clicked. |
|||
- if (!this._minutes.find((m) => m?.['value'] === value)?.['enabled']) {
|
|||
- return;
|
|||
- }
|
|||
+ // if (!this._minutes.find((m) => m?.['value'] === value)?.['enabled']) {
|
|||
+ // return;
|
|||
+ // }
|
|||
date = this._adapter.createDatetime(this._adapter.getYear(this.activeDate), this._adapter.getMonth(this.activeDate), this._adapter.getDate(this.activeDate), this._adapter.getHour(this.activeDate), value); |
|||
} |
|||
this._timeChanged = true; |
|||
@ -0,0 +1,34 @@ |
|||
diff --git a/node_modules/@mat-datetimepicker/core/esm2022/datetimepicker/clock.mjs b/node_modules/@mat-datetimepicker/core/esm2022/datetimepicker/clock.mjs
|
|||
index 7ecfae7..08363d3 100644
|
|||
--- a/node_modules/@mat-datetimepicker/core/esm2022/datetimepicker/clock.mjs
|
|||
+++ b/node_modules/@mat-datetimepicker/core/esm2022/datetimepicker/clock.mjs
|
|||
@@ -259,9 +259,9 @@ export class MatDatetimepickerClockComponent {
|
|||
value = 0; |
|||
} |
|||
// Don't close the minutes view if an invalid minute is clicked. |
|||
- if (!this._minutes.find((m) => m?.['value'] === value)?.['enabled']) {
|
|||
- return;
|
|||
- }
|
|||
+ // if (!this._minutes.find((m) => m?.['value'] === value)?.['enabled']) {
|
|||
+ // return;
|
|||
+ // }
|
|||
date = this._adapter.createDatetime(this._adapter.getYear(this.activeDate), this._adapter.getMonth(this.activeDate), this._adapter.getDate(this.activeDate), this._adapter.getHour(this.activeDate), value); |
|||
} |
|||
this._timeChanged = true; |
|||
diff --git a/node_modules/@mat-datetimepicker/core/fesm2022/mat-datetimepicker-core.mjs b/node_modules/@mat-datetimepicker/core/fesm2022/mat-datetimepicker-core.mjs
|
|||
index 00f4a52..df688e3 100644
|
|||
--- a/node_modules/@mat-datetimepicker/core/fesm2022/mat-datetimepicker-core.mjs
|
|||
+++ b/node_modules/@mat-datetimepicker/core/fesm2022/mat-datetimepicker-core.mjs
|
|||
@@ -946,9 +946,9 @@ class MatDatetimepickerClockComponent {
|
|||
value = 0; |
|||
} |
|||
// Don't close the minutes view if an invalid minute is clicked. |
|||
- if (!this._minutes.find((m) => m?.['value'] === value)?.['enabled']) {
|
|||
- return;
|
|||
- }
|
|||
+ // if (!this._minutes.find((m) => m?.['value'] === value)?.['enabled']) {
|
|||
+ // return;
|
|||
+ // }
|
|||
date = this._adapter.createDatetime(this._adapter.getYear(this.activeDate), this._adapter.getMonth(this.activeDate), this._adapter.getDate(this.activeDate), this._adapter.getHour(this.activeDate), value); |
|||
} |
|||
this._timeChanged = true; |
|||
@ -1,15 +1,15 @@ |
|||
diff --git a/node_modules/angular-gridster2/fesm2020/angular-gridster2.mjs b/node_modules/angular-gridster2/fesm2020/angular-gridster2.mjs
|
|||
index cf4e220..df51c91 100644
|
|||
--- a/node_modules/angular-gridster2/fesm2020/angular-gridster2.mjs
|
|||
+++ b/node_modules/angular-gridster2/fesm2020/angular-gridster2.mjs
|
|||
diff --git a/node_modules/angular-gridster2/fesm2022/angular-gridster2.mjs b/node_modules/angular-gridster2/fesm2022/angular-gridster2.mjs
|
|||
index 0dcd873..e99b602 100644
|
|||
--- a/node_modules/angular-gridster2/fesm2022/angular-gridster2.mjs
|
|||
+++ b/node_modules/angular-gridster2/fesm2022/angular-gridster2.mjs
|
|||
@@ -666,8 +666,8 @@ class GridsterRenderer {
|
|||
renderer.setStyle(el, DirTypes.LTR ? 'margin-right' : 'margin-left', ''); |
|||
} |
|||
else { |
|||
- const x = Math.round(this.gridster.curColWidth * item.x);
|
|||
- const y = Math.round(this.gridster.curRowHeight * item.y);
|
|||
+ const x = this.gridster.curColWidth * item.x;
|
|||
+ const y = this.gridster.curRowHeight * item.y;
|
|||
const width = this.gridster.curColWidth * item.cols - this.gridster.$options.margin; |
|||
const height = this.gridster.curRowHeight * item.rows - this.gridster.$options.margin; |
|||
// set the cell style |
|||
renderer.setStyle(el, DirTypes.LTR ? 'margin-right' : 'margin-left', ''); |
|||
} |
|||
else { |
|||
- const x = Math.round(this.gridster.curColWidth * item.x);
|
|||
- const y = Math.round(this.gridster.curRowHeight * item.y);
|
|||
+ const x = this.gridster.curColWidth * item.x;
|
|||
+ const y = this.gridster.curRowHeight * item.y;
|
|||
const width = this.gridster.curColWidth * item.cols - this.gridster.$options.margin; |
|||
const height = this.gridster.curRowHeight * item.rows - this.gridster.$options.margin; |
|||
// set the cell style |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue