Skip to content

Commit 32fc39c

Browse files
committed
Merge master
2 parents f6a0f9c + 05a478c commit 32fc39c

File tree

16 files changed

+425
-117
lines changed

16 files changed

+425
-117
lines changed

.github/workflows/mainCI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
security-events: write
1919

2020
steps:
21-
- name: Use Node.js 16.x
21+
- name: Use Node.js 20.x
2222
uses: actions/checkout@v2
2323
with:
24-
node-version: 16.x
24+
node-version: 20.x
2525

2626
- name: Install
2727
run: npm install

package-lock.json

Lines changed: 59 additions & 97 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@
8383
"@microsoft/applicationinsights-web": "^3.0.2",
8484
"@monaco-editor/loader": "^1.3.3",
8585
"@monaco-editor/react": "^4.6.0",
86-
"@paperbits/azure": "^0.1.631",
87-
"@paperbits/common": "^0.1.632",
88-
"@paperbits/core": "^0.1.632",
89-
"@paperbits/forms": "^0.1.632",
86+
"@paperbits/azure": "^0.1.634",
87+
"@paperbits/common": "^0.1.634",
88+
"@paperbits/core": "^0.1.634",
89+
"@paperbits/forms": "^0.1.634",
9090
"@paperbits/react": "1.0.8",
91-
"@paperbits/styles": "^0.1.632",
91+
"@paperbits/styles": "^0.1.634",
9292
"@webcomponents/custom-elements": "1.6.0",
9393
"@webcomponents/shadydom": "^1.11.0",
9494
"client-oauth2": "4.3.3",

src/apim.runtime.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,13 @@ import { ConfirmPasswordRuntimeModule } from "./components/users/confirm-passwor
112112
import { SubscriptionsRuntimeModule } from "./components/users/subscriptions/subscriptions.runtime.module";
113113
import { ReportsRuntimeModule } from "./components/reports/reports.runtime.module";
114114
import { ValidationSummaryRuntimeModule } from "./components/users/validation-summary/validationSummary.runtime.module";
115+
import { ClientLogger } from "./logging/clientLogger";
115116

116117
export class ApimRuntimeModule implements IInjectorModule {
117118
public register(injector: IInjector): void {
118119
injector.bindModule(new ReactModule());
119120
injector.bindSingleton("logger", ConsoleLogger);
121+
// injector.bindSingleton("logger", ClientLogger);
120122
injector.bindSingleton("traceClick", TraceClick);
121123
injector.bindToCollection("autostart", UnhandledErrorHandler);
122124
injector.bindToCollection("autostart", BalloonBindingHandler);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<button id="signinB2C" class="button" data-bind="click: signIn, css: classNames, traceClick">
1+
<button id="signinB2C" class="button" data-action="B2C Sign in" data-bind="click: signIn, css: classNames, traceClick">
22
<i class="icon-emb icon-svg-aad"></i>
33
<span data-bind="text: label"></span>
44
</button>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<button id="signinAad" class="button" data-bind="click: signIn, css: classNames, traceClick">
1+
<button id="signinAad" class="button" data-action="AAD Sign in" data-bind="click: signIn, css: classNames, traceClick">
22
<i class="icon-emb icon-svg-aad"></i>
33
<span data-bind="text: label"></span>
44
</button>

src/components/users/signup/ko/runtime/signup.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434

3535
<!-- ko if: requireHipCaptcha -->
3636
<hip-captcha params="{ captchaData: captchaData, onInitComplete: onCaptchaCreated }"></hip-captcha>
37-
<!-- /ko -->
38-
37+
<!-- /ko -->
38+
3939
<!-- ko if: termsEnabled && termsOfUse -->
4040
<terms-of-use params="{ isConsentRequired: isConsentRequired, consented: consented, termsOfUse: termsOfUse }"></terms-of-use>
4141
<!-- /ko -->
4242

4343
<div class="form-group">
44-
44+
4545
<!-- ko ifnot: working -->
46-
<button type="button" id="signup" class="button button-primary" data-bind="click: signup">
46+
<button type="button" id="signup" class="button button-primary" data-action="Sign up" data-bind="click: signup">
4747
Sign up
4848
</button>
4949
<!-- /ko -->

src/constants.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,3 +372,14 @@ export const isRedesignEnabledSetting = "isRedesignEnabled";
372372
* Key of the default admin user
373373
*/
374374
export const integrationUserId = '/users/integration';
375+
376+
/**
377+
* This is used to store the unique user in local storage and identify the user session in client telemetry.
378+
*/
379+
export const USER_SESSION = "userSessionId";
380+
export const USER_ID = "userId";
381+
export const USER_ACTION = "data-action";
382+
383+
// Feature flags
384+
export const FEATURE_FLAGS = "featureFlags";
385+
export const FEATURE_CLIENT_TELEMETRY = "clientTelemetry";

0 commit comments

Comments
 (0)