Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import { Component, inject } from '@angular/core';
import { SiFlexibleDashboardComponent, Widget } from '@siemens/dashboards-ng';
import { SiEmptyStateComponent } from '@siemens/element-ng/empty-state';
import { environment } from 'projects/dashboards-demo/src/environments/environment';

import { environment } from '../../../environments/environment';
import { AppStateService } from '../../app-state.service';
import { DashboardFiltersComponent } from '../../components/dashboard-filters/dashboard-filters.component';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import { WidgetConfig, WidgetInstance } from '@siemens/dashboards-ng';
import { ContentActionBarMainItem } from '@siemens/element-ng/content-action-bar';
import { MenuItem } from '@siemens/element-ng/menu';
import { SiResizeObserverModule } from '@siemens/element-ng/resize-observer';
import { CartesianChartData } from 'projects/dashboards-demo/src/app/widgets/charts/data.service';
import { Observable, of } from 'rxjs';

import { CartesianChartData } from '../../../../src/app/widgets/charts/data.service';

export interface WidgetChartCartesianConfig {
stacked: boolean;
showLegend: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { SiActionDialogService } from '@siemens/element-ng/action-modal';
import { SiLoadingSpinnerModule } from '@siemens/element-ng/loading-spinner';
import { TEST_WIDGET } from 'projects/dashboards-ng/test/test-widget/test-widget';
import type { Mock } from 'vitest';

import { TEST_WIDGET } from '../../../test/test-widget/test-widget';
import { TestingModule } from '../../../test/testing.module';
import { SI_DASHBOARD_CONFIGURATION } from '../../model/configuration';
import { SI_WIDGET_ID_PROVIDER } from '../../model/si-widget-id-provider';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import { outputToObservable } from '@angular/core/rxjs-interop';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { SiActionDialogService } from '@siemens/element-ng/action-modal';
import { firstValueFrom, take, toArray } from 'rxjs';
import { page } from 'vitest/browser';

import {
TEST_WIDGET,
TEST_WIDGET_CONFIG_0,
TEST_WIDGET_CONFIG_1,
TEST_WIDGET_CONFIG_2,
TEST_WIDGET_CONFIGS
} from 'projects/dashboards-ng/test/test-widget/test-widget';
import { firstValueFrom, take, toArray } from 'rxjs';
import { page } from 'vitest/browser';

} from '../../../test/test-widget/test-widget';
import { TestingModule } from '../../../test/testing.module';
import { Widget, WidgetConfig } from '../../model/widgets.model';
import { SiWidgetHostComponent } from '../widget-host/si-widget-host.component';
Expand Down
3 changes: 2 additions & 1 deletion projects/dashboards-ng/test/test-widget/test-widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
*/
import { Type } from '@angular/core';
import { Widget, WidgetConfig } from '@siemens/dashboards-ng';
import * as testWidgetModule from 'projects/dashboards-ng/test/test-widget/index';

import * as testWidgetModule from './index';

const loaderFunction = (name: string): Promise<any> => {
if (name === 'TestWidgetComponent' || name === 'TestWidgetEditorComponent') {
Expand Down
12 changes: 6 additions & 6 deletions projects/dashboards-ng/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
"inlineSources": true,
"types": ["@siemens/element-translate-ng/localize-types", "node"],
"paths": {
"@siemens/element-translate-ng": ["dist/@siemens/element-translate-ng"],
"@siemens/element-translate-ng/*": ["dist/@siemens/element-translate-ng/*"],
"@siemens/element-ng": ["dist/@siemens/element-ng"],
"@siemens/element-ng/*": ["dist/@siemens/element-ng/*"],
"@siemens/dashboards-ng": ["projects/dashboards-ng/src/public-api.ts"]
"@siemens/element-translate-ng": ["../../dist/@siemens/element-translate-ng"],
"@siemens/element-translate-ng/*": ["../../dist/@siemens/element-translate-ng/*"],
"@siemens/element-ng": ["../../dist/@siemens/element-ng"],
"@siemens/element-ng/*": ["../../dist/@siemens/element-ng/*"],
"@siemens/dashboards-ng": ["../../projects/dashboards-ng/src/public-api.ts"]
}
},
"angularCompilerOptions": {
"compilationMode": "partial"
},
"include": ["./**/*.ts"],
"include": ["**/*.ts"],
"exclude": ["**/*.spec.ts", "test"]
}
18 changes: 9 additions & 9 deletions projects/dashboards-ng/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
"lib": ["es2022", "dom", "esnext.disposable"],
"paths": {
"@siemens/element-translate-ng": [
"projects/element-translate-ng/public-api.ts",
"projects/element-translate-ng/"
"../../projects/element-translate-ng/public-api.ts",
"../../projects/element-translate-ng/"
],
"@siemens/element-translate-ng/*": ["projects/element-translate-ng/*"],
"@siemens/element-ng": ["projects/element-ng/public-api.ts", "projects/element-ng"],
"@siemens/element-ng/*": ["projects/element-ng/*"],
"@siemens/dashboards-ng": [
"projects/dashboards-ng/src/public-api.ts",
"projects/dashboards-ng/src"
]
"@siemens/element-translate-ng/*": ["../../projects/element-translate-ng/*"],
"@siemens/element-ng": [
"../../projects/element-ng/public-api.ts",
"../../projects/element-ng"
],
"@siemens/element-ng/*": ["../../projects/element-ng/*"],
"@siemens/dashboards-ng": ["./src/public-api.ts", "./src"]
}
},
"include": ["**/*.spec.ts", "**/*.d.ts", "**/test/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletion projects/element-translate-ng/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"declaration": true,
"inlineSources": true,
"paths": {
"@siemens/element-translate-ng/*": ["projects/element-translate-ng/*"]
"@siemens/element-translate-ng/*": ["./*"]
}
},
"angularCompilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion projects/element-translate-ng/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lib": ["es2022", "dom", "esnext.disposable"],
"types": ["vitest/globals"],
"paths": {
"@siemens/element-translate-ng/*": ["projects/element-translate-ng/*"]
"@siemens/element-translate-ng/*": ["./*"]
}
},
"include": ["**/*.spec.ts", "**/*.d.ts", "**/*.mock.ts"]
Expand Down
20 changes: 12 additions & 8 deletions projects/live-preview/esbuild-component-loader.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const livePreviewComponentLoader = {
const root = url.searchParams.get('root');
const examples = url.searchParams.get('examples');
const webcomponents = url.searchParams.get('webcomponents');
const rel = url.searchParams.get('rel');

if (!root) {
throw 'config error: need to pass "root" (path)';
Expand All @@ -18,7 +19,7 @@ const livePreviewComponentLoader = {
return {
namespace: 'live-preview-component-loader',
path: args.path,
pluginData: { root, webcomponents, examples }
pluginData: { root, webcomponents: webcomponents === 'true', examples, rel: rel === 'true' }
};
});

Expand All @@ -27,19 +28,22 @@ const livePreviewComponentLoader = {
filter: /(@siemens|@simpl)\/live-preview\/component-loader.*/,
namespace: 'live-preview-component-loader'
},
async ({ pluginData: { root, webcomponents, examples } }) => {
async ({ pluginData: { root, webcomponents, examples, rel } }) => {
const watchDirs = [root];

let code = 'export default { load: function (path) { switch (path) {';
const files = [];
const webcomponentsFiles = [];
for await (const file of globIterate(
path.posix.join(root, examples.replace(/\.ts$/, '.{ts,tsx,vue,js}')),
{ posix: true } // needed for windows
)) {
const glob = path.posix.join(root, examples.replace(/\.ts$/, '.{ts,tsx,vue,js}'));
const rootNormalized = path.normalize(root);
// posix: true needed for windows
for await (const file of globIterate(glob, { posix: true })) {
if (file.endsWith('.ts')) {
const fileName = file.replace(new RegExp('^' + root + '/'), '').replace(/\.ts$/, '');
code += `case '${fileName}': return import('${file.replace(/\.ts$/, '')}');`;
const fileName = file
.replace(new RegExp('^' + rootNormalized + '/'), '')
.replace(/\.ts$/, '');
let importFileName = rel ? `./${fileName}` : file.replace(/\.ts$/, '');
code += `case '${fileName}': return import('${importFileName}');`;
files.push(fileName);
} else {
webcomponentsFiles.push(file.replace(root + '/', '').replace(/\.(tsx|vue|js)$/, ''));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import Point from 'ol/geom/Point';
import { Layer, Vector as VectorLayer } from 'ol/layer';
import RenderFeature from 'ol/render/Feature';
import { Cluster, Vector as VectorSource } from 'ol/source';
import { mockGeoJson } from 'src/app/mocks/geojson.mock';
import { mockPoints, singlePoint } from 'src/app/mocks/points.mock';

import { SiMapComponent, SiMapPopoverComponent, SiMapTooltipComponent } from '.';
import { mockGeoJson } from '../../../../../src/app/mocks/geojson.mock';
import { mockPoints, singlePoint } from '../../../../../src/app/mocks/points.mock';
import { MapService } from './services/map.service';

const mockFeature = new Feature({
Expand Down
8 changes: 3 additions & 5 deletions projects/maps-ng/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
"inlineSources": true,
"types": ["@siemens/element-translate-ng/localize-types"],
"paths": {
"@siemens/element-translate-ng": ["dist/@siemens/element-translate-ng"],
"@siemens/element-translate-ng/*": ["dist/@siemens/element-translate-ng/*"],
"@siemens/maps-ng/*": ["projects/maps-ng/*/index.ts"],
"@siemens/map-styles/*": ["dist/@siemens/map-styles/*"]
"@siemens/maps-ng/*": ["./*/index.ts"],
"@siemens/map-styles/*": ["../../dist/@siemens/map-styles/*"]
}
},
"angularCompilerOptions": {
Expand All @@ -19,5 +17,5 @@
"enableResourceInlining": true
},
"include": ["./**/*.ts"],
"exclude": ["**/*.spec.ts"]
"exclude": ["./**/*.spec.ts"]
}
2 changes: 1 addition & 1 deletion projects/maps-ng/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"lib": ["es2022", "dom", "esnext.disposable"],
"types": ["@siemens/element-translate-ng/localize-types", "vitest/globals"]
},
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["./**/*.spec.ts", "./**/*.d.ts"]
}
2 changes: 1 addition & 1 deletion src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import { LivePreviewThemeApiService } from './shared/live-preview-theme.api.serv

const componentLoader =
// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
require('@siemens/live-preview/component-loader?root=src&examples=app/examples/**/*.ts&webcomponents=true!./app.config').default;
require('@siemens/live-preview/component-loader?root=src&examples=app/examples/**/*.ts&rel=true&webcomponents=true!./app.config').default;

// On locale change, we dynamically reload the locale definition
// for angular. With this configuration, we only load the current
Expand Down
5 changes: 1 addition & 4 deletions src/app/examples/datatable/datatable-bulk-actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { CdkMenuTrigger } from '@angular/cdk/menu';
import { Component, computed, OnInit, signal, TemplateRef, viewChild } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { elementDown2, elementOptionsVertical } from '@siemens/element-icons';
import { SiAutoCollapsableListModule } from '@siemens/element-ng/auto-collapsable-list';
import { SI_DATATABLE_CONFIG, SiDatatableModule } from '@siemens/element-ng/datatable';
import { addIcons, SiIconComponent } from '@siemens/element-ng/icon';
import { MenuItem, SiMenuFactoryComponent } from '@siemens/element-ng/menu';
import { NgxDatatableModule, TableColumn } from '@siemens/ngx-datatable';
import { SiAutoCollapsableListModule } from 'projects/element-ng/auto-collapsable-list';

type Status = 'Active' | 'Inactive' | 'On Leave';

Expand Down Expand Up @@ -41,9 +41,6 @@ export class SampleComponent implements OnInit {
protected readonly collapsed = signal(false);
protected readonly statusMenuOpen = signal(false);

private readonly bulkActionsTemplate = viewChild.required('bulkActionsTemplate', {
read: TemplateRef<unknown>
});
private readonly checkboxCellTemplate = viewChild.required('checkboxCellTmpl', {
read: TemplateRef<unknown>
});
Expand Down
5 changes: 3 additions & 2 deletions src/app/examples/si-map/si-map-custom-cluster-popover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import { elementGoTo } from '@siemens/element-icons';
import { addIcons, SiIconComponent } from '@siemens/element-ng/icon';
import { LOG_EVENT } from '@siemens/live-preview';
import { MapPoint, MapPointMetaData, SiMapComponent } from '@siemens/maps-ng';
import { mockPoints, singlePoint } from 'src/app/mocks/points.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { mockPoints, singlePoint } from '../../mocks/points.mock';

@Component({
selector: 'app-custom-popover',
Expand Down
5 changes: 3 additions & 2 deletions src/app/examples/si-map/si-map-custom-popover-onhover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
*/
import { Component, input, viewChild } from '@angular/core';
import { MapPoint, MapPointMetaData, SiMapComponent } from '@siemens/maps-ng';
import { mockPoints, singlePoint } from 'src/app/mocks/points.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { mockPoints, singlePoint } from '../../mocks/points.mock';

@Component({
selector: 'app-custom-popover-onhover',
Expand Down
5 changes: 3 additions & 2 deletions src/app/examples/si-map/si-map-custom-popover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
*/
import { Component, input, viewChild } from '@angular/core';
import { MapPoint, MapPointMetaData, SiMapComponent } from '@siemens/maps-ng';
import { mockPoints, singlePoint } from 'src/app/mocks/points.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { mockPoints, singlePoint } from '../../mocks/points.mock';

@Component({
selector: 'app-custom-popover',
Expand Down
5 changes: 3 additions & 2 deletions src/app/examples/si-map/si-map-custom-style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
*/
import { Component, viewChild } from '@angular/core';
import { MapPoint, SiMapComponent } from '@siemens/maps-ng';
import { mockPoints } from 'src/app/mocks/points.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { mockPoints } from '../../mocks/points.mock';

@Component({
selector: 'app-sample',
Expand Down
5 changes: 3 additions & 2 deletions src/app/examples/si-map/si-map-custom-zoom-levels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import { Component, viewChild } from '@angular/core';
import { MapPoint, OverlayNativeProperties, SiMapComponent } from '@siemens/maps-ng';
import { FullScreen } from 'ol/control';
import { mockPoints } from 'src/app/mocks/points.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { mockPoints } from '../../mocks/points.mock';

@Component({
selector: 'app-sample',
Expand Down
5 changes: 3 additions & 2 deletions src/app/examples/si-map/si-map-default-style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import { Component, inject, viewChild } from '@angular/core';
import { LOG_EVENT } from '@siemens/live-preview';
import { MapPoint, SiMapComponent } from '@siemens/maps-ng';
import { mockPoints } from 'src/app/mocks/points.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { mockPoints } from '../../mocks/points.mock';

@Component({
selector: 'app-sample',
Expand Down
7 changes: 4 additions & 3 deletions src/app/examples/si-map/si-map-geo-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { FeatureLike } from 'ol/Feature';
import { fromLonLat } from 'ol/proj';
import { Fill, Stroke, Style } from 'ol/style';
import { StyleFunction } from 'ol/style/Style';
import { shapes } from 'src/app/mocks/custom-shape-style';
import { mockGeoJson } from 'src/app/mocks/geojson.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { shapes } from '../../mocks/custom-shape-style';
import { mockGeoJson } from '../../mocks/geojson.mock';

interface MapPointCustom extends MapPointMetaData {
floorId: string;
Expand Down
5 changes: 3 additions & 2 deletions src/app/examples/si-map/si-map-grouping.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import { Component, viewChild } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { ColorPalette, MapPoint, SiMapComponent } from '@siemens/maps-ng';
import { mockGroupedPoints } from 'src/app/mocks/points.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { mockGroupedPoints } from '../../mocks/points.mock';

@Component({
selector: 'app-sample',
Expand Down
5 changes: 3 additions & 2 deletions src/app/examples/si-map/si-map-labels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import { Component, viewChild } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { ColorPalette, MapPoint, SiMapComponent } from '@siemens/maps-ng';
import { mockGroupedPoints } from 'src/app/mocks/points.mock';
import { environment } from 'src/environments/environment';

import { environment } from '../../../environments/environment';
import { mockGroupedPoints } from '../../mocks/points.mock';

@Component({
selector: 'app-sample',
Expand Down
30 changes: 15 additions & 15 deletions src/tsconfig.app.prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"compilerOptions": {
"outDir": "./out-tsc/app",
"paths": {
"@siemens/element-ng": ["dist/@siemens/element-ng"],
"@siemens/element-ng/*": ["dist/@siemens/element-ng/*"],
"@siemens/element-translate-ng": ["dist/@siemens/element-translate-ng"],
"@siemens/element-translate-ng/*": ["dist/@siemens/element-translate-ng/*"],
"@siemens/live-preview": ["dist/@siemens/live-preview"],
"@siemens/live-preview/*": ["dist/@siemens/live-preview/*"],
"@siemens/charts-ng": ["dist/@siemens/charts-ng"],
"@siemens/charts-ng/*": ["dist/@siemens/charts-ng/*"],
"@siemens/native-charts-ng": ["dist/@siemens/native-charts-ng"],
"@siemens/native-charts-ng/*": ["dist/@siemens/native-charts-ng/*"],
"@siemens/dashboards-ng": ["dist/@siemens/dashboards-ng"],
"@siemens/dashboards-ng/*": ["dist/@siemens/dashboards-ng/*"],
"@siemens/maps-ng": ["dist/@siemens/maps-ng"],
"@siemens/maps-ng/*": ["dist/@siemens/maps-ng/*"],
"@siemens/map-styles/*": ["dist/@siemens/map-styles/*"]
"@siemens/element-ng": ["../dist/@siemens/element-ng"],
"@siemens/element-ng/*": ["../dist/@siemens/element-ng/*"],
"@siemens/element-translate-ng": ["../dist/@siemens/element-translate-ng"],
"@siemens/element-translate-ng/*": ["../dist/@siemens/element-translate-ng/*"],
"@siemens/live-preview": ["../dist/@siemens/live-preview"],
"@siemens/live-preview/*": ["../dist/@siemens/live-preview/*"],
"@siemens/charts-ng": ["../dist/@siemens/charts-ng"],
"@siemens/charts-ng/*": ["../dist/@siemens/charts-ng/*"],
"@siemens/native-charts-ng": ["../dist/@siemens/native-charts-ng"],
"@siemens/native-charts-ng/*": ["../dist/@siemens/native-charts-ng/*"],
"@siemens/dashboards-ng": ["../dist/@siemens/dashboards-ng"],
"@siemens/dashboards-ng/*": ["../dist/@siemens/dashboards-ng/*"],
"@siemens/maps-ng": ["../dist/@siemens/maps-ng"],
"@siemens/maps-ng/*": ["../dist/@siemens/maps-ng/*"],
"@siemens/map-styles/*": ["../dist/@siemens/map-styles/*"]
},
"useDefineForClassFields": true
},
Expand Down
Loading
Loading