Skip to content

Commit 469b191

Browse files
authored
Merge pull request #9971 from wso2/sync-pr-9938-to-next
[Sync][master -> next][#9938]: Style updates to user onboarding UI and add Logo URL input
2 parents 9f05786 + 1d1be28 commit 469b191

51 files changed

Lines changed: 1536 additions & 850 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/soft-cheetahs-allow.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@wso2is/admin.onboarding.v1": patch
3+
"@wso2is/console": patch
4+
---
5+
6+
Improvements and style updates to onboarding.

apps/console/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2018,6 +2018,7 @@
20182018
"enabled": {% if console.onboarding.enabled is defined %} {{ console.onboarding.enabled }},
20192019
{% else %} true,
20202020
{% endif %}
2021+
"featureDeployedDate": "{% if console.onboarding.feature_deployed_date is defined %}{{ console.onboarding.feature_deployed_date }}{% endif %}",
20212022
"scopes": {
20222023
{% if console.onboarding.scopes is defined %}
20232024
{% for operation, scopes in console.onboarding.scopes.items() %}

apps/console/src/public/deployment.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,8 @@
13801380
},
13811381
"onboarding": {
13821382
"disabledFeatures": [],
1383-
"enabled": true,
1383+
"enabled": false,
1384+
"featureDeployedDate": "",
13841385
"featureFlags": [],
13851386
"scopes": {
13861387
"create": [

features/admin.core.v1/models/config.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ interface ConnectionConfigInterface extends FeatureAccessConfigInterface {
7474
templates?: Record<string, any>[];
7575
}
7676

77+
/**
78+
* Extended feature config for onboarding with deployment-specific fields.
79+
*/
80+
export interface OnboardingFeatureConfigInterface extends FeatureAccessConfigInterface {
81+
/**
82+
* Cutoff date (YYYY-MM-DD) for determining whether a user is "new".
83+
* Users with SCIM2 meta.created on or after this date are considered new.
84+
*/
85+
featureDeployedDate?: string;
86+
}
87+
7788
/**
7889
* Application configuration interface.
7990
*/
@@ -141,7 +152,7 @@ export interface FeatureConfigInterface {
141152
/**
142153
* Onboarding wizard feature.
143154
*/
144-
onboarding?: FeatureAccessConfigInterface;
155+
onboarding?: OnboardingFeatureConfigInterface;
145156
/**
146157
* SMS providers feature.
147158
*/

features/admin.onboarding.v1/api/auth-sequence-builder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import {
2020
LocalAuthenticatorConstants
2121
} from "@wso2is/admin.connections.v1/constants/local-authenticator-constants";
22-
import { SignInOptionsConfigInterface } from "../models";
22+
import { SignInOptionsConfigInterface } from "../models/sign-in-options";
2323

2424
const AuthNames: typeof LocalAuthenticatorConstants.AUTHENTICATOR_NAMES =
2525
LocalAuthenticatorConstants.AUTHENTICATOR_NAMES;

features/admin.onboarding.v1/api/create-onboarding-application.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ import OIDCWebAppTemplate
3333
import SPATemplate from "@wso2is/admin.extensions.v1/application-templates/templates/single-page-application/single-page-application.json";
3434
import { IdentityAppsApiException } from "@wso2is/core/exceptions";
3535
import { buildAuthSequence } from "./auth-sequence-builder";
36-
import { CreatedApplicationResultInterface, OnboardingDataInterface } from "../models";
36+
import { CreatedApplicationResultInterface } from "../models/application";
37+
import { OnboardingDataInterface } from "../models/onboarding";
3738
import { extractOrigins } from "../utils/url-utils";
3839

3940
/**

features/admin.onboarding.v1/api/create-test-user.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import { addUser } from "@wso2is/admin.users.v1/api/users";
2020
import { UserDetailsInterface } from "@wso2is/admin.users.v1/models/user";
21-
import { TestUserCredentialsInterface } from "../models";
21+
import { TestUserCredentialsInterface } from "../models/application";
2222
import { generateSecurePassword } from "../utils/password-generator";
2323

2424
/**

features/admin.onboarding.v1/api/create-try-it-application.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ import { IdentityAppsApiException } from "@wso2is/core/exceptions";
3333
import { AxiosResponse } from "axios";
3434
import cloneDeep from "lodash-es/cloneDeep";
3535
import { buildAuthSequence } from "./auth-sequence-builder";
36-
import { CreatedApplicationResultInterface, OnboardingDataInterface } from "../models";
36+
import { CreatedApplicationResultInterface } from "../models/application";
37+
import { OnboardingDataInterface } from "../models/onboarding";
3738

3839
/**
3940
* Creates or reuses the Try It application for the Tour flow.

features/admin.onboarding.v1/api/multi-attribute-login.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
ServerConfigurationsConstants
2323
} from "@wso2is/admin.server-configurations.v1/constants/server-configurations-constants";
2424
import { IdentityAppsApiException } from "@wso2is/core/exceptions";
25-
import { SignInIdentifiersConfigInterface } from "../models";
25+
import { SignInIdentifiersConfigInterface } from "../models/sign-in-options";
2626

2727
/**
2828
* Enables multi-attribute login (email/mobile) at the organization level

features/admin.onboarding.v1/api/update-onboarding-branding.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
import { HttpMethods } from "@wso2is/core/models";
3232
import merge from "lodash-es/merge";
3333
import { BrandingConstraints } from "../constants/preset-logos";
34-
import { OnboardingBrandingConfigInterface } from "../models";
34+
import { OnboardingBrandingConfigInterface } from "../models/branding";
3535

3636
/**
3737
* Default theme name used to load theme variables.

0 commit comments

Comments
 (0)