Skip to content

FUI - Redesign enabling logging #2775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2025
Merged
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
7 changes: 6 additions & 1 deletion src/admin/leftPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ISiteService } from '@paperbits/common/sites';
import { EventManager } from '@paperbits/common/events';
import { ViewManager } from '@paperbits/common/ui';
import { Router } from '@paperbits/common/routing';
import { Logger } from '@paperbits/common/logging';
import { initializeIcons } from '@fluentui/font-icons-mdl2';
import { CommandBarButton, Icon, IIconProps, Separator, Stack, Text, Toggle } from '@fluentui/react';
import { Pages } from './pages/pages';
Expand Down Expand Up @@ -68,6 +69,9 @@ export class LeftPanel extends React.Component<{}, LeftPanelState> {
@Resolve('router')
public router: Router;

@Resolve('logger')
public logger: Logger;

constructor(props: any) {
super(props);

Expand Down Expand Up @@ -240,9 +244,10 @@ export class LeftPanel extends React.Component<{}, LeftPanelState> {
onText={"On"}
offText={"Off"}
checked={this.state.isRedesignEnabled}
onChange={async (ev, checked) => {
onChange={async (_, checked) => {
this.setState({ isRedesignEnabled: checked });
await this.siteService.setSetting(isRedesignEnabledSetting, checked);
this.logger.trackEvent(`${checked ? 'Checked' : 'Unchecked'}: Preview new UI design`);
this.eventManager.dispatchEvent('onSaveChanges');
this.eventManager.dispatchEvent('onDataPush'); // Needed to reload the runtime part
}}
Expand Down
10 changes: 5 additions & 5 deletions src/components/reports/ko/runtime/reports.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="btn-group" role="group" aria-label="Time range">
<button class="button button-default"
<div class="btn-group flex flex-row" role="group" aria-label="Time range">
<button class="button button-default mr-20"
data-bind="click: setTimeRange1Hour, disable: selectedPeriod() == '1hour'">Last hour</button>
<button class="button button-default"
<button class="button button-default mr-20"
data-bind="click: setTimeRange1Day, disable: selectedPeriod() == '1day'">Today</button>
<button class="button button-default"
<button class="button button-default mr-20"
data-bind="click: setTimeRange7Days, disable: selectedPeriod() == '7days'">Last 7 days</button>
<button class="button button-default"
<button class="button button-default mr-20"
data-bind="click: setTimeRange30Days, disable: selectedPeriod() == '30days'">Last 30 days</button>
<button class="button button-default"
data-bind="click: setTimeRange90Days, disable: selectedPeriod() == '90days'">Last 90 days</button>
Expand Down
3 changes: 3 additions & 0 deletions src/logging/wellKnownEventTypes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export enum WellKnownEventTypes {
Publishing = "Publishing"
}
11 changes: 10 additions & 1 deletion src/publishing/runtimeConfigPublisher.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import * as Utils from "@paperbits/common/utils";
import { IBlobStorage } from "@paperbits/common/persistence";
import { IPublisher } from "@paperbits/common/publishing";
import { ISiteService } from "@paperbits/common/sites";
import { Logger } from "@paperbits/common/logging";
import { WellKnownEventTypes } from "../logging/wellKnownEventTypes";
import { isRedesignEnabledSetting } from "../constants";
import { RuntimeConfigBuilder } from "./runtimeConfigBuilder";

/**
Expand All @@ -9,10 +13,15 @@ import { RuntimeConfigBuilder } from "./runtimeConfigBuilder";
export class RuntimeConfigPublisher implements IPublisher {
constructor(
private readonly runtimeConfigBuilder: RuntimeConfigBuilder,
private readonly outputBlobStorage: IBlobStorage
private readonly outputBlobStorage: IBlobStorage,
private readonly siteService: ISiteService,
private readonly logger: Logger,
) { }

public async publish(): Promise<void> {
const isRedesignEnabled = await this.siteService.getSetting(isRedesignEnabledSetting);
this.logger.trackEvent(WellKnownEventTypes.Publishing, { message: `Preview components ${isRedesignEnabled ? 'enabled' : 'disabled'}.`});

const configuration = this.runtimeConfigBuilder.build();
const content = Utils.stringToUnit8Array(JSON.stringify(configuration));

Expand Down