resolve merge conflicts and changes

wso2 · Apr 4, 2024 · c2b157a · c2b157a
1 parent fc00a6e
commit c2b157a
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 43 deletions.
diff --git a/features/admin.applications.v1/api/use-get-application-template-metadata.ts b/features/admin.applications.v1/api/use-get-application-template-metadata.ts
@@ -21,8 +21,8 @@ import useRequest, {
     RequestConfigInterface,
     RequestErrorInterface,
     RequestResultInterface
-} from "../../admin-core-v1/hooks/use-request";
-import { store } from "../../admin-core-v1/store";
+} from "../../admin.core.v1/hooks/use-request";
+import { store } from "../../admin.core.v1/store";
 import {
     ApplicationTemplateMetadataInterface
 } from "../models/application-templates";

diff --git a/features/admin.applications.v1/api/use-get-application-template.ts b/features/admin.applications.v1/api/use-get-application-template.ts
@@ -21,8 +21,8 @@ import useRequest, {
     RequestConfigInterface,
     RequestErrorInterface,
     RequestResultInterface
-} from "../../admin-core-v1/hooks/use-request";
-import { store } from "../../admin-core-v1/store";
+} from "../../admin.core.v1/hooks/use-request";
+import { store } from "../../admin.core.v1/store";
 import { ApplicationTemplateInterface } from "../models/application-templates";
 
 /**

diff --git a/features/admin.applications.v1/api/use-get-application-templates.ts b/features/admin.applications.v1/api/use-get-application-templates.ts
@@ -22,8 +22,8 @@ import useRequest, {
     RequestConfigInterface,
     RequestErrorInterface,
     RequestResultInterface
-} from "../../admin-core-v1/hooks/use-request";
-import { AppState, store } from "../../admin-core-v1/store";
+} from "../../admin.core.v1/hooks/use-request";
+import { AppState, store } from "../../admin.core.v1/store";
 import { ApplicationTemplateConstants } from "../constants/application-templates";
 import { ApplicationTemplateListInterface } from "../models/application-templates";
 

diff --git a/...emplates/application-creation-adapter.tsx → ...emplates/application-creation-adapter.tsx b/...emplates/application-creation-adapter.tsx → ...emplates/application-creation-adapter.tsx
@@ -20,7 +20,7 @@ import { IdentifiableComponentInterface } from "@wso2is/core/models";
 import { ContentLoader } from "@wso2is/react-components";
 import React, { FunctionComponent, ReactElement, useEffect, useState } from "react";
 import { useSelector } from "react-redux";
-import { AppState } from "../../../admin-core-v1";
+import { AppState } from "../../../admin.core.v1";
 import { ApplicationTemplateManagementUtils } from "../..//utils/application-template-management-utils";
 import { ApplicationManagementConstants } from "../../constants";
 import { ApplicationTemplateListItemInterface } from "../../models";

diff --git a/...-templates/application-templates-grid.tsx → ...-templates/application-templates-grid.tsx b/...-templates/application-templates-grid.tsx → ...-templates/application-templates-grid.tsx
@@ -16,9 +16,6 @@
  * under the License.
  */
 
-import {
-    getEmptyPlaceholderIllustrations
-} from "@wso2is/common/src/configs/ui";
 import { IdentifiableComponentInterface, LoadableComponentInterface } from "@wso2is/core/models";
 import {
     ContentLoader,
@@ -31,7 +28,7 @@ import union from "lodash-es/union";
 import React, { FunctionComponent, ReactElement, SyntheticEvent, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
-import { AppState, EventPublisher } from "../../../admin-core-v1";
+import { AppState, EventPublisher, getEmptyPlaceholderIllustrations } from "../../../admin.core.v1";
 import { ApplicationTemplateConstants } from "../../constants/application-templates";
 import useApplicationTemplates from "../../hooks/use-application-templates";
 import { AuthProtocolMetaListItemInterface } from "../../models";

diff --git a/...-forms/application-form-dynamic-field.tsx → ...-forms/application-form-dynamic-field.tsx b/...-forms/application-form-dynamic-field.tsx → ...-forms/application-form-dynamic-field.tsx
diff --git a/...context/application-templates-context.tsx → ...context/application-templates-context.tsx b/...context/application-templates-context.tsx → ...context/application-templates-context.tsx
diff --git a/...ons-v1/hooks/use-application-templates.ts → ...ons.v1/hooks/use-application-templates.ts b/...ons-v1/hooks/use-application-templates.ts → ...ons.v1/hooks/use-application-templates.ts
diff --git a/features/admin.applications.v1/pages/application-template.tsx b/features/admin.applications.v1/pages/application-template.tsx
@@ -23,7 +23,7 @@ import { useTranslation } from "react-i18next";
 import {
     AppConstants,
     history
-} from "../../admin-core-v1";
+} from "../../admin.core.v1";
 import ApplicationCreationAdapter from "../components/application-templates/application-creation-adapter";
 import ApplicationTemplateGrid from "../components/application-templates/application-templates-grid";
 import { ApplicationTemplateListInterface } from "../models/application-templates";

diff --git a/...ovider/application-templates-provider.tsx → ...ovider/application-templates-provider.tsx b/...ovider/application-templates-provider.tsx → ...ovider/application-templates-provider.tsx
diff --git a/features/admin.applications.v1/utils/application-template-management-utils.ts b/features/admin.applications.v1/utils/application-template-management-utils.ts
@@ -25,9 +25,9 @@ import { AxiosError } from "axios";
 import groupBy from "lodash-es/groupBy";
 import isObject from "lodash-es/isObject";
 import startCase  from "lodash-es/startCase";
-import { AppConstants } from "../../admin-core-v1";
-import { getTechnologyLogos } from "../../admin-core-v1/configs";
-import { store } from "../../admin-core-v1/store";
+import { AppConstants } from "../../admin.core.v1";
+import { getTechnologyLogos } from "../../admin.core.v1/configs";
+import { store } from "../../admin.core.v1/store";
 import {
     getApplicationTemplateList
 } from "../api";

diff --git a/features/admin.core.v1/configs/app.ts b/features/admin.core.v1/configs/app.ts
@@ -19,34 +19,34 @@
 import { DocumentationConstants } from "@wso2is/core/constants";
 import { DocumentationProviders, DocumentationStructureFileTypes } from "@wso2is/core/models";
 import { I18nModuleInitOptions, I18nModuleOptionsInterface, MetaI18N, generateBackendPaths } from "@wso2is/i18n";
-import { getAPIResourceEndpoints } from "../../admin-api-resources-v1/configs/endpoint";
-import { getApplicationsResourceEndpoints } from "../../admin-applications-v1/configs/endpoints";
-import isLegacyAuthzRuntime from "../../admin-authorization-v1/utils/get-legacy-authz-runtime";
-import { getBrandingResourceEndpoints } from "../../admin-branding-v1/configs/endpoints";
-import { getCertificatesResourceEndpoints } from "../../admin-certificates-v1";
-import { getClaimResourceEndpoints } from "../../admin-claims-v1/configs/endpoints";
-import { getConnectionResourceEndpoints } from "../../admin-connections-v1";
-import { getConsoleSettingsResourceEndpoints } from "../../admin-console-settings-v1/configs/endpoints";
-import { getEmailTemplatesResourceEndpoints } from "../../admin-email-templates-v1";
-import { getFeatureGateResourceEndpoints } from "../../admin-extensions-v1/components/feature-gate/configs";
-import { getExtendedFeatureResourceEndpoints } from "../../admin-extensions-v1/configs/endpoints";
-import { getGroupsResourceEndpoints } from "../../admin-groups-v1";
-import { getIDPResourceEndpoints } from "../../admin-identity-providers-v1/configs/endpoints";
-import { getIDVPResourceEndpoints } from "../../admin-identity-verification-providers-v1";
-import { getScopesResourceEndpoints } from "../../admin-oidc-scopes-v1";
-import { getInsightsResourceEndpoints } from "../../admin-org-insights-v1/config/org-insights";
-import { getOrganizationsResourceEndpoints } from "../../admin-organizations-v1/configs";
-import { OrganizationUtils } from "../../admin-organizations-v1/utils";
-import { getJWTAuthenticationServiceEndpoints } from "../../admin-private-key-jwt-v1/configs";
-import { getRemoteFetchConfigResourceEndpoints } from "../../admin-remote-repository-configuration-v1";
-import { getRolesResourceEndpoints } from "../../admin-roles-v2/configs/endpoints";
-import { getSecretsManagementEndpoints } from "../../admin-secrets-v1/configs/endpoints";
-import { getServerConfigurationsResourceEndpoints } from "../../admin-server-configurations-v1";
-import { getTenantResourceEndpoints } from "../../admin-tenants-v1/configs/endpoints";
-import { getUsersResourceEndpoints } from "../../admin-users-v1/configs/endpoints";
-import { getUserstoreResourceEndpoints } from "../../admin-userstores-v1/configs/endpoints";
-import { getValidationServiceEndpoints } from "../../admin-validation-v1/configs";
-import { getApprovalsResourceEndpoints } from "../../admin-workflow-approvals-v1";
+import { getAPIResourceEndpoints } from "../../admin.api-resources.v1/configs/endpoint";
+import { getApplicationsResourceEndpoints } from "../../admin.applications.v1/configs/endpoints";
+import isLegacyAuthzRuntime from "../../admin.authorization.v1/utils/get-legacy-authz-runtime";
+import { getBrandingResourceEndpoints } from "../../admin.branding.v1/configs/endpoints";
+import { getCertificatesResourceEndpoints } from "../../admin.certificates.v1";
+import { getClaimResourceEndpoints } from "../../admin.claims.v1/configs/endpoints";
+import { getConnectionResourceEndpoints } from "../../admin.connections.v1";
+import { getConsoleSettingsResourceEndpoints } from "../../admin.console-settings.v1/configs/endpoints";
+import { getEmailTemplatesResourceEndpoints } from "../../admin.email-templates.v1";
+import { getFeatureGateResourceEndpoints } from "../../admin.extensions.v1/components/feature-gate/configs";
+import { getExtendedFeatureResourceEndpoints } from "../../admin.extensions.v1/configs/endpoints";
+import { getGroupsResourceEndpoints } from "../../admin.groups.v1";
+import { getIDPResourceEndpoints } from "../../admin.identity-providers.v1/configs/endpoints";
+import { getIDVPResourceEndpoints } from "../../admin.identity-verification-providers.v1";
+import { getScopesResourceEndpoints } from "../../admin.oidc-scopes.v1";
+import { getInsightsResourceEndpoints } from "../../admin.org-insights.v1/config/org-insights";
+import { getOrganizationsResourceEndpoints } from "../../admin.organizations.v1/configs";
+import { OrganizationUtils } from "../../admin.organizations.v1/utils";
+import { getJWTAuthenticationServiceEndpoints } from "../../admin.private-key-jwt.v1/configs";
+import { getRemoteFetchConfigResourceEndpoints } from "../../admin.remote-repository-configuration.v1";
+import { getRolesResourceEndpoints } from "../../admin.roles.v2/configs/endpoints";
+import { getSecretsManagementEndpoints } from "../../admin.secrets.v1/configs/endpoints";
+import { getServerConfigurationsResourceEndpoints } from "../../admin.server-configurations.v1";
+import { getTenantResourceEndpoints } from "../../admin.tenants.v1/configs/endpoints";
+import { getUsersResourceEndpoints } from "../../admin.users.v1/configs/endpoints";
+import { getUserstoreResourceEndpoints } from "../../admin.userstores.v1/configs/endpoints";
+import { getValidationServiceEndpoints } from "../../admin.validation.v1/configs";
+import { getApprovalsResourceEndpoints } from "../../admin.workflow-approvals.v1";
 import { I18nConstants, UIConstants } from "../constants";
 import { DeploymentConfigInterface, ServiceResourceEndpointsInterface, UIConfigInterface } from "../models";
 import { store } from "../store";