-
-
-
-
-
-
-
- {{ context.value | date: "medium" }}
-
-
-
-
-
-
- ACCEPT
-
-
- CANCEL
-
-
-
-
-
+
Device Registration Lookup
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/lookup/device-registration-lookup/device-registration-lookup.component.ts b/src/modules/lookup/device-registration-lookup/device-registration-lookup.component.ts
index 8dc4a47..5bff861 100644
--- a/src/modules/lookup/device-registration-lookup/device-registration-lookup.component.ts
+++ b/src/modules/lookup/device-registration-lookup/device-registration-lookup.component.ts
@@ -1,191 +1,191 @@
-import { Component, EventEmitter } from '@angular/core';
-import { IDeviceRegistration } from '@c8y/client';
-import { AlertService, Column, ColumnDataType, ModalService } from '@c8y/ngx-components';
-import { TenantSpecificDetails } from '@models/tenant-specific-details';
-import { DeviceRegistrationDetailsService } from '@services/device-registration-details.service';
-import { FakeMicroserviceService } from '@services/fake-microservice.service';
-import { DeviceRegistrationTableDatasourceService } from './device-registration-table-datasource.service';
-import { BsModalService } from 'ngx-bootstrap/modal';
-import { filter, take } from 'rxjs/operators';
-import { Subject } from 'rxjs';
-import { AddDeviceRegistrationModalComponent } from '../modals/add-device-registration-modal/add-device-registration-modal.component';
-
-@Component({
- providers: [DeviceRegistrationTableDatasourceService],
- selector: 'ps-device-registration-lookup',
- templateUrl: './device-registration-lookup.component.html'
-})
-export class DeviceRegistrationLookupComponent {
- columns: Column[];
- refresh = new EventEmitter();
-
- constructor(
- public datasource: DeviceRegistrationTableDatasourceService,
- private credService: FakeMicroserviceService,
- private c8yModalService: ModalService,
- private alertService: AlertService,
- private modalService: BsModalService,
- private deviceRegistrationDetailsService: DeviceRegistrationDetailsService
- ) {
- this.columns = this.getDefaultColumns();
- }
-
- getDefaultColumns(): Column[] {
- return [
- {
- name: 'tenant',
- header: 'Tenant Id',
- path: 'tenantId',
- dataType: ColumnDataType.TextShort,
- sortable: true,
- filterable: true
- },
- {
- name: 'id',
- header: 'id',
- path: 'data.id',
- dataType: ColumnDataType.TextShort,
- sortable: true,
- filterable: true
- },
- {
- name: 'status',
- header: 'Status',
- path: 'data.status',
- dataType: ColumnDataType.TextShort,
- sortable: true,
- filterable: true
- },
- {
- name: 'owner',
- header: 'Owner',
- path: 'data.owner',
- dataType: ColumnDataType.TextShort,
- sortable: true,
- filterable: true
- },
- {
- name: 'creationTime',
- header: 'Creation Time',
- path: 'data.creationTime',
- dataType: ColumnDataType.TextShort,
- sortable: true,
- filterable: false
- },
- // {
- // name: 'email',
- // header: 'E-Mail',
- // path: 'data.email',
- // dataType: ColumnDataType.TextShort,
- // sortable: false,
- // filterable: true
- // },
- // {
- // name: 'firstName',
- // header: 'Firstname',
- // path: 'data.firstName',
- // dataType: ColumnDataType.TextShort,
- // sortable: false,
- // filterable: true
- // },
- // {
- // name: 'lastName',
- // header: 'Lastname',
- // path: 'data.lastName',
- // dataType: ColumnDataType.TextShort,
- // sortable: false,
- // filterable: true
- // },
- {
- header: 'Actions',
- name: 'actions1',
- sortable: false
- }
- ];
- }
-
- acceptRequest(request: TenantSpecificDetails
): void {
- this.c8yModalService
- .confirm(
- `Accept Device Registration: ${request.data.id}`,
- `Are you sure that you want to accept this device for tenant: ${request.tenantId}?`
- )
- .then(
- async () => {
- // modal confirmed
- const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
- const clients = await this.credService.createClients(credentials);
- const client = clients.find((tmpClient) => tmpClient.core.tenant === request.tenantId);
- if (!client) {
- this.alertService.warning('No credentials found.');
- }
- this.deviceRegistrationDetailsService.acceptRegistrationRequest(client, request.data.id).then(
- () => {
- this.alertService.success('Accepted Device Request.');
- this.datasource.clearCache();
- this.refresh.emit();
- },
- (error) => {
- this.alertService.danger('Unable to accept Device Request.', JSON.stringify(error));
- }
- );
- },
- () => {
- // model canceled
- }
- );
- }
-
- cancelRequest(request: TenantSpecificDetails): void {
- this.c8yModalService
- .confirm(
- `Cancel Device Registration: ${request.data.id}`,
- `Are you sure that you want to cancel this device registration for tenant: ${request.tenantId}?`,
- 'warning'
- )
- .then(
- async () => {
- // modal confirmed
- const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
- const clients = await this.credService.createClients(credentials);
- const client = clients.find((tmpClient) => tmpClient.core.tenant === request.tenantId);
- if (!client) {
- this.alertService.warning('No credentials found.');
- }
- this.deviceRegistrationDetailsService.rejectRegistrationRequest(client, request.data.id).then(
- () => {
- this.alertService.success('Canceled Device Request.');
- this.datasource.clearCache();
- this.refresh.emit();
- },
- (error) => {
- this.alertService.danger('Unable to cancel Device Request.', JSON.stringify(error));
- }
- );
- },
- () => {
- // model canceled
- }
- );
- }
-
- async registerDevice(): Promise {
- const response = new Subject();
- response
- .asObservable()
- .pipe(
- take(1),
- filter((tmp) => !!tmp)
- )
- .subscribe(() => {
- this.datasource.clearCache();
- this.refresh.emit();
- });
- const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
- const clients = await this.credService.createClients(credentials);
- this.modalService.show(AddDeviceRegistrationModalComponent, {
- initialState: { clients, response },
- ignoreBackdropClick: true
- });
- }
-}
+import { Component, EventEmitter } from '@angular/core';
+import { IDeviceRegistration } from '@c8y/client';
+import { AlertService, Column, ColumnDataType, ModalService } from '@c8y/ngx-components';
+import { TenantSpecificDetails } from '@models/tenant-specific-details';
+import { DeviceRegistrationDetailsService } from '@services/device-registration-details.service';
+import { FakeMicroserviceService } from '@services/fake-microservice.service';
+import { DeviceRegistrationTableDatasourceService } from './device-registration-table-datasource.service';
+import { BsModalService } from 'ngx-bootstrap/modal';
+import { filter, take } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { AddDeviceRegistrationModalComponent } from '../modals/add-device-registration-modal/add-device-registration-modal.component';
+
+@Component({
+ providers: [DeviceRegistrationTableDatasourceService],
+ selector: 'ps-device-registration-lookup',
+ templateUrl: './device-registration-lookup.component.html'
+})
+export class DeviceRegistrationLookupComponent {
+ columns: Column[];
+ refresh = new EventEmitter();
+
+ constructor(
+ public datasource: DeviceRegistrationTableDatasourceService,
+ private credService: FakeMicroserviceService,
+ private c8yModalService: ModalService,
+ private alertService: AlertService,
+ private modalService: BsModalService,
+ private deviceRegistrationDetailsService: DeviceRegistrationDetailsService
+ ) {
+ this.columns = this.getDefaultColumns();
+ }
+
+ getDefaultColumns(): Column[] {
+ return [
+ {
+ name: 'tenant',
+ header: 'Tenant Id',
+ path: 'tenantId',
+ dataType: ColumnDataType.TextShort,
+ sortable: true,
+ filterable: true
+ },
+ {
+ name: 'id',
+ header: 'id',
+ path: 'data.id',
+ dataType: ColumnDataType.TextShort,
+ sortable: true,
+ filterable: true
+ },
+ {
+ name: 'status',
+ header: 'Status',
+ path: 'data.status',
+ dataType: ColumnDataType.TextShort,
+ sortable: true,
+ filterable: true
+ },
+ {
+ name: 'owner',
+ header: 'Owner',
+ path: 'data.owner',
+ dataType: ColumnDataType.TextShort,
+ sortable: true,
+ filterable: true
+ },
+ {
+ name: 'creationTime',
+ header: 'Creation Time',
+ path: 'data.creationTime',
+ dataType: ColumnDataType.TextShort,
+ sortable: true,
+ filterable: false
+ },
+ // {
+ // name: 'email',
+ // header: 'E-Mail',
+ // path: 'data.email',
+ // dataType: ColumnDataType.TextShort,
+ // sortable: false,
+ // filterable: true
+ // },
+ // {
+ // name: 'firstName',
+ // header: 'Firstname',
+ // path: 'data.firstName',
+ // dataType: ColumnDataType.TextShort,
+ // sortable: false,
+ // filterable: true
+ // },
+ // {
+ // name: 'lastName',
+ // header: 'Lastname',
+ // path: 'data.lastName',
+ // dataType: ColumnDataType.TextShort,
+ // sortable: false,
+ // filterable: true
+ // },
+ {
+ header: 'Actions',
+ name: 'actions1',
+ sortable: false
+ }
+ ];
+ }
+
+ acceptRequest(request: TenantSpecificDetails): void {
+ this.c8yModalService
+ .confirm(
+ `Accept Device Registration: ${request.data.id}`,
+ `Are you sure that you want to accept this device for tenant: ${request.tenantId}?`
+ )
+ .then(
+ async () => {
+ // modal confirmed
+ const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
+ const clients = await this.credService.createClients(credentials);
+ const client = clients.find((tmpClient) => tmpClient.core.tenant === request.tenantId);
+ if (!client) {
+ this.alertService.warning('No credentials found.');
+ }
+ this.deviceRegistrationDetailsService.acceptRegistrationRequest(client, request.data.id).then(
+ () => {
+ this.alertService.success('Accepted Device Request.');
+ this.datasource.clearCache();
+ this.refresh.emit();
+ },
+ (error) => {
+ this.alertService.danger('Unable to accept Device Request.', JSON.stringify(error));
+ }
+ );
+ },
+ () => {
+ // model canceled
+ }
+ );
+ }
+
+ cancelRequest(request: TenantSpecificDetails): void {
+ this.c8yModalService
+ .confirm(
+ `Cancel Device Registration: ${request.data.id}`,
+ `Are you sure that you want to cancel this device registration for tenant: ${request.tenantId}?`,
+ 'warning'
+ )
+ .then(
+ async () => {
+ // modal confirmed
+ const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
+ const clients = await this.credService.createClients(credentials);
+ const client = clients.find((tmpClient) => tmpClient.core.tenant === request.tenantId);
+ if (!client) {
+ this.alertService.warning('No credentials found.');
+ }
+ this.deviceRegistrationDetailsService.rejectRegistrationRequest(client, request.data.id).then(
+ () => {
+ this.alertService.success('Canceled Device Request.');
+ this.datasource.clearCache();
+ this.refresh.emit();
+ },
+ (error) => {
+ this.alertService.danger('Unable to cancel Device Request.', JSON.stringify(error));
+ }
+ );
+ },
+ () => {
+ // model canceled
+ }
+ );
+ }
+
+ async registerDevice(): Promise {
+ const response = new Subject();
+ response
+ .asObservable()
+ .pipe(
+ take(1),
+ filter((tmp) => !!tmp)
+ )
+ .subscribe(() => {
+ this.datasource.clearCache();
+ this.refresh.emit();
+ });
+ const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
+ const clients = await this.credService.createClients(credentials);
+ this.modalService.show(AddDeviceRegistrationModalComponent, {
+ initialState: { clients, response },
+ ignoreBackdropClick: true
+ });
+ }
+}
diff --git a/src/modules/lookup/device-registration-lookup/device-registration-table-datasource.service.ts b/src/modules/lookup/device-registration-lookup/device-registration-table-datasource.service.ts
index 34b2feb..d2b4541 100644
--- a/src/modules/lookup/device-registration-lookup/device-registration-table-datasource.service.ts
+++ b/src/modules/lookup/device-registration-lookup/device-registration-table-datasource.service.ts
@@ -1,99 +1,99 @@
-import { Injectable } from '@angular/core';
-import { IResultList, Client, IDeviceRegistration } from '@c8y/client';
-import { ServerSideDataResult, Column, Pagination, DataSourceModifier } from '@c8y/ngx-components';
-import { TenantSpecificDetails } from '@models/tenant-specific-details';
-import { DeviceRegistrationDetailsService } from '@services/device-registration-details.service';
-import { FakeMicroserviceService } from '@services/fake-microservice.service';
-import { get } from 'lodash-es';
-
-@Injectable()
-export class DeviceRegistrationTableDatasourceService {
- serverSideDataCallback: Promise;
- columns: Column[];
-
- pagination: Pagination = {
- pageSize: 50,
- currentPage: 1
- };
-
- private cachedPromise: Promise[]>;
-
- constructor(
- private credService: FakeMicroserviceService,
- private deviceRegistrationDetailsService: DeviceRegistrationDetailsService
- ) {
- this.serverSideDataCallback = this.onDataSourceModifier.bind(this);
- }
-
- clearCache(): void {
- this.cachedPromise = undefined;
- }
-
- async onDataSourceModifier(dataSourceModifier: DataSourceModifier): Promise {
- this.columns = [...(dataSourceModifier.columns || [])];
-
- const filteredColumns = dataSourceModifier.columns.filter((tmp) => !!tmp.filterPredicate);
-
- // const filterQuery = this.createQueryFilter(dataSourceModifier.columns);
- const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
- const clients = await this.credService.createClients(credentials);
-
- const deviceRegistrations = await this.fetchForPage(clients);
- let filtereddeviceRegistrations = deviceRegistrations;
- if (filteredColumns.length) {
- filtereddeviceRegistrations = deviceRegistrations.filter((user) => {
- return !filteredColumns.some((col) => {
- const property: string = get(user, col.path);
- if (property && property.includes(col.filterPredicate as string)) {
- return false;
- }
- return true;
- });
- });
- }
-
- // sorting
- const columnToOrderBy = dataSourceModifier.columns.find((tmp) => tmp.sortable && tmp.sortOrder);
- if (columnToOrderBy) {
- if (columnToOrderBy.sortOrder === 'asc') {
- filtereddeviceRegistrations.sort((a, b) =>
- ((get(a, columnToOrderBy.path) as string) || '').localeCompare((get(b, columnToOrderBy.path) as string) || '')
- );
- } else {
- filtereddeviceRegistrations.sort((a, b) =>
- ((get(b, columnToOrderBy.path) as string) || '').localeCompare((get(a, columnToOrderBy.path) as string) || '')
- );
- }
- }
-
- const start = 0 + dataSourceModifier.pagination.pageSize * (dataSourceModifier.pagination.currentPage - 1);
- const dataSubset = filtereddeviceRegistrations.slice(start, start + dataSourceModifier.pagination.pageSize);
- const resList: IResultList> = {
- data: dataSubset,
- res: undefined,
- // @ts-ignore
- paging: {
- currentPage: dataSourceModifier.pagination.currentPage,
- pageSize: dataSourceModifier.pagination.pageSize,
- nextPage: dataSourceModifier.pagination.currentPage + 1
- }
- };
-
- const result: ServerSideDataResult = {
- size: deviceRegistrations.length,
- filteredSize: filtereddeviceRegistrations.length,
- ...(resList as any)
- };
-
- return result;
- }
-
- private async fetchForPage(clients: Client[]): Promise[]> {
- let promise = this.cachedPromise;
- if (!promise) {
- promise = this.deviceRegistrationDetailsService.getRegistrationRequests(clients);
- this.cachedPromise = promise;
- }
- return promise;
- }
-}
+import { Injectable } from '@angular/core';
+import { IResultList, Client, IDeviceRegistration } from '@c8y/client';
+import { ServerSideDataResult, Column, Pagination, DataSourceModifier } from '@c8y/ngx-components';
+import { TenantSpecificDetails } from '@models/tenant-specific-details';
+import { DeviceRegistrationDetailsService } from '@services/device-registration-details.service';
+import { FakeMicroserviceService } from '@services/fake-microservice.service';
+import { get } from 'lodash-es';
+
+@Injectable()
+export class DeviceRegistrationTableDatasourceService {
+ serverSideDataCallback: Promise;
+ columns: Column[];
+
+ pagination: Pagination = {
+ pageSize: 50,
+ currentPage: 1
+ };
+
+ private cachedPromise: Promise[]>;
+
+ constructor(
+ private credService: FakeMicroserviceService,
+ private deviceRegistrationDetailsService: DeviceRegistrationDetailsService
+ ) {
+ this.serverSideDataCallback = this.onDataSourceModifier.bind(this);
+ }
+
+ clearCache(): void {
+ this.cachedPromise = undefined;
+ }
+
+ async onDataSourceModifier(dataSourceModifier: DataSourceModifier): Promise {
+ this.columns = [...(dataSourceModifier.columns || [])];
+
+ const filteredColumns = dataSourceModifier.columns.filter((tmp) => !!tmp.filterPredicate);
+
+ // const filterQuery = this.createQueryFilter(dataSourceModifier.columns);
+ const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
+ const clients = await this.credService.createClients(credentials);
+
+ const deviceRegistrations = await this.fetchForPage(clients);
+ let filtereddeviceRegistrations = deviceRegistrations;
+ if (filteredColumns.length) {
+ filtereddeviceRegistrations = deviceRegistrations.filter((user) => {
+ return !filteredColumns.some((col) => {
+ const property: string = get(user, col.path);
+ if (property && property.includes(col.filterPredicate as string)) {
+ return false;
+ }
+ return true;
+ });
+ });
+ }
+
+ // sorting
+ const columnToOrderBy = dataSourceModifier.columns.find((tmp) => tmp.sortable && tmp.sortOrder);
+ if (columnToOrderBy) {
+ if (columnToOrderBy.sortOrder === 'asc') {
+ filtereddeviceRegistrations.sort((a, b) =>
+ ((get(a, columnToOrderBy.path) as string) || '').localeCompare((get(b, columnToOrderBy.path) as string) || '')
+ );
+ } else {
+ filtereddeviceRegistrations.sort((a, b) =>
+ ((get(b, columnToOrderBy.path) as string) || '').localeCompare((get(a, columnToOrderBy.path) as string) || '')
+ );
+ }
+ }
+
+ const start = 0 + dataSourceModifier.pagination.pageSize * (dataSourceModifier.pagination.currentPage - 1);
+ const dataSubset = filtereddeviceRegistrations.slice(start, start + dataSourceModifier.pagination.pageSize);
+ const resList: IResultList> = {
+ data: dataSubset,
+ res: undefined,
+ // @ts-ignore
+ paging: {
+ currentPage: dataSourceModifier.pagination.currentPage,
+ pageSize: dataSourceModifier.pagination.pageSize,
+ nextPage: dataSourceModifier.pagination.currentPage + 1
+ }
+ };
+
+ const result: ServerSideDataResult = {
+ size: deviceRegistrations.length,
+ filteredSize: filtereddeviceRegistrations.length,
+ ...(resList as any)
+ };
+
+ return result;
+ }
+
+ private async fetchForPage(clients: Client[]): Promise[]> {
+ let promise = this.cachedPromise;
+ if (!promise) {
+ promise = this.deviceRegistrationDetailsService.getRegistrationRequests(clients);
+ this.cachedPromise = promise;
+ }
+ return promise;
+ }
+}
diff --git a/src/modules/lookup/firmware-update-history/firmware-update-history-table-datasource.service.ts b/src/modules/lookup/firmware-update-history/firmware-update-history-table-datasource.service.ts
index a7b8d1d..2dad168 100644
--- a/src/modules/lookup/firmware-update-history/firmware-update-history-table-datasource.service.ts
+++ b/src/modules/lookup/firmware-update-history/firmware-update-history-table-datasource.service.ts
@@ -1,109 +1,111 @@
-import { Injectable } from '@angular/core';
-import { IResultList, Client, IOperation } from '@c8y/client';
-import { ServerSideDataResult, Column, Pagination, DataSourceModifier } from '@c8y/ngx-components';
-import { TenantSpecificDetails } from '@models/tenant-specific-details';
-import { FakeMicroserviceService } from '@services/fake-microservice.service';
-import { get } from 'lodash-es';
-
-@Injectable()
-export class FirmwareUpdateHistoryTableDatasourceService {
- serverSideDataCallback: Promise;
- columns: Column[];
-
- pagination: Pagination = {
- pageSize: 50,
- currentPage: 1
- };
-
- private tenantFilter: string = null;
- private cachedPromise: Promise[]>;
-
- constructor(private credService: FakeMicroserviceService) {
- this.serverSideDataCallback = this.onDataSourceModifier.bind(this);
- }
-
- async onDataSourceModifier(dataSourceModifier: DataSourceModifier): Promise {
- this.columns = [...(dataSourceModifier.columns || [])];
-
- const filteredColumns = dataSourceModifier.columns.filter((tmp) => !!tmp.filterPredicate);
- const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
- let clients = await this.credService.createClients(credentials);
- const tenantIdCol = dataSourceModifier.columns.find((tmp) => tmp.path === 'tenantId');
-
- if (tenantIdCol) {
- if (this.tenantFilter !== tenantIdCol.filterPredicate) {
- this.cachedPromise = null;
- }
- if (tenantIdCol.filterPredicate) {
- clients = clients.filter((tmp) => tmp.core.tenant.includes(tenantIdCol.filterPredicate as string));
- }
- this.tenantFilter = tenantIdCol.filterPredicate as string;
- }
-
- const operations = await this.fetchForPage(clients);
-
- let filteredOperations = operations;
- if (filteredColumns.length) {
- filteredOperations = operations.filter((user) => {
- return !filteredColumns.some((col) => {
- const property: string = get(user, col.path);
- if (property && property.includes(col.filterPredicate as string)) {
- return false;
- }
- return true;
- });
- });
- }
-
- const start = 0 + dataSourceModifier.pagination.pageSize * (dataSourceModifier.pagination.currentPage - 1);
- const dataSubset = filteredOperations.slice(start, start + dataSourceModifier.pagination.pageSize);
- const resList: IResultList> = {
- data: dataSubset,
- res: undefined,
- // @ts-ignore
- paging: {
- currentPage: dataSourceModifier.pagination.currentPage,
- pageSize: dataSourceModifier.pagination.pageSize,
- nextPage: dataSourceModifier.pagination.currentPage + 1
- }
- };
-
- const result: ServerSideDataResult = {
- size: undefined,
- filteredSize: filteredOperations.length,
- ...(resList as any)
- };
-
- return result;
- }
-
- private async fetchForPage(clients: Client[]): Promise[]> {
- let promise = this.cachedPromise;
- if (!promise) {
- const currentDate = new Date();
- const filter = {
- pageSize: 50,
- fragmentType: 'c8y_Firmware',
- dateTo: currentDate.toISOString(),
- revert: true
- };
- const promArray = clients.map((client) => {
- return client.operation.list(filter).then((res) => {
- return res.data.map((entry) => {
- return {
- data: entry,
- tenantId: client.core.tenant
- } as TenantSpecificDetails;
- });
- });
- });
- promise = Promise.all(promArray).then((result) => {
- const array = new Array>();
- result.forEach((entry) => array.push(...entry));
- return array.sort((a, b) => ((b.data.creationTime as string) || '').localeCompare(a.data.creationTime || ''));
- });
- this.cachedPromise = promise;
- }
- return promise;
- }
-}
+import { Injectable } from '@angular/core';
+import { IResultList, Client, IOperation, IFetchResponse } from '@c8y/client';
+import { ServerSideDataResult, Column, Pagination, DataSourceModifier } from '@c8y/ngx-components';
+import { TenantSpecificDetails } from '@models/tenant-specific-details';
+import { FakeMicroserviceService } from '@services/fake-microservice.service';
+import { get } from 'lodash-es';
+
+@Injectable()
+export class FirmwareUpdateHistoryTableDatasourceService {
+ serverSideDataCallback: (dataSourceModifier: DataSourceModifier) => Promise;
+ columns: Column[] = [];
+
+ pagination: Pagination = {
+ pageSize: 50,
+ currentPage: 1
+ };
+
+ private tenantFilter: string | null = null;
+ private cachedPromise: Promise[]> | null = null;
+
+ constructor(private credService: FakeMicroserviceService) {
+ this.serverSideDataCallback = this.onDataSourceModifier.bind(this);
+ }
+
+ async onDataSourceModifier(dataSourceModifier: DataSourceModifier): Promise {
+ this.columns = [...(dataSourceModifier.columns || [])];
+
+ const filteredColumns = dataSourceModifier.columns.filter((tmp) => !!tmp.filterPredicate);
+ const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
+ let clients = await this.credService.createClients(credentials);
+ const tenantIdCol = dataSourceModifier.columns.find((tmp) => tmp.path === 'tenantId');
+
+ if (tenantIdCol) {
+ if (this.tenantFilter !== tenantIdCol.filterPredicate) {
+ this.cachedPromise = null;
+ }
+ if (tenantIdCol.filterPredicate) {
+ clients = clients.filter((tmp) => tmp.core.tenant.includes(tenantIdCol.filterPredicate as string));
+ }
+ this.tenantFilter = tenantIdCol.filterPredicate as string;
+ }
+
+ const operations = await this.fetchForPage(clients);
+
+ let filteredOperations = operations;
+ if (filteredColumns.length) {
+ filteredOperations = operations.filter((user) => {
+ return !filteredColumns.some((col) => {
+ const property: string = get(user, col.path as string);
+ if (property && property.includes(col.filterPredicate as string)) {
+ return false;
+ }
+ return true;
+ });
+ });
+ }
+
+ const currentPage = dataSourceModifier.pagination.currentPage as number;
+
+ const start = 0 + dataSourceModifier.pagination.pageSize * (currentPage - 1);
+ const dataSubset = filteredOperations.slice(start, start + dataSourceModifier.pagination.pageSize);
+ const resList: IResultList> = {
+ data: dataSubset,
+ res: undefined as unknown as IFetchResponse,
+ // @ts-ignore
+ paging: {
+ currentPage: currentPage,
+ pageSize: dataSourceModifier.pagination.pageSize,
+ nextPage: currentPage + 1
+ }
+ };
+
+ const result: ServerSideDataResult = {
+ size: undefined,
+ filteredSize: filteredOperations.length,
+ ...(resList as any)
+ };
+
+ return result;
+ }
+
+ private async fetchForPage(clients: Client[]): Promise[]> {
+ let promise = this.cachedPromise;
+ if (!promise) {
+ const currentDate = new Date();
+ const filter = {
+ pageSize: 50,
+ fragmentType: 'c8y_Firmware',
+ dateTo: currentDate.toISOString(),
+ revert: true
+ };
+ const promArray = clients.map((client) => {
+ return client.operation.list(filter).then((res) => {
+ return res.data.map((entry) => {
+ return {
+ data: entry,
+ tenantId: client.core.tenant
+ } as TenantSpecificDetails;
+ });
+ });
+ });
+ promise = Promise.all(promArray).then((result) => {
+ const array = new Array>();
+ result.forEach((entry) => array.push(...entry));
+ return array.sort((a, b) => ((b.data['creationTime'] as string) || '').localeCompare(a.data['creationTime'] || ''));
+ });
+ this.cachedPromise = promise;
+ }
+ return promise;
+ }
+}
diff --git a/src/modules/lookup/firmware-update-history/firmware-update-history.component.html b/src/modules/lookup/firmware-update-history/firmware-update-history.component.html
index 6c25cfc..82f451e 100644
--- a/src/modules/lookup/firmware-update-history/firmware-update-history.component.html
+++ b/src/modules/lookup/firmware-update-history/firmware-update-history.component.html
@@ -1,43 +1,43 @@
-Firmware Update History
-
-
+Firmware Update History
+
+
diff --git a/src/modules/lookup/firmware-update-history/firmware-update-history.component.ts b/src/modules/lookup/firmware-update-history/firmware-update-history.component.ts
index 07a1b5f..9b6b826 100644
--- a/src/modules/lookup/firmware-update-history/firmware-update-history.component.ts
+++ b/src/modules/lookup/firmware-update-history/firmware-update-history.component.ts
@@ -1,125 +1,125 @@
-import { Component } from '@angular/core';
-import { IOperation } from '@c8y/client';
-import { Column, ColumnDataType } from '@c8y/ngx-components';
-import { TenantSpecificDetails } from '@models/tenant-specific-details';
-import { FakeMicroserviceService } from '@services/fake-microservice.service';
-import { get } from 'lodash';
-import { FirmwareUpdateHistoryTableDatasourceService } from './firmware-update-history-table-datasource.service';
-
-@Component({
- providers: [FirmwareUpdateHistoryTableDatasourceService],
- selector: 'ps-firmware-update-history',
- templateUrl: './firmware-update-history.component.html'
-})
-export class FirmwareUpdateHistoryComponent {
- columns: Column[];
-
- constructor(
- public datasource: FirmwareUpdateHistoryTableDatasourceService,
- private credService: FakeMicroserviceService
- ) {
- this.columns = this.getDefaultColumns();
- }
-
- getDefaultColumns(): Column[] {
- return [
- {
- name: 'tenant',
- header: 'Tenant Id',
- path: 'tenantId',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: true
- },
- {
- name: 'deviceName',
- header: 'Device Name',
- path: 'data.deviceName',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: true
- },
- {
- name: 'firmwareName',
- header: 'Firmware Name',
- path: 'data.c8y_Firmware.name',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: true
- },
- {
- name: 'firmwareVersion',
- header: 'Firmware Version',
- path: 'data.c8y_Firmware.version',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: true
- },
- {
- name: 'firmwareURL',
- header: 'Firmware URL',
- path: 'data.c8y_Firmware.url',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: true
- },
- {
- name: 'description',
- header: 'Description',
- path: 'data.description',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: true,
- visible: false
- },
- {
- name: 'failureReason',
- header: 'Failure Reason',
- path: 'data.failureReason',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: true
- },
- {
- name: 'creationTime',
- header: 'Creation Time',
- path: 'data.creationTime',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: false,
- sortOrder: 'desc'
- },
- {
- name: 'status',
- header: 'Status',
- path: 'data.status',
- dataType: ColumnDataType.TextShort,
- sortable: false,
- filterable: true
- }
- // {
- // header: 'Actions',
- // name: 'actions1',
- // sortable: false,
- // filterable: false,
- // visible: false
- // }
- ];
- }
-
- async openFirmwareLinkWithCreds(context: TenantSpecificDetails): Promise {
- try {
- const url: string = get(context, 'data.c8y_Firmware.url');
- const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
- const creds = credentials.find((tmp) => tmp.tenant === context.tenantId);
- if (creds) {
- const urlObj = new URL(url);
- urlObj.username = `${creds.tenant}/${creds.user}`;
- urlObj.password = creds.password;
- window.open(urlObj.toString());
- }
- } catch (e) {
- console.error(e);
- }
- }
-}
+import { Component } from '@angular/core';
+import { IOperation } from '@c8y/client';
+import { Column, ColumnDataType } from '@c8y/ngx-components';
+import { TenantSpecificDetails } from '@models/tenant-specific-details';
+import { FakeMicroserviceService } from '@services/fake-microservice.service';
+import { get } from 'lodash';
+import { FirmwareUpdateHistoryTableDatasourceService } from './firmware-update-history-table-datasource.service';
+
+@Component({
+ providers: [FirmwareUpdateHistoryTableDatasourceService],
+ selector: 'ps-firmware-update-history',
+ templateUrl: './firmware-update-history.component.html'
+})
+export class FirmwareUpdateHistoryComponent {
+ columns: Column[];
+
+ constructor(
+ public datasource: FirmwareUpdateHistoryTableDatasourceService,
+ private credService: FakeMicroserviceService
+ ) {
+ this.columns = this.getDefaultColumns();
+ }
+
+ getDefaultColumns(): Column[] {
+ return [
+ {
+ name: 'tenant',
+ header: 'Tenant Id',
+ path: 'tenantId',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: true
+ },
+ {
+ name: 'deviceName',
+ header: 'Device Name',
+ path: 'data.deviceName',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: true
+ },
+ {
+ name: 'firmwareName',
+ header: 'Firmware Name',
+ path: 'data.c8y_Firmware.name',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: true
+ },
+ {
+ name: 'firmwareVersion',
+ header: 'Firmware Version',
+ path: 'data.c8y_Firmware.version',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: true
+ },
+ {
+ name: 'firmwareURL',
+ header: 'Firmware URL',
+ path: 'data.c8y_Firmware.url',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: true
+ },
+ {
+ name: 'description',
+ header: 'Description',
+ path: 'data.description',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: true,
+ visible: false
+ },
+ {
+ name: 'failureReason',
+ header: 'Failure Reason',
+ path: 'data.failureReason',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: true
+ },
+ {
+ name: 'creationTime',
+ header: 'Creation Time',
+ path: 'data.creationTime',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: false,
+ sortOrder: 'desc'
+ },
+ {
+ name: 'status',
+ header: 'Status',
+ path: 'data.status',
+ dataType: ColumnDataType.TextShort,
+ sortable: false,
+ filterable: true
+ }
+ // {
+ // header: 'Actions',
+ // name: 'actions1',
+ // sortable: false,
+ // filterable: false,
+ // visible: false
+ // }
+ ];
+ }
+
+ async openFirmwareLinkWithCreds(context: TenantSpecificDetails): Promise {
+ try {
+ const url: string = get(context, 'data.c8y_Firmware.url');
+ const credentials = await this.credService.prepareCachedDummyMicroserviceForAllSubtenants();
+ const creds = credentials.find((tmp) => tmp.tenant === context.tenantId);
+ if (creds) {
+ const urlObj = new URL(url);
+ urlObj.username = `${creds.tenant}/${creds.user}`;
+ urlObj.password = creds.password;
+ window.open(urlObj.toString());
+ }
+ } catch (e) {
+ console.error(e);
+ }
+ }
+}
diff --git a/src/modules/lookup/lookup-navigator-node.factory.ts b/src/modules/lookup/lookup-navigator-node.factory.ts
index 381a693..81699dc 100644
--- a/src/modules/lookup/lookup-navigator-node.factory.ts
+++ b/src/modules/lookup/lookup-navigator-node.factory.ts
@@ -1,43 +1,43 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { NavigatorNode, NavigatorNodeFactory } from '@c8y/ngx-components';
-
-@Injectable()
-export class LookupNavigatorNodeFactory implements NavigatorNodeFactory {
- private lookupNode: NavigatorNode;
- constructor() {
- this.lookupNode = new NavigatorNode({
- label: 'Lookup',
- path: 'lookup',
- icon: 'search'
- });
- const deviceNode = new NavigatorNode({
- label: 'Device',
- path: 'lookup/device',
- icon: 'c8y-device'
- });
- this.lookupNode.add(deviceNode);
- const deviceRegistrationNode = new NavigatorNode({
- label: 'Device Registration',
- path: 'lookup/device-registration',
- icon: 'c8y-device-connect'
- });
- this.lookupNode.add(deviceRegistrationNode);
- const userNode = new NavigatorNode({
- label: 'User',
- path: 'lookup/user',
- icon: 'c8y-user'
- });
- this.lookupNode.add(userNode);
- const firmwareHistoryNode = new NavigatorNode({
- label: 'Firmware Update History',
- path: 'lookup/firmware-history',
- icon: 'floppy-o'
- });
- this.lookupNode.add(firmwareHistoryNode);
- }
-
- get(activatedRoute?: ActivatedRoute): NavigatorNode {
- return this.lookupNode;
- }
-}
+import { Injectable } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { NavigatorNode, NavigatorNodeFactory } from '@c8y/ngx-components';
+
+@Injectable()
+export class LookupNavigatorNodeFactory implements NavigatorNodeFactory {
+ private lookupNode: NavigatorNode;
+ constructor() {
+ this.lookupNode = new NavigatorNode({
+ label: 'Lookup',
+ path: 'lookup',
+ icon: 'search'
+ });
+ const deviceNode = new NavigatorNode({
+ label: 'Device',
+ path: 'lookup/device',
+ icon: 'c8y-device'
+ });
+ this.lookupNode.add(deviceNode);
+ const deviceRegistrationNode = new NavigatorNode({
+ label: 'Device Registration',
+ path: 'lookup/device-registration',
+ icon: 'c8y-device-connect'
+ });
+ this.lookupNode.add(deviceRegistrationNode);
+ const userNode = new NavigatorNode({
+ label: 'User',
+ path: 'lookup/user',
+ icon: 'c8y-user'
+ });
+ this.lookupNode.add(userNode);
+ const firmwareHistoryNode = new NavigatorNode({
+ label: 'Firmware Update History',
+ path: 'lookup/firmware-history',
+ icon: 'floppy-o'
+ });
+ this.lookupNode.add(firmwareHistoryNode);
+ }
+
+ get(activatedRoute?: ActivatedRoute): NavigatorNode {
+ return this.lookupNode;
+ }
+}
diff --git a/src/modules/lookup/lookup.module.ts b/src/modules/lookup/lookup.module.ts
index 7412e89..6045060 100644
--- a/src/modules/lookup/lookup.module.ts
+++ b/src/modules/lookup/lookup.module.ts
@@ -68,20 +68,6 @@ import { RouterModule } from '@angular/router';
CustomFirmwareUpdateModalComponent,
FirmwareUpdateHistoryComponent
],
- entryComponents: [
- DeviceLookupComponent,
- UserLookupComponent,
- DeviceRegistrationLookupComponent,
- FirmwareUpdateModalComponent,
- ConfigurationUpdateModalComponent,
- StoreQueryModalComponent,
- LoadQueryModalComponent,
- UserPasswordChangeModalComponent,
- AddUserModalComponent,
- AddDeviceRegistrationModalComponent,
- CustomFirmwareUpdateModalComponent,
- FirmwareUpdateHistoryComponent
- ],
providers: [
{
provide: HOOK_MICROSERVICE_ROLE,
diff --git a/src/modules/lookup/modals/add-device-registration-modal/add-device-registration-modal.component.html b/src/modules/lookup/modals/add-device-registration-modal/add-device-registration-modal.component.html
index 90e384e..109ebd5 100644
--- a/src/modules/lookup/modals/add-device-registration-modal/add-device-registration-modal.component.html
+++ b/src/modules/lookup/modals/add-device-registration-modal/add-device-registration-modal.component.html
@@ -1,51 +1,51 @@
-
-
-