Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
updated with 2.0.0 for angular 11
Browse files Browse the repository at this point in the history
  • Loading branch information
DarpanLalani committed Dec 22, 2021
1 parent 7315cb9 commit 4586b99
Show file tree
Hide file tree
Showing 11 changed files with 11,813 additions and 33,255 deletions.
44,946 changes: 11,753 additions & 33,193 deletions package-lock.json

Large diffs are not rendered by default.

81 changes: 40 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gp-processing-widget",
"version": "1.2.0",
"description": "This is an Angular 8 widget, which is designed to display the current process state based on the latest event. ",
"version": "2.0.0",
"description": "This is an Angular 11 widget, which is designed to display the current process state based on the latest event. ",
"author": "Khushi Khanna - Software AG, Global Presales",
"license": "Apache 2.0",
"scripts": {
Expand All @@ -19,47 +19,46 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.4",
"@angular/common": "~8.2.4",
"@angular/compiler": "~8.2.4",
"@angular/core": "~8.2.4",
"@angular/forms": "~8.2.4",
"@angular/material": "^8.2.3",
"@angular/platform-browser": "~8.2.9",
"@angular/platform-browser-dynamic": "~8.2.9",
"@angular/router": "~8.2.4",
"@angular/upgrade": "8.2.13",
"@c8y/client": "^1006.3.0",
"@c8y/ng1-modules": "^1006.3.0",
"@c8y/ngx-components": "^1006.3.0",
"@c8y/style": "1006.3.0",
"@ng-select/ng-select": "^3.7.3"
"@angular/animations": "~11.1.2",
"@angular/common": "~11.1.2",
"@angular/compiler": "~11.1.2",
"@angular/core": "~11.1.2",
"@angular/forms": "~11.1.2",
"@angular/material": "^11.2.13",
"@angular/platform-browser": "~11.1.2",
"@angular/platform-browser-dynamic": "~11.1.2",
"@angular/router": "~11.1.2",
"@angular/upgrade": "11.1.2",
"@c8y/client": "^1011.0.12",
"@c8y/ng1-modules": "^1011.0.12",
"@c8y/ngx-components": "^1011.0.12",
"@c8y/style": "1011.0.12",
"@ng-select/ng-select": "^6.1.0",
"font-awesome": "^4.7.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.8",
"@angular-devkit/build-angular": "~0.1101.2",
"@angular-devkit/build-ng-packagr": "~0.803.28",
"@angular/cdk": "8.2.3",
"@angular/cli": "~8.3.2",
"@angular/compiler-cli": "~8.2.4",
"@angular/language-service": "~8.2.4",
"@types/jasmine": "~3.3.8",
"@angular/cdk": "11.2.13",
"@angular/cli": "~11.1.2",
"@angular/compiler-cli": "~11.1.2",
"@angular/language-service": "~11.1.2",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "^5.0.0",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"@types/node": "~12.11.1",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.2.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tsickle": "^0.37.0",
"tslint": "~5.15.0",
"typescript": "~3.5.3",
"ng-packagr": "^9.1.1",
"@ng-select/ng-select": "^3.7.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"protractor": "~7.0.0",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~4.1.2",
"ng-packagr": "^11.0.0",
"css-loader": "^3.5.3",
"del": "^5.1.0",
"delay": "^4.3.0",
Expand All @@ -71,12 +70,12 @@
"gulp-replace": "^1.0.0",
"gulp-zip": "^5.0.1",
"moment": "^2.26.0",
"rxjs": "~6.4.0",
"tslib": "^1.10.0",
"rxjs": "~6.6.3",
"tslib": "^2.0.0",
"url-loader": "^4.1.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-external-import": "^2.2.3",
"zone.js": "~0.9.1"
"zone.js": "~0.11.3"
}
}
8 changes: 4 additions & 4 deletions projects/gp-processing/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "gp-processing",
"version": "1.2.0",
"description": "This is an Angular 8 widget, which is designed to display the current process state based on the latest event. ",
"version": "2.0.0",
"description": "This is an Angular 11 widget, which is designed to display the current process state based on the latest event. ",
"author": "Khushi Khanna - Software AG, Global Presales",
"license": "Apache 2.0",
"peerDependencies": {
"@angular/common": "^8.2.14",
"@angular/core": "^8.2.14"
"@angular/common": "^11.1.2",
"@angular/core": "^11.1.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ export class GpLibProcessingWidgetComponent implements OnInit {
// fetches the events for each device based of date

// tslint:disable-next-line: deprecation
this.events.listBySource$(deviceId, { pageSize: 3,
const filter = {
pageSize: 3,
type: this.indoorEventType,
dateTo: now.add(1, 'days').format('YYYY-MM-DD'),
dateFrom: '1970-01-01'
},
{
hot: true,
realtime: true,
}).subscribe( res => {
dateFrom: '1970-01-01',
source: deviceId
}
this.events.list(filter)
.then( res => {
const lastEvent = res[0];
if (lastEvent && lastEvent.type === this.indoorEventType) {
if (lastEvent.hasOwnProperty(this.fieldName)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { GpLibProcessingWidgetComponent } from './gp-lib-processing-widget.compo
import { CoreModule, HOOK_COMPONENTS} from '@c8y/ngx-components';
import {GpLibProcessingConfig} from './gp-lib-processing-widget-config.component';
import { MatTableModule } from '@angular/material/table';
import { MatStepperModule } from '@angular/material/stepper';
import * as preview from './preview-image';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {IconSelectorComponent} from './icon-selector/icon-selector.component';
Expand All @@ -30,7 +29,6 @@ import { NgSelectModule } from '@ng-select/ng-select';
declarations: [GpLibProcessingWidgetComponent, GpLibProcessingConfig, IconSelectorComponent],
imports: [
CoreModule,
MatStepperModule,
MatTableModule,
FormsModule,
ReactiveFormsModule,
Expand Down
2 changes: 1 addition & 1 deletion runtime/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function clean() {

const compile = series(
function buildAngularLibrary() { return ngPackagr.build({project: './ng-package.json'}) },
function separateWebpackBuildSrc() { return fs.copy('./dist/widget-library/fesm5', './dist/bundle-src') },
function separateWebpackBuildSrc() { return fs.copy('./dist/widget-library/fesm2015', './dist/bundle-src') },
function importCustomCss() {
return src(['./dist/bundle-src/custom-widget.js'])
.pipe(inject.before('import', "import '~styles/index.css';\n"))
Expand Down
2 changes: 1 addition & 1 deletion runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dist\\bundle-src\\custom-widget.js": "processing-runtime-widget-CustomWidget",
"dist/bundle-src/custom-widget.js": "processing-runtime-widget-CustomWidget"
},
"version": "1.2.0",
"version": "2.0.0",
"description": "Runtime package.json for library widget (written by Software AG Global Presales)",
"author": "Darpankumar Lalani - Software AG, Global Presales",
"license": "Apache 2.0"
Expand Down
2 changes: 1 addition & 1 deletion runtime/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const URLImportPlugin = require("webpack-external-import/webpack");
const path = require('path');

module.exports = {
mode: 'production',
mode: 'development',
devtool: 'source-map',
entry: {
[require('./cumulocity.json').contextPath]: './dist/bundle-src/custom-widget.js'
Expand Down
4 changes: 2 additions & 2 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!-- <lib-gp-lib-processing-widget></lib-gp-lib-processing-widget> -->
<lib-gp-lib-processing-widget-config></lib-gp-lib-processing-widget-config>
<lib-gp-lib-processing-widget></lib-gp-lib-processing-widget>
<!-- <lib-gp-lib-processing-widget-config></lib-gp-lib-processing-widget-config> -->
2 changes: 1 addition & 1 deletion src/proxy.conf.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/": {
"target": "",
"target": "/",
"secure": false,
"changeOrigin": true,
"logLevel": "info"
Expand Down
5 changes: 3 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"target": "es6",
"typeRoots": [
"node_modules/@types"
],
Expand All @@ -29,7 +29,8 @@
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
"strictInjectionParameters": true,
"enableIvy": false
},
"exclude":["dist"]
}

0 comments on commit 4586b99

Please sign in to comment.