diff --git a/src/app/api/services/devicesService.ts b/src/app/api/services/devicesService.ts index 66c693f5..dfd1f5b0 100644 --- a/src/app/api/services/devicesService.ts +++ b/src/app/api/services/devicesService.ts @@ -26,7 +26,7 @@ import { dataPlaneConnectionHelper, dataPlaneResponseHelper, request, DATAPLANE_ import { getDeviceInterface, getEventHubInterface } from '../shared/interfaceUtils'; import { parseEventHubMessage } from './eventHubMessageHelper'; import { AppInsightsClient } from '../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_EVENTS } from '../../constants/telemetry'; +import { TELEMETRY_EVENTS } from '../../constants/appTelemetry'; const PAGE_SIZE = 100; diff --git a/src/app/connectionStrings/components/connectionStringsView.tsx b/src/app/connectionStrings/components/connectionStringsView.tsx index d4f7e56e..411dac50 100644 --- a/src/app/connectionStrings/components/connectionStringsView.tsx +++ b/src/app/connectionStrings/components/connectionStringsView.tsx @@ -26,7 +26,7 @@ import { useBreadcrumbEntry } from '../../navigation/hooks/useBreadcrumbEntry'; import '../../css/_layouts.scss'; import './connectionStringsView.scss'; import { AppInsightsClient } from '../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../constants/appTelemetry'; // tslint:disable-next-line: cyclomatic-complexity export const ConnectionStringsView: React.FC = () => { diff --git a/src/app/constants/telemetry.ts b/src/app/constants/appTelemetry.ts similarity index 100% rename from src/app/constants/telemetry.ts rename to src/app/constants/appTelemetry.ts diff --git a/src/app/devices/addDevice/components/addDevice.tsx b/src/app/devices/addDevice/components/addDevice.tsx index 6708ada5..7e0e9925 100644 --- a/src/app/devices/addDevice/components/addDevice.tsx +++ b/src/app/devices/addDevice/components/addDevice.tsx @@ -24,7 +24,7 @@ import { ROUTE_PARTS, ROUTE_PARAMS } from '../../../constants/routes'; import '../../../css/_addDevice.scss'; import '../../../css/_layouts.scss'; import { AppInsightsClient } from '../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_USER_ACTIONS } from '../../../constants/telemetry'; +import { TELEMETRY_USER_ACTIONS } from '../../../constants/appTelemetry'; const initialKeyValue = { error: '', diff --git a/src/app/devices/cloudToDeviceMessage/components/cloudToDeviceMessage.tsx b/src/app/devices/cloudToDeviceMessage/components/cloudToDeviceMessage.tsx index 71d26ca9..30b32678 100644 --- a/src/app/devices/cloudToDeviceMessage/components/cloudToDeviceMessage.tsx +++ b/src/app/devices/cloudToDeviceMessage/components/cloudToDeviceMessage.tsx @@ -19,7 +19,7 @@ import { useAsyncSagaReducer } from '../../../shared/hooks/useAsyncSagaReducer'; import { cloudToDeviceMessageSaga } from '../saga'; import '../../../css/_deviceDetail.scss'; import { AppInsightsClient } from '../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../constants/appTelemetry'; interface PropertyItem { isSystemProperty: boolean; diff --git a/src/app/devices/deviceEvents/components/commands.tsx b/src/app/devices/deviceEvents/components/commands.tsx index 3d04d4c1..3d0e60ce 100644 --- a/src/app/devices/deviceEvents/components/commands.tsx +++ b/src/app/devices/deviceEvents/components/commands.tsx @@ -16,7 +16,7 @@ import { usePnpStateContext } from '../../../shared/contexts/pnpStateContext'; import './deviceEvents.scss'; import { getBackUrl } from '../../pnp/utils'; import { AppInsightsClient } from '../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_USER_ACTIONS } from '../../../../app/constants/telemetry'; +import { TELEMETRY_USER_ACTIONS } from '../../../constants/appTelemetry'; export interface CommandsProps { startDisabled: boolean; diff --git a/src/app/devices/deviceIdentity/components/deviceIdentity.tsx b/src/app/devices/deviceIdentity/components/deviceIdentity.tsx index faeee4b8..1a8c9133 100644 --- a/src/app/devices/deviceIdentity/components/deviceIdentity.tsx +++ b/src/app/devices/deviceIdentity/components/deviceIdentity.tsx @@ -20,7 +20,7 @@ import { SasTokenGenerationView } from '../../shared/components/sasTokenGenerati import { useIotHubContext } from '../../../iotHub/hooks/useIotHubContext'; import '../../../css/_deviceDetail.scss'; import { AppInsightsClient } from '../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../../constants/appTelemetry'; export interface DeviceIdentityDispatchProps { updateDeviceIdentity: (deviceIdentity: DeviceIdentity) => void; diff --git a/src/app/devices/deviceList/components/deviceList.tsx b/src/app/devices/deviceList/components/deviceList.tsx index 53d04da2..c3d01c42 100644 --- a/src/app/devices/deviceList/components/deviceList.tsx +++ b/src/app/devices/deviceList/components/deviceList.tsx @@ -23,7 +23,7 @@ import { listDevicesAction, deleteDevicesAction } from '../actions'; import { SynchronizationStatus } from '../../../api/models/synchronizationStatus'; import { LARGE_COLUMN_WIDTH, EXTRA_SMALL_COLUMN_WIDTH, SMALL_COLUMN_WIDTH, MEDIUM_COLUMN_WIDTH } from '../../../constants/columnWidth'; import { AppInsightsClient } from '../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../../constants/appTelemetry'; import '../../../css/_deviceList.scss'; import '../../../css/_layouts.scss'; diff --git a/src/app/devices/deviceTwin/components/deviceTwin.tsx b/src/app/devices/deviceTwin/components/deviceTwin.tsx index 68dbf385..a2267bed 100644 --- a/src/app/devices/deviceTwin/components/deviceTwin.tsx +++ b/src/app/devices/deviceTwin/components/deviceTwin.tsx @@ -21,7 +21,7 @@ import { deviceTwinStateInitial } from '../state'; import { useBreadcrumbEntry } from '../../../navigation/hooks/useBreadcrumbEntry'; import '../../../css/_deviceTwin.scss'; import { AppInsightsClient } from '../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../constants/appTelemetry'; export const DeviceTwin: React.FC = () => { const { t } = useTranslation(); diff --git a/src/app/devices/directMethod/components/directMethod.tsx b/src/app/devices/directMethod/components/directMethod.tsx index 888900ab..71b221cc 100644 --- a/src/app/devices/directMethod/components/directMethod.tsx +++ b/src/app/devices/directMethod/components/directMethod.tsx @@ -16,7 +16,7 @@ import { invokeDirectMethodAction } from '../actions'; import { DirectMethodForm } from './directMethodForm'; import '../../../css/_deviceDetail.scss'; import { AppInsightsClient } from '../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../constants/appTelemetry'; const DEFAULT_TIMEOUT = 10; diff --git a/src/app/devices/module/addModuleIdentity/components/addModuleIdentity.tsx b/src/app/devices/module/addModuleIdentity/components/addModuleIdentity.tsx index 643dbcdc..b0ea1747 100644 --- a/src/app/devices/module/addModuleIdentity/components/addModuleIdentity.tsx +++ b/src/app/devices/module/addModuleIdentity/components/addModuleIdentity.tsx @@ -22,7 +22,7 @@ import { addModuleStateInitial } from '../state'; import { addModuleIdentityAction } from '../actions'; import '../../../../css/_deviceDetail.scss'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_USER_ACTIONS } from '../../../../constants/telemetry'; +import { TELEMETRY_USER_ACTIONS } from '../../../../constants/appTelemetry'; const initialKeyValue = { error: '', diff --git a/src/app/devices/module/moduleDirectMethod/components/moduleDirectMethod.tsx b/src/app/devices/module/moduleDirectMethod/components/moduleDirectMethod.tsx index 921cf157..01956588 100644 --- a/src/app/devices/module/moduleDirectMethod/components/moduleDirectMethod.tsx +++ b/src/app/devices/module/moduleDirectMethod/components/moduleDirectMethod.tsx @@ -16,7 +16,7 @@ import { DirectMethodForm } from '../../../../devices/directMethod/components/di import { ROUTE_PARAMS, ROUTE_PARTS } from '../../../../constants/routes'; import '../../../../css/_deviceDetail.scss'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../constants/appTelemetry'; const DEFAULT_TIMEOUT = 10; diff --git a/src/app/devices/module/moduleIdentityList/components/moduleIdentityList.tsx b/src/app/devices/module/moduleIdentityList/components/moduleIdentityList.tsx index cb3feebf..5c055902 100644 --- a/src/app/devices/module/moduleIdentityList/components/moduleIdentityList.tsx +++ b/src/app/devices/module/moduleIdentityList/components/moduleIdentityList.tsx @@ -22,7 +22,7 @@ import { moduleIdentityListReducer } from '../reducer'; import { getModuleIdentitiesAction } from '../actions'; import '../../../../css/_deviceDetail.scss'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../../../constants/appTelemetry'; export const ModuleIdentityList: React.FC = () => { const { t } = useTranslation(); diff --git a/src/app/devices/module/moduleIdentityTwin/components/moduleIdentityTwin.tsx b/src/app/devices/module/moduleIdentityTwin/components/moduleIdentityTwin.tsx index ed7ad21b..ccd50fe1 100644 --- a/src/app/devices/module/moduleIdentityTwin/components/moduleIdentityTwin.tsx +++ b/src/app/devices/module/moduleIdentityTwin/components/moduleIdentityTwin.tsx @@ -19,7 +19,7 @@ import { moduleIdentityTwinSagas } from '../saga'; import { moduleTwinStateInitial } from '../state'; import '../../../../css/_deviceDetail.scss'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../constants/appTelemetry'; export const ModuleIdentityTwin: React.FC = () => { const { t } = useTranslation(); diff --git a/src/app/devices/module/moduleIndentityDetail/components/moduleIdentityDetail.tsx b/src/app/devices/module/moduleIndentityDetail/components/moduleIdentityDetail.tsx index edec5062..0373b009 100644 --- a/src/app/devices/module/moduleIndentityDetail/components/moduleIdentityDetail.tsx +++ b/src/app/devices/module/moduleIndentityDetail/components/moduleIdentityDetail.tsx @@ -22,7 +22,7 @@ import { moduleIdentityDetailStateInterfaceInitial } from '../state'; import { deleteModuleIdentityAction, getModuleIdentityAction } from '../actions'; import { useIotHubContext } from '../../../../iotHub/hooks/useIotHubContext'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../../../constants/appTelemetry'; import '../../../../css/_deviceDetail.scss'; export const ModuleIdentityDetail: React.FC = () => { diff --git a/src/app/devices/pnp/components/deviceCommands/deviceCommands.tsx b/src/app/devices/pnp/components/deviceCommands/deviceCommands.tsx index 94c24faa..db1b6e6f 100644 --- a/src/app/devices/pnp/components/deviceCommands/deviceCommands.tsx +++ b/src/app/devices/pnp/components/deviceCommands/deviceCommands.tsx @@ -17,7 +17,7 @@ import { InvokeCommandActionParameters, invokeCommandAction } from '../../action import { getDeviceCommandPairs } from './dataHelper'; import { getBackUrl } from '../../utils'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../constants/appTelemetry'; export const DeviceCommands: React.FC = () => { const { search, pathname } = useLocation(); diff --git a/src/app/devices/pnp/components/deviceInterfaces/deviceInterfaces.tsx b/src/app/devices/pnp/components/deviceInterfaces/deviceInterfaces.tsx index 8f75e57f..c7ec76cf 100644 --- a/src/app/devices/pnp/components/deviceInterfaces/deviceInterfaces.tsx +++ b/src/app/devices/pnp/components/deviceInterfaces/deviceInterfaces.tsx @@ -21,7 +21,7 @@ import { SynchronizationStatus } from '../../../../api/models/synchronizationSta import { getBackUrl } from '../../utils'; import '../../../../css/_deviceInterface.scss'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../../../constants/appTelemetry'; export const DeviceInterfaces: React.FC = () => { const { t } = useTranslation(); diff --git a/src/app/devices/pnp/components/deviceProperties/deviceProperties.tsx b/src/app/devices/pnp/components/deviceProperties/deviceProperties.tsx index 9306b4f6..2b7ac0d6 100644 --- a/src/app/devices/pnp/components/deviceProperties/deviceProperties.tsx +++ b/src/app/devices/pnp/components/deviceProperties/deviceProperties.tsx @@ -16,7 +16,7 @@ import { SynchronizationStatus } from '../../../../api/models/synchronizationSta import { generateReportedTwinSchemaAndInterfaceTuple } from './dataHelper'; import { dispatchGetTwinAction, getBackUrl } from '../../utils'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../../../constants/appTelemetry'; export const DeviceProperties: React.FC = () => { const { t } = useTranslation(); diff --git a/src/app/devices/pnp/components/deviceSettings/deviceSettings.tsx b/src/app/devices/pnp/components/deviceSettings/deviceSettings.tsx index 7012df07..1b272a03 100644 --- a/src/app/devices/pnp/components/deviceSettings/deviceSettings.tsx +++ b/src/app/devices/pnp/components/deviceSettings/deviceSettings.tsx @@ -18,7 +18,7 @@ import { generateTwinSchemaAndInterfaceTuple } from './dataHelper'; import { Twin } from '../../../../api/models/device'; import { dispatchGetTwinAction, getBackUrl } from '../../utils'; import { AppInsightsClient } from '../../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES, TELEMETRY_USER_ACTIONS } from '../../../../constants/appTelemetry'; // tslint:disable-next-line:cyclomatic-complexity export const DeviceSettings: React.FC = () => { diff --git a/src/app/devices/pnp/components/digitalTwinInterfacesList.tsx b/src/app/devices/pnp/components/digitalTwinInterfacesList.tsx index 22859103..73161041 100644 --- a/src/app/devices/pnp/components/digitalTwinInterfacesList.tsx +++ b/src/app/devices/pnp/components/digitalTwinInterfacesList.tsx @@ -26,7 +26,7 @@ import { ErrorBoundary } from '../../shared/components/errorBoundary'; import '../../../css/_digitalTwinInterfaces.scss'; import { dispatchGetTwinAction } from '../utils'; import { AppInsightsClient } from '../../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../../constants/appTelemetry'; interface ModelContent { link: string; diff --git a/src/app/home/components/appVersionMessageBar.tsx b/src/app/home/components/appVersionMessageBar.tsx index 902a06b1..50be76fa 100644 --- a/src/app/home/components/appVersionMessageBar.tsx +++ b/src/app/home/components/appVersionMessageBar.tsx @@ -10,7 +10,7 @@ import { fetchLatestReleaseTagName, latestReleaseUrlPath } from '../../api/servi import * as packageJson from '../../../../package.json'; import { isNewReleaseVersionHigher } from '../utils/appVersionHelper'; import { AppInsightsClient } from '../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_EVENTS } from '../../constants/telemetry'; +import { TELEMETRY_EVENTS } from '../../constants/appTelemetry'; export const AppVersionMessageBar: React.FC = () => { const { t } = useTranslation(); diff --git a/src/app/modelRepository/components/modelRepositoryLocationView.tsx b/src/app/modelRepository/components/modelRepositoryLocationView.tsx index 84404169..001e4684 100644 --- a/src/app/modelRepository/components/modelRepositoryLocationView.tsx +++ b/src/app/modelRepository/components/modelRepositoryLocationView.tsx @@ -21,7 +21,7 @@ import { RepositoryLocationSettings } from '../../shared/global/state'; import { useBreadcrumbEntry } from '../../navigation/hooks/useBreadcrumbEntry'; import '../../css/_layouts.scss'; import { AppInsightsClient } from '../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../constants/appTelemetry'; export const ModelRepositoryLocationView: React.FC = () => { const { t } = useTranslation(); diff --git a/src/app/notifications/components/notificationList.tsx b/src/app/notifications/components/notificationList.tsx index 58425ffb..81433135 100644 --- a/src/app/notifications/components/notificationList.tsx +++ b/src/app/notifications/components/notificationList.tsx @@ -15,7 +15,7 @@ import { ROUTE_PARAMS } from '../../constants/routes'; import { CANCEL, NAVIGATE_BACK } from '../../constants/iconNames'; import '../../css/_notification.scss'; import { AppInsightsClient } from '../../shared/appTelemetry/appInsightsClient'; -import { TELEMETRY_PAGE_NAMES } from '../../../app/constants/telemetry'; +import { TELEMETRY_PAGE_NAMES } from '../../constants/appTelemetry'; export const NotificationList: React.FC = () => { const { t } = useTranslation(); diff --git a/src/app/shared/appTelemetry/appInsightsClient.ts b/src/app/shared/appTelemetry/appInsightsClient.ts index 17616c2e..974e25e7 100644 --- a/src/app/shared/appTelemetry/appInsightsClient.ts +++ b/src/app/shared/appTelemetry/appInsightsClient.ts @@ -1,5 +1,5 @@ import { ApplicationInsights } from '@microsoft/applicationinsights-web'; -import { TELEMETRY_EVENTS, TELEMETRY_USER_ACTIONS } from '../../constants/telemetry'; +import { TELEMETRY_EVENTS, TELEMETRY_USER_ACTIONS } from '../../constants/appTelemetry'; import { appConfig } from '../../../appConfig/appConfig'; import { isMicrosoftInternalDomain } from '../utils/utils';