Revert "fix Cannot find module when import ResourceType in server fro…

…m public folder (opensearch-project#1705)" This reverts commit 09b2f59. Signed-off-by: Derek Ho <[email protected]>
derek-ho · Jan 16, 2024 · 2de58e3 · 2de58e3
1 parent 2f16e4e
commit 2de58e3
Show file tree

Hide file tree

Showing 33 changed files with 60 additions and 71 deletions.
diff --git a/common/index.ts b/common/index.ts
@@ -64,18 +64,6 @@ export enum AuthType {
   ANONYMOUS = 'anonymous',
 }
 
-export enum ResourceType {
-  roles = 'roles',
-  users = 'users',
-  serviceAccounts = 'serviceAccounts',
-  permissions = 'permissions',
-  tenants = 'tenants',
-  tenantsManageTab = 'tenantsManageTab',
-  tenantsConfigureTab = 'tenantsConfigureTab',
-  auth = 'auth',
-  auditLogging = 'auditLogging',
-}
-
 /**
  * A valid resource name should not containing percent sign (%) as they raise url injection issue.
  * And also should not be empty.

diff --git a/public/apps/configuration/app-router.tsx b/public/apps/configuration/app-router.tsx
@@ -36,8 +36,7 @@ import { RoleView } from './panels/role-view/role-view';
 import { TenantList } from './panels/tenant-list/tenant-list';
 import { UserList } from './panels/user-list';
 import { ServiceAccountList } from './panels/service-account-list';
-import { Action, RouteItem, SubAction } from './types';
-import { ResourceType } from '../../../common';
+import { Action, ResourceType, RouteItem, SubAction } from './types';
 import { buildHashUrl, buildUrl } from './utils/url-builder';
 import { CrossPageToast } from './cross-page-toast';
 

diff --git a/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx b/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx
@@ -31,7 +31,7 @@ import { SETTING_GROUPS, SettingMapItem } from './constants';
 import { EditSettingGroup } from './edit-setting-group';
 import { AuditLoggingSettings } from './types';
 import { buildHashUrl, buildUrl } from '../../utils/url-builder';
-import { ResourceType } from '../../../../../common';
+import { ResourceType } from '../../types';
 import { getAuditLogging, updateAuditLogging } from '../../utils/audit-logging-utils';
 import { useToastState } from '../../utils/toast-utils';
 import { setCrossPageToast } from '../../utils/storage-utils';

diff --git a/public/apps/configuration/panels/audit-logging/audit-logging.tsx b/public/apps/configuration/panels/audit-logging/audit-logging.tsx
@@ -31,7 +31,7 @@ import {
 import React from 'react';
 import { FormattedMessage } from '@osd/i18n/react';
 import { AppDependencies } from '../../../types';
-import { ResourceType } from '../../../../../common';
+import { ResourceType } from '../../types';
 import { getAuditLogging, updateAuditLogging } from '../../utils/audit-logging-utils';
 import { displayBoolean, ExternalLink } from '../../utils/display-utils';
 import { buildHashUrl } from '../../utils/url-builder';

diff --git a/public/apps/configuration/panels/audit-logging/test/audit-logging-edit-settings.test.tsx b/public/apps/configuration/panels/audit-logging/test/audit-logging-edit-settings.test.tsx
@@ -18,7 +18,7 @@ import { AuditLoggingEditSettings } from '../audit-logging-edit-settings';
 import React from 'react';
 import { ComplianceSettings, GeneralSettings } from '../types';
 import { buildHashUrl } from '../../../utils/url-builder';
-import { ResourceType } from '../../../../../../common';
+import { ResourceType } from '../../../types';
 
 jest.mock('../../../utils/audit-logging-utils');
 

diff --git a/public/apps/configuration/panels/audit-logging/test/audit-logging.test.tsx b/public/apps/configuration/panels/audit-logging/test/audit-logging.test.tsx
@@ -18,7 +18,7 @@ import { AuditLogging, renderComplianceSettings, renderGeneralSettings } from '.
 import React from 'react';
 import { EuiSwitch } from '@elastic/eui';
 import { buildHashUrl } from '../../../utils/url-builder';
-import { ResourceType } from '../../../../../../common';
+import { ResourceType } from '../../../types';
 import {
   SUB_URL_FOR_COMPLIANCE_SETTINGS_EDIT,
   SUB_URL_FOR_GENERAL_SETTINGS_EDIT,

diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx
@@ -27,12 +27,17 @@ import {
 } from '@elastic/eui';
 import React from 'react';
 import { FormattedMessage } from '@osd/i18n/react';
+import { flow } from 'lodash';
+import { HashRouter as Router, Route } from 'react-router-dom';
 import { AppDependencies } from '../../types';
-import { buildHashUrl } from '../utils/url-builder';
-import { Action } from '../types';
-import { ResourceType } from '../../../../common';
+import { buildHashUrl, buildUrl } from '../utils/url-builder';
+import { Action, ResourceType, RouteItem } from '../types';
 import { API_ENDPOINT_CACHE, DocLinks } from '../constants';
 import { ExternalLink, ExternalLinkButton } from '../utils/display-utils';
+import { TenantList } from './tenant-list/tenant-list';
+import { getBreadcrumbs } from '../app-router';
+
+import { CrossPageToast } from '../cross-page-toast';
 
 const addBackendStep = {
   title: 'Add backends',

diff --git a/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx b/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx
@@ -26,8 +26,7 @@ import {
 } from '@elastic/eui';
 import React, { useState } from 'react';
 import { BreadcrumbsPageDependencies } from '../../../types';
-import { InternalUserUpdate } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { InternalUserUpdate, ResourceType } from '../../types';
 import { getUserDetail, updateUser } from '../../utils/internal-user-detail-utils';
 import { PanelWithHeader } from '../../utils/panel-with-header';
 import { PasswordEditPanel } from '../../utils/password-edit-panel';

diff --git a/public/apps/configuration/panels/role-edit/cluster-permission-panel.tsx b/public/apps/configuration/panels/role-edit/cluster-permission-panel.tsx
@@ -15,8 +15,7 @@
 
 import React, { Dispatch, SetStateAction } from 'react';
 import { EuiForm, EuiFlexGroup, EuiFlexItem, EuiComboBox } from '@elastic/eui';
-import { ComboBoxOptions } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { ComboBoxOptions, ResourceType } from '../../types';
 import { PanelWithHeader } from '../../utils/panel-with-header';
 import { FormRow } from '../../utils/form-row';
 import { LIMIT_WIDTH_INPUT_CLASS } from '../../constants';

diff --git a/public/apps/configuration/panels/role-edit/index-permission-panel.tsx b/public/apps/configuration/panels/role-edit/index-permission-panel.tsx
@@ -25,8 +25,7 @@ import {
 } from '@elastic/eui';
 import React, { Dispatch, Fragment, SetStateAction } from 'react';
 import { isEmpty } from 'lodash';
-import { RoleIndexPermission } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { RoleIndexPermission, ResourceType } from '../../types';
 import {
   appendElementToArray,
   removeElementFromArray,
@@ -142,9 +141,9 @@ export function IndexPermissionRow(props: {
   return (
     <FormRow
       headerText="Index permissions"
-      headerSubText="You can specify permissions using both action groups or single permissions.
+      headerSubText="You can specify permissions using both action groups or single permissions. 
         A permission group is a list of single permissions.
-        You can often achieve your desired security posture using some combination of the default permission groups.
+        You can often achieve your desired security posture using some combination of the default permission groups. 
         You can also create your own reusable permission groups."
     >
       <EuiFlexGroup>

diff --git a/public/apps/configuration/panels/role-edit/role-edit.tsx b/public/apps/configuration/panels/role-edit/role-edit.tsx
@@ -46,8 +46,7 @@ import {
 } from './tenant-panel';
 import { RoleIndexPermissionStateClass, RoleTenantPermissionStateClass } from './types';
 import { buildHashUrl, buildUrl } from '../../utils/url-builder';
-import { ComboBoxOptions, Action, ActionGroupItem } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { ComboBoxOptions, ResourceType, Action, ActionGroupItem } from '../../types';
 import {
   useToastState,
   createUnknownErrorToast,

diff --git a/public/apps/configuration/panels/role-list.tsx b/public/apps/configuration/panels/role-list.tsx
@@ -41,8 +41,7 @@ import {
   fetchRoleMapping,
   buildSearchFilterOptions,
 } from '../utils/role-list-utils';
-import { Action } from '../types';
-import { ResourceType } from '../../../../common';
+import { ResourceType, Action } from '../types';
 import { buildHashUrl } from '../utils/url-builder';
 import {
   ExternalLink,

diff --git a/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx b/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx
@@ -35,8 +35,7 @@ import { ExternalIdentityStateClass } from './types';
 import { ComboBoxOptions } from '../../types';
 import { stringToComboBoxOption, comboBoxOptionToString } from '../../utils/combo-box-utils';
 import { buildHashUrl, buildUrl } from '../../utils/url-builder';
-import { RoleMappingDetail, SubAction, Action } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { ResourceType, RoleMappingDetail, SubAction, Action } from '../../types';
 import { fetchUserNameList } from '../../utils/internal-user-list-utils';
 import { updateRoleMapping, getRoleMappingData } from '../../utils/role-mapping-utils';
 import { createErrorToast, createUnknownErrorToast, useToastState } from '../../utils/toast-utils';

diff --git a/public/apps/configuration/panels/role-mapping/users-panel.tsx b/public/apps/configuration/panels/role-mapping/users-panel.tsx
@@ -19,8 +19,7 @@ import { ComboBoxOptions } from '../../types';
 import { PanelWithHeader } from '../../utils/panel-with-header';
 import { FormRow } from '../../utils/form-row';
 import { buildHashUrl } from '../../utils/url-builder';
-import { Action } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { ResourceType, Action } from '../../types';
 import { ExternalLinkButton } from '../../utils/display-utils';
 import { DocLinks } from '../../constants';
 import { appendOptionToComboBoxHandler } from '../../utils/combo-box-utils';

diff --git a/public/apps/configuration/panels/role-view/cluster-permission-panel.tsx b/public/apps/configuration/panels/role-view/cluster-permission-panel.tsx
@@ -17,8 +17,7 @@ import React from 'react';
 import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 import { PanelWithHeader } from '../../utils/panel-with-header';
 import { PermissionTree } from '../permission-tree';
-import { ActionGroupItem, DataObject, Action } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { ActionGroupItem, DataObject, ResourceType, Action } from '../../types';
 import { buildHashUrl } from '../../utils/url-builder';
 import { loadingSpinner } from '../../utils/loading-spinner-utils';
 import { DocLinks } from '../../constants';

diff --git a/public/apps/configuration/panels/role-view/index-permission-panel.tsx b/public/apps/configuration/panels/role-view/index-permission-panel.tsx
@@ -30,9 +30,9 @@ import {
   ActionGroupItem,
   ExpandedRowMapInterface,
   RoleIndexPermissionView,
+  ResourceType,
   Action,
 } from '../../types';
-import { ResourceType } from '../../../../../common';
 import { truncatedListView, displayArray, tableItemsUIProps } from '../../utils/display-utils';
 import { PermissionTree } from '../permission-tree';
 import { getFieldLevelSecurityMethod } from '../../utils/index-permission-utils';

diff --git a/public/apps/configuration/panels/role-view/role-view.tsx b/public/apps/configuration/panels/role-view/role-view.tsx
@@ -39,6 +39,7 @@ import { difference } from 'lodash';
 import { BreadcrumbsPageDependencies } from '../../../types';
 import { buildHashUrl, buildUrl } from '../../utils/url-builder';
 import {
+  ResourceType,
   Action,
   SubAction,
   RoleMappingDetail,
@@ -47,7 +48,6 @@ import {
   RoleIndexPermissionView,
   RoleTenantPermissionView,
 } from '../../types';
-import { ResourceType } from '../../../../../common';
 import {
   getRoleMappingData,
   MappedUsersListing,

diff --git a/public/apps/configuration/panels/role-view/tenants-panel.tsx b/public/apps/configuration/panels/role-view/tenants-panel.tsx
@@ -26,8 +26,12 @@ import {
 import { CoreStart } from 'opensearch-dashboards/public';
 import { getCurrentUser } from '../../../../utils/auth-info-utils';
 import { PanelWithHeader } from '../../utils/panel-with-header';
-import { RoleTenantPermissionView, RoleTenantPermissionDetail, Action } from '../../types';
-import { ResourceType } from '../../../../../common';
+import {
+  RoleTenantPermissionView,
+  RoleTenantPermissionDetail,
+  ResourceType,
+  Action,
+} from '../../types';
 import { truncatedListView, tableItemsUIProps } from '../../utils/display-utils';
 import {
   fetchTenants,

diff --git a/public/apps/configuration/panels/role-view/test/cluster-permission-panel.test.tsx b/public/apps/configuration/panels/role-view/test/cluster-permission-panel.test.tsx
@@ -18,8 +18,7 @@ import { shallow } from 'enzyme';
 import { ClusterPermissionPanel } from '../cluster-permission-panel';
 import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui';
 import { PermissionTree } from '../../permission-tree';
-import { Action } from '../../../types';
-import { ResourceType } from '../../../../../../common';
+import { Action, ResourceType } from '../../../types';
 import { buildHashUrl } from '../../../utils/url-builder';
 
 describe('Role view - cluster permission panel', () => {

diff --git a/public/apps/configuration/panels/role-view/test/index-permission-panel.test.tsx b/public/apps/configuration/panels/role-view/test/index-permission-panel.test.tsx
@@ -15,8 +15,7 @@
 
 import React from 'react';
 import { shallow, mount } from 'enzyme';
-import { Action, RoleIndexPermissionView } from '../../../types';
-import { ResourceType } from '../../../../../../common';
+import { Action, ResourceType, RoleIndexPermissionView } from '../../../types';
 import {
   renderFieldLevelSecurity,
   renderRowExpanstionArrow,

diff --git a/public/apps/configuration/panels/role-view/test/role-view.test.tsx b/public/apps/configuration/panels/role-view/test/role-view.test.tsx
@@ -30,8 +30,7 @@ import { getRoleDetail } from '../../../utils/role-detail-utils';
 import { transformRoleIndexPermissions } from '../../../utils/index-permission-utils';
 import { useDeleteConfirmState } from '../../../utils/delete-confirm-modal-utils';
 import { requestDeleteRoles } from '../../../utils/role-list-utils';
-import { Action, SubAction } from '../../../types';
-import { ResourceType } from '../../../../../../common';
+import { Action, ResourceType, SubAction } from '../../../types';
 import { buildHashUrl } from '../../../utils/url-builder';
 import { createUnknownErrorToast } from '../../../utils/toast-utils';
 

diff --git a/public/apps/configuration/panels/role-view/test/tenants-panel.test.tsx b/public/apps/configuration/panels/role-view/test/tenants-panel.test.tsx
@@ -18,8 +18,7 @@ import { mount, shallow } from 'enzyme';
 import { TenantsPanel } from '../tenants-panel';
 import { EuiEmptyPrompt, EuiInMemoryTable, EuiTableFieldDataColumnType } from '@elastic/eui';
 import { buildHashUrl } from '../../../utils/url-builder';
-import { Action, RoleTenantPermissionDetail } from '../../../types';
-import { ResourceType } from '../../../../../../common';
+import { Action, ResourceType, RoleTenantPermissionDetail } from '../../../types';
 import { RoleViewTenantInvalidText } from '../../../constants';
 
 jest.mock('../../../utils/tenant-utils');

diff --git a/public/apps/configuration/panels/service-account-list.tsx b/public/apps/configuration/panels/service-account-list.tsx
@@ -34,8 +34,7 @@ import React, { useState } from 'react';
 import { getAuthInfo } from '../../../utils/auth-info-utils';
 import { AppDependencies } from '../../types';
 import { API_ENDPOINT_SERVICEACCOUNTS, DocLinks } from '../constants';
-import { Action } from '../types';
-import { ResourceType } from '../../../../common';
+import { Action, ResourceType } from '../types';
 import { EMPTY_FIELD_VALUE } from '../ui-constants';
 import { useContextMenuState } from '../utils/context-menu';
 import { ExternalLink, tableItemsUIProps, truncatedListView } from '../utils/display-utils';

diff --git a/public/apps/configuration/panels/tenant-list/manage_tab.tsx b/public/apps/configuration/panels/tenant-list/manage_tab.tsx
@@ -39,10 +39,10 @@ import React, { ReactNode, useState, useCallback } from 'react';
 import { difference } from 'lodash';
 import { HashRouter as Router, Route } from 'react-router-dom';
 import { flow } from 'lodash';
+import { TenancyConfigSettings } from '../tenancy-config/types';
 import { getCurrentUser } from '../../../../utils/auth-info-utils';
 import { AppDependencies } from '../../../types';
-import { Action, Tenant } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { Action, ResourceType, Tenant } from '../../types';
 import { ExternalLink, renderCustomization, tableItemsUIProps } from '../../utils/display-utils';
 import {
   fetchTenants,
@@ -481,7 +481,8 @@ export function ManageTab(props: AppDependencies) {
   return (
     <>
       {/*{tenancyDisabledWarning}*/}
-      <EuiPageHeader></EuiPageHeader>
+      <EuiPageHeader>
+      </EuiPageHeader>
       <EuiPageContent>
         <EuiPageContentHeader>
           <EuiPageContentHeaderSection>

diff --git a/public/apps/configuration/panels/test/get-started.test.tsx b/public/apps/configuration/panels/test/get-started.test.tsx
@@ -16,8 +16,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import { EuiSteps } from '@elastic/eui';
-import { Action } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { Action, ResourceType } from '../../types';
 import { buildHashUrl } from '../../utils/url-builder';
 import { GetStarted } from '../get-started';
 

diff --git a/public/apps/configuration/panels/test/role-list.test.tsx b/public/apps/configuration/panels/test/role-list.test.tsx
@@ -18,8 +18,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 import { EuiInMemoryTable, EuiTableFieldDataColumnType } from '@elastic/eui';
 import { buildHashUrl } from '../../utils/url-builder';
-import { Action } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { Action, ResourceType } from '../../types';
 import { RoleListing } from '../../utils/role-list-utils';
 import { useDeleteConfirmState } from '../../utils/delete-confirm-modal-utils';
 

diff --git a/public/apps/configuration/panels/test/service-account-list.test.tsx b/public/apps/configuration/panels/test/service-account-list.test.tsx
@@ -32,8 +32,7 @@ jest.mock('../../utils/context-menu', () => ({
 
 import { getAuthInfo } from '../../../../utils/auth-info-utils';
 import { buildHashUrl } from '../../utils/url-builder';
-import { Action } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { ResourceType, Action } from '../../types';
 
 describe('User list', () => {
   describe('dictView', () => {

diff --git a/public/apps/configuration/panels/test/user-list.test.tsx b/public/apps/configuration/panels/test/user-list.test.tsx
@@ -40,8 +40,7 @@ jest.mock('../../utils/context-menu', () => ({
 
 import { getAuthInfo } from '../../../../utils/auth-info-utils';
 import { buildHashUrl } from '../../utils/url-builder';
-import { Action } from '../../types';
-import { ResourceType } from '../../../../../common';
+import { ResourceType, Action } from '../../types';
 
 describe('User list', () => {
   describe('dictView', () => {

diff --git a/public/apps/configuration/panels/user-list.tsx b/public/apps/configuration/panels/user-list.tsx
@@ -35,8 +35,7 @@ import React, { useState } from 'react';
 import { getAuthInfo } from '../../../utils/auth-info-utils';
 import { AppDependencies } from '../../types';
 import { API_ENDPOINT_INTERNALUSERS, DocLinks } from '../constants';
-import { Action } from '../types';
-import { ResourceType } from '../../../../common';
+import { Action, ResourceType } from '../types';
 import { EMPTY_FIELD_VALUE } from '../ui-constants';
 import { useContextMenuState } from '../utils/context-menu';
 import { useDeleteConfirmState } from '../utils/delete-confirm-modal-utils';

diff --git a/public/apps/configuration/types.ts b/public/apps/configuration/types.ts
@@ -19,6 +19,18 @@ export type ComboBoxOptions = EuiComboBoxOptionOption[];
 
 export type FieldLevelSecurityMethod = 'exclude' | 'include';
 
+export enum ResourceType {
+  roles = 'roles',
+  users = 'users',
+  serviceAccounts = 'serviceAccounts',
+  permissions = 'permissions',
+  tenants = 'tenants',
+  tenantsManageTab = 'tenantsManageTab',
+  tenantsConfigureTab = 'tenantsConfigureTab',
+  auth = 'auth',
+  auditLogging = 'auditLogging',
+}
+
 export enum Action {
   view = 'view',
   create = 'create',

diff --git a/public/apps/configuration/utils/internal-user-list-utils.tsx b/public/apps/configuration/utils/internal-user-list-utils.tsx
@@ -20,8 +20,7 @@ import {
   API_ENDPOINT_INTERNALUSERS,
   API_ENDPOINT_SERVICEACCOUNTS,
 } from '../constants';
-import { DataObject, InternalUser, ObjectsMessage } from '../types';
-import { ResourceType } from '../../../../common';
+import { DataObject, InternalUser, ObjectsMessage, ResourceType } from '../types';
 import { httpDelete, httpGet } from './request-utils';
 import { getResourceUrl } from './resource-utils';
 

diff --git a/public/apps/configuration/utils/url-builder.tsx b/public/apps/configuration/utils/url-builder.tsx
@@ -13,8 +13,7 @@
  *   permissions and limitations under the License.
  */
 
-import { Action } from '../types';
-import { ResourceType } from '../../../../common';
+import { ResourceType, Action } from '../types';
 
 /**
  * Build hash based url, encode the resourceId part

diff --git a/server/routes/index.ts b/server/routes/index.ts
@@ -21,7 +21,7 @@ import {
   OpenSearchDashboardsResponseFactory,
 } from 'opensearch-dashboards/server';
 import { API_PREFIX, CONFIGURATION_API_PREFIX, isValidResourceName } from '../../common';
-import { ResourceType } from '../../common';
+import { ResourceType } from '../../public/apps/configuration/types';
 
 // TODO: consider to extract entity CRUD operations and put it into a client class
 export function defineRoutes(router: IRouter) {