diff --git a/projects/arlas-toolkit/src/lib/components/widget/widget.component.html b/projects/arlas-toolkit/src/lib/components/widget/widget.component.html index 2e78f82d..d7341595 100644 --- a/projects/arlas-toolkit/src/lib/components/widget/widget.component.html +++ b/projects/arlas-toolkit/src/lib/components/widget/widget.component.html @@ -81,5 +81,5 @@
- +
diff --git a/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts b/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts index e9b0d46e..ae2709ee 100644 --- a/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts +++ b/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts @@ -148,6 +148,7 @@ export class WidgetComponent implements OnInit { public ngOnInit() { this.contributorType = this.getContirbutorType(); this.contributor = this.arlasStartupService.contributorRegistry.get(this.contributorId); + console.log(this.contributor); if (this.componentType === 'swimlane') { this.swimlanes = this.contributor.getConfigValue('swimlanes'); if (this.swimlanes) { diff --git a/projects/arlas-toolkit/src/lib/services/configuration-updater/configurationUpdater.service.ts b/projects/arlas-toolkit/src/lib/services/configuration-updater/configurationUpdater.service.ts index 30f131e0..8e615a25 100644 --- a/projects/arlas-toolkit/src/lib/services/configuration-updater/configurationUpdater.service.ts +++ b/projects/arlas-toolkit/src/lib/services/configuration-updater/configurationUpdater.service.ts @@ -130,18 +130,12 @@ export class ArlasConfigurationUpdaterService { contributorsToRemove.add(contributor.identifier); } }); -<<<<<<< HEAD /** remove shortcuts contributors */ data.arlas.web.contributors.filter(contributor => contributor.linkedContributorId).forEach(contributor => { if (contributorsToRemove.has(contributor.linkedContributorId)) { contributorsToRemove.add(contributor.identifier); } }); -======= - - /** remove metrics table contributors */ - ->>>>>>> f25072e (Integrate MetricsTable component) } return contributorsToRemove; } diff --git a/projects/arlas-toolkit/src/lib/shared.module.ts b/projects/arlas-toolkit/src/lib/shared.module.ts index 3792f77b..7ccf3ae4 100644 --- a/projects/arlas-toolkit/src/lib/shared.module.ts +++ b/projects/arlas-toolkit/src/lib/shared.module.ts @@ -53,7 +53,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { CalendarTimelineModule, ColorGeneratorLoader, ColorGeneratorModule, DonutModule, FormatNumberModule, - HistogramModule, MapglLegendModule, MetricModule, PowerbarsModule, ResultsModule + HistogramModule, MapglLegendModule, MetricModule, MetricsTableComponent, MetricsTableModule, PowerbarsModule, ResultsModule } from 'arlas-web-components'; import en from 'arlas-web-components/assets/i18n/en.json'; import fr from 'arlas-web-components/assets/i18n/fr.json'; @@ -171,6 +171,7 @@ export class CustomTranslateLoader implements TranslateLoader { MatProgressBarModule, MatProgressSpinnerModule, MatSelectModule, + MetricsTableModule, MatSnackBarModule, MatStepperModule, MatTableModule,