diff --git a/apps/data-mapper-standalone/src/app/DataMapperStandaloneDesigner.tsx b/apps/data-mapper-standalone/src/app/DataMapperStandaloneDesigner.tsx index bb46e7612ab..c2b3659f2a2 100644 --- a/apps/data-mapper-standalone/src/app/DataMapperStandaloneDesigner.tsx +++ b/apps/data-mapper-standalone/src/app/DataMapperStandaloneDesigner.tsx @@ -14,7 +14,7 @@ import { defaultDataMapperApiServiceOptions, getFunctions, } from '@microsoft/logic-apps-data-mapper'; -import { Theme as ThemeType } from '@microsoft/utils-logic-apps'; +import { Theme as ThemeType } from '@microsoft/logic-apps-shared'; import { useEffect, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/apps/data-mapper-standalone/src/components/DevToolbox.tsx b/apps/data-mapper-standalone/src/components/DevToolbox.tsx index 4682cc0a60f..dbe35d16ac4 100644 --- a/apps/data-mapper-standalone/src/components/DevToolbox.tsx +++ b/apps/data-mapper-standalone/src/components/DevToolbox.tsx @@ -12,7 +12,7 @@ import { DevSerializationTester } from './DevSerializationTester'; import type { IDropdownOption } from '@fluentui/react'; import { Checkbox, Dropdown, Stack, StackItem, TextField } from '@fluentui/react'; import { Accordion, AccordionHeader, AccordionItem, AccordionPanel, Tooltip, tokens } from '@fluentui/react-components'; -import { SchemaFileFormat, Theme as ThemeType } from '@microsoft/utils-logic-apps'; +import { SchemaFileFormat, Theme as ThemeType } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/apps/data-mapper-standalone/src/state/DataMapDataLoader.ts b/apps/data-mapper-standalone/src/state/DataMapDataLoader.ts index 8b5f4319151..fad5fecd0eb 100644 --- a/apps/data-mapper-standalone/src/state/DataMapDataLoader.ts +++ b/apps/data-mapper-standalone/src/state/DataMapDataLoader.ts @@ -2,8 +2,8 @@ import type { MapDefDropdownOption } from '../components/DevToolbox'; import type { RootState } from './Store'; import type { FunctionData } from '@microsoft/logic-apps-data-mapper'; import { functionMock, loadMapDefinition } from '@microsoft/logic-apps-data-mapper'; -import type { MapDefinitionEntry, MapMetadata } from '@microsoft/utils-logic-apps'; -import { Theme as ThemeType } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry, MapMetadata } from '@microsoft/logic-apps-shared'; +import { Theme as ThemeType } from '@microsoft/logic-apps-shared'; import type { PayloadAction } from '@reduxjs/toolkit'; import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'; diff --git a/apps/data-mapper-standalone/src/state/SchemaDataLoader.ts b/apps/data-mapper-standalone/src/state/SchemaDataLoader.ts index f50bde8448b..f3562b5af57 100644 --- a/apps/data-mapper-standalone/src/state/SchemaDataLoader.ts +++ b/apps/data-mapper-standalone/src/state/SchemaDataLoader.ts @@ -1,6 +1,6 @@ import { LoadingMethod } from './DataMapDataLoader'; import type { RootState } from './Store'; -import type { Schema } from '@microsoft/utils-logic-apps'; +import type { DataMapSchema } from '@microsoft/logic-apps-shared'; import type { PayloadAction } from '@reduxjs/toolkit'; import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'; @@ -10,9 +10,9 @@ export interface SchemaLoadingState { outputResourcePath?: string; availableResourcesPaths?: string[]; loadingMethod: LoadingMethod; - sourceSchema?: Schema; - targetSchema?: Schema; - availableSchemas?: Schema[]; + sourceSchema?: DataMapSchema; + targetSchema?: DataMapSchema; + availableSchemas?: DataMapSchema[]; } const initialState: SchemaLoadingState = { @@ -94,9 +94,9 @@ export const schemaDataLoaderSlice = createSlice({ }, }); -const loadSchemaFromMock = async (resourcePath: string): Promise => { +const loadSchemaFromMock = async (resourcePath: string): Promise => { try { - const schema: Schema = await import(`../../../../__mocks__/schemas/${resourcePath}`); + const schema: DataMapSchema = await import(`../../../../__mocks__/schemas/${resourcePath}`); return schema; } catch (ex) { console.error(ex); diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/DesignerCommandBar.tsx b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/DesignerCommandBar.tsx index bafd3ee8c60..01172a73a63 100644 --- a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/DesignerCommandBar.tsx +++ b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/DesignerCommandBar.tsx @@ -20,7 +20,7 @@ import { openPanel, useNodesInitialized, } from '@microsoft/logic-apps-designer'; -import { isNullOrEmpty, RUN_AFTER_COLORS } from '@microsoft/utils-logic-apps'; +import { isNullOrEmpty, RUN_AFTER_COLORS } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useMutation } from 'react-query'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/ChildWorkflow.ts b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/ChildWorkflow.ts index 51cef0e24bf..00a85e035ef 100644 --- a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/ChildWorkflow.ts +++ b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/ChildWorkflow.ts @@ -2,7 +2,7 @@ import type { ArmResources } from '../Models/Arm'; import type { Workflow } from '../Models/Workflow'; import type { HttpClient } from './HttpClient'; import type { ListDynamicValue } from '@microsoft/designer-client-services-logic-apps'; -import { hasProperty, getPropertyValue } from '@microsoft/utils-logic-apps'; +import { hasProperty, getPropertyValue } from '@microsoft/logic-apps-shared'; export interface DynamicCallServiceOptions { apiVersion: string; diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/ConsumptionSerializationHelpers.ts b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/ConsumptionSerializationHelpers.ts index 9ec9601d10f..ec7c8a841a4 100644 --- a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/ConsumptionSerializationHelpers.ts +++ b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/ConsumptionSerializationHelpers.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ import { isOpenApiSchemaVersion } from '@microsoft/logic-apps-designer'; -import { clone } from '@microsoft/utils-logic-apps'; +import { clone } from '@microsoft/logic-apps-shared'; /////////////////////////////////////////////////////////////////////////////// // This was mostly copied straight from what we have in portal diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/WorkflowAndArtifacts.tsx b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/WorkflowAndArtifacts.tsx index b0dce8b7a23..2271de903f2 100644 --- a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/WorkflowAndArtifacts.tsx +++ b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Services/WorkflowAndArtifacts.tsx @@ -3,7 +3,7 @@ import type { CallbackInfo, ConnectionsData, ParametersData, Workflow } from '.. import { Artifact } from '../Models/Workflow'; import { validateResourceId } from '../Utilities/resourceUtilities'; import { convertDesignerWorkflowToConsumptionWorkflow } from './ConsumptionSerializationHelpers'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; import axios from 'axios'; import jwt_decode from 'jwt-decode'; import { useQuery } from 'react-query'; diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Utilities/resourceUtilities.ts b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Utilities/resourceUtilities.ts index adc544e784e..435b059c9f7 100644 --- a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Utilities/resourceUtilities.ts +++ b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Utilities/resourceUtilities.ts @@ -1,5 +1,5 @@ import { environment } from '../../../environments/environment'; -import { format } from '@microsoft/utils-logic-apps'; +import { format } from '@microsoft/logic-apps-shared'; import axios from 'axios'; export const validateResourceId = (resourceId: string): string => { diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesigner.tsx b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesigner.tsx index c924292f0b6..22c76a541e9 100644 --- a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesigner.tsx +++ b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesigner.tsx @@ -46,8 +46,8 @@ import { serializeBJSWorkflow, store as DesignerStore, } from '@microsoft/logic-apps-designer'; -import { clone, equals, guid, isArmResourceId, optional } from '@microsoft/utils-logic-apps'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import { clone, equals, guid, isArmResourceId, optional } from '@microsoft/logic-apps-shared'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; import axios from 'axios'; import isEqual from 'lodash.isequal'; import { useEffect, useMemo, useState } from 'react'; diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesignerConsumption.tsx b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesignerConsumption.tsx index e088c3cbc97..b505d46db30 100644 --- a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesignerConsumption.tsx +++ b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesignerConsumption.tsx @@ -47,7 +47,7 @@ import { serializeBJSWorkflow, store as DesignerStore, } from '@microsoft/logic-apps-designer'; -import { guid, startsWith } from '@microsoft/utils-logic-apps'; +import { guid, startsWith } from '@microsoft/logic-apps-shared'; import * as React from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/apps/designer-standalone/src/app/LocalDesigner/localDesigner.tsx b/apps/designer-standalone/src/app/LocalDesigner/localDesigner.tsx index a651fbadb8c..024cf4fc23e 100644 --- a/apps/designer-standalone/src/app/LocalDesigner/localDesigner.tsx +++ b/apps/designer-standalone/src/app/LocalDesigner/localDesigner.tsx @@ -18,7 +18,7 @@ import { } from '@microsoft/designer-client-services-logic-apps'; import type { ContentType } from '@microsoft/designer-client-services-logic-apps'; import { DesignerProvider, BJSWorkflowProvider, Designer } from '@microsoft/logic-apps-designer'; -import { ResourceIdentityType } from '@microsoft/utils-logic-apps'; +import { ResourceIdentityType } from '@microsoft/logic-apps-shared'; import { useSelector } from 'react-redux'; const httpClient = new HttpClient(); diff --git a/apps/designer-standalone/src/app/LocalDesigner/pseudoCommandBar.tsx b/apps/designer-standalone/src/app/LocalDesigner/pseudoCommandBar.tsx index 098e4451d68..c6ca3316b0d 100644 --- a/apps/designer-standalone/src/app/LocalDesigner/pseudoCommandBar.tsx +++ b/apps/designer-standalone/src/app/LocalDesigner/pseudoCommandBar.tsx @@ -13,7 +13,7 @@ import { useWorkflowParameterValidationErrors, openPanel, } from '@microsoft/logic-apps-designer'; -import { RUN_AFTER_COLORS } from '@microsoft/utils-logic-apps'; +import { RUN_AFTER_COLORS } from '@microsoft/logic-apps-shared'; import { useMemo, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/apps/designer-standalone/src/state/workflowLoadingSlice.ts b/apps/designer-standalone/src/state/workflowLoadingSlice.ts index 78cc922e175..b4ffdc01082 100644 --- a/apps/designer-standalone/src/state/workflowLoadingSlice.ts +++ b/apps/designer-standalone/src/state/workflowLoadingSlice.ts @@ -2,7 +2,7 @@ import { getStateHistory, setStateHistory } from './historyHelpers'; import type { RootState } from './store'; import type { ConnectionReferences } from '@microsoft/logic-apps-designer'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; import type { PayloadAction } from '@reduxjs/toolkit'; import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'; diff --git a/apps/vs-code-designer/src/app/commands/appSettings/uploadAppSettings.ts b/apps/vs-code-designer/src/app/commands/appSettings/uploadAppSettings.ts index f0251cbf910..6d3ffc5ffd4 100644 --- a/apps/vs-code-designer/src/app/commands/appSettings/uploadAppSettings.ts +++ b/apps/vs-code-designer/src/app/commands/appSettings/uploadAppSettings.ts @@ -8,7 +8,7 @@ import { localize } from '../../../localize'; import { getLocalSettingsJson } from '../../utils/appSettings/localSettings'; import { getLocalSettingsFile } from './getLocalSettingsFile'; import type { StringDictionary } from '@azure/arm-appservice'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import { AppSettingsTreeItem, confirmOverwriteSettings } from '@microsoft/vscode-azext-azureappservice'; import type { IAppSettingsClient } from '@microsoft/vscode-azext-azureappservice'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; diff --git a/apps/vs-code-designer/src/app/commands/createCodeless/createCodeless.ts b/apps/vs-code-designer/src/app/commands/createCodeless/createCodeless.ts index c4a0466e7c1..a7cf1123660 100644 --- a/apps/vs-code-designer/src/app/commands/createCodeless/createCodeless.ts +++ b/apps/vs-code-designer/src/app/commands/createCodeless/createCodeless.ts @@ -10,7 +10,7 @@ import { getWorkspaceSetting } from '../../utils/vsCodeConfig/settings'; import { verifyInitForVSCode } from '../../utils/vsCodeConfig/verifyInitForVSCode'; import { getContainingWorkspace, getWorkspaceFolder } from '../../utils/workspace'; import { WorkflowStateTypeStep } from './createCodelessSteps/WorkflowStateTypeStep'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { AzureWizard } from '@microsoft/vscode-azext-utils'; import type { IFunctionWizardContext, FuncVersion } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/commands/createLogicApp/createLogicApp.ts b/apps/vs-code-designer/src/app/commands/createLogicApp/createLogicApp.ts index 5f8a731a31c..37a73017f97 100644 --- a/apps/vs-code-designer/src/app/commands/createLogicApp/createLogicApp.ts +++ b/apps/vs-code-designer/src/app/commands/createLogicApp/createLogicApp.ts @@ -7,7 +7,7 @@ import { localize } from '../../../localize'; import type { SlotTreeItem } from '../../tree/slotsTree/SlotTreeItem'; import { SubscriptionTreeItem } from '../../tree/subscriptionTree/SubscriptionTreeItem'; import { notifyCreateLogicAppComplete } from './notifyCreateLogicAppComplete'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import type { AzExtParentTreeItem, IActionContext } from '@microsoft/vscode-azext-utils'; import type { ICreateLogicAppContext } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/commands/createNewCodeProject/createNewCodeProject.ts b/apps/vs-code-designer/src/app/commands/createNewCodeProject/createNewCodeProject.ts index 5f079be5adb..e4a42ab26e4 100644 --- a/apps/vs-code-designer/src/app/commands/createNewCodeProject/createNewCodeProject.ts +++ b/apps/vs-code-designer/src/app/commands/createNewCodeProject/createNewCodeProject.ts @@ -20,7 +20,7 @@ import { NewCodeProjectTypeStep } from './createCodeProjectSteps/NewCodeProjectT import { setWorkspaceName } from './createCodeProjectSteps/SetWorkspaceName'; import { setMethodName } from './createCodeProjectSteps/createFunction/setMethodName'; import { setNamespace } from './createCodeProjectSteps/createFunction/setNamepSpace'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import { AzureWizard } from '@microsoft/vscode-azext-utils'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { latestGAVersion, OpenBehavior } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/commands/createNewProject/createNewProject.ts b/apps/vs-code-designer/src/app/commands/createNewProject/createNewProject.ts index 91267b51ece..29525e5ab66 100644 --- a/apps/vs-code-designer/src/app/commands/createNewProject/createNewProject.ts +++ b/apps/vs-code-designer/src/app/commands/createNewProject/createNewProject.ts @@ -10,7 +10,7 @@ import { OpenBehaviorStep } from './OpenBehaviorStep'; import { OpenFolderStep } from './OpenFolderStep'; import { FolderListStep } from './createProjectSteps/FolderListStep'; import { NewProjectTypeStep } from './createProjectSteps/NewProjectTypeStep'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import { AzureWizard } from '@microsoft/vscode-azext-utils'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { latestGAVersion, OpenBehavior } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/commands/dataMapper/DataMapperExt.ts b/apps/vs-code-designer/src/app/commands/dataMapper/DataMapperExt.ts index d6392ba482f..98352174af2 100644 --- a/apps/vs-code-designer/src/app/commands/dataMapper/DataMapperExt.ts +++ b/apps/vs-code-designer/src/app/commands/dataMapper/DataMapperExt.ts @@ -2,7 +2,7 @@ import { ext } from '../../../extensionVariables'; import DataMapperPanel from './DataMapperPanel'; import { startBackendRuntime } from './FxWorkflowRuntime'; import { webviewType } from './extensionConfig'; -import type { MapDefinitionEntry } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry } from '@microsoft/logic-apps-shared'; import type { MapDefinitionData } from '@microsoft/vscode-extension'; import * as yaml from 'js-yaml'; import * as path from 'path'; diff --git a/apps/vs-code-designer/src/app/commands/dataMapper/DataMapperPanel.ts b/apps/vs-code-designer/src/app/commands/dataMapper/DataMapperPanel.ts index 8a2877f4e20..bcdc9d65eb9 100644 --- a/apps/vs-code-designer/src/app/commands/dataMapper/DataMapperPanel.ts +++ b/apps/vs-code-designer/src/app/commands/dataMapper/DataMapperPanel.ts @@ -13,7 +13,7 @@ import { supportedSchemaFileExts, supportedCustomXsltFileExts, } from './extensionConfig'; -import type { SchemaType, MapMetadata } from '@microsoft/utils-logic-apps'; +import type { SchemaType, MapMetadata } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { callWithTelemetryAndErrorHandlingSync } from '@microsoft/vscode-azext-utils'; import type { MapDefinitionData, MessageToVsix, MessageToWebview } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/commands/dataMapper/dataMapper.ts b/apps/vs-code-designer/src/app/commands/dataMapper/dataMapper.ts index 97c5e2cf06d..5e64c6d4e5b 100644 --- a/apps/vs-code-designer/src/app/commands/dataMapper/dataMapper.ts +++ b/apps/vs-code-designer/src/app/commands/dataMapper/dataMapper.ts @@ -4,7 +4,7 @@ import { ext } from '../../../extensionVariables'; import { localize } from '../../../localize'; import DataMapperExt from './DataMapperExt'; import { dataMapDefinitionsPath, draftMapDefinitionSuffix, schemasPath, supportedDataMapDefinitionFileExts } from './extensionConfig'; -import type { MapDefinitionEntry } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { callWithTelemetryAndErrorHandling } from '@microsoft/vscode-azext-utils'; import { existsSync as fileExistsSync, promises as fs } from 'fs'; diff --git a/apps/vs-code-designer/src/app/commands/funcCoreTools/validateFuncCoreToolsIsLatest.ts b/apps/vs-code-designer/src/app/commands/funcCoreTools/validateFuncCoreToolsIsLatest.ts index eb2929e2fac..d169d7ddc78 100644 --- a/apps/vs-code-designer/src/app/commands/funcCoreTools/validateFuncCoreToolsIsLatest.ts +++ b/apps/vs-code-designer/src/app/commands/funcCoreTools/validateFuncCoreToolsIsLatest.ts @@ -22,7 +22,7 @@ import { getWorkspaceSetting, updateGlobalSetting } from '../../utils/vsCodeConf import { installFuncCoreToolsBinaries } from './installFuncCoreTools'; import { uninstallFuncCoreTools } from './uninstallFuncCoreTools'; import { updateFuncCoreTools } from './updateFuncCoreTools'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import { callWithTelemetryAndErrorHandling, DialogResponses, openUrl, parseError } from '@microsoft/vscode-azext-utils'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import type { FuncVersion } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/commands/pickFuncProcess.ts b/apps/vs-code-designer/src/app/commands/pickFuncProcess.ts index 342d525fb40..46b782a25ba 100644 --- a/apps/vs-code-designer/src/app/commands/pickFuncProcess.ts +++ b/apps/vs-code-designer/src/app/commands/pickFuncProcess.ts @@ -17,7 +17,7 @@ import { getWorkspaceSetting } from '../utils/vsCodeConfig/settings'; import { getWindowsProcess } from '../utils/windowsProcess'; import type { HttpOperationResponse } from '@azure/ms-rest-js'; import { delay } from '@azure/ms-rest-js'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import type { AzExtRequestPrepareOptions } from '@microsoft/vscode-azext-azureutils'; import { sendRequestWithTimeout } from '@microsoft/vscode-azext-azureutils'; import { UserCancelledError, callWithTelemetryAndErrorHandling } from '@microsoft/vscode-azext-utils'; diff --git a/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerBase.ts b/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerBase.ts index 3270e5c6369..d99b6b0af49 100644 --- a/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerBase.ts +++ b/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerBase.ts @@ -6,7 +6,7 @@ import { tryGetWebviewPanel } from '../../../utils/codeless/common'; import { getWebViewHTML } from '../../../utils/codeless/getWebViewHTML'; import type { IAzureConnectorsContext } from '../azureConnectorWizard'; import { ResolutionService } from '@microsoft/logic-apps-shared'; -import { isEmptyString } from '@microsoft/utils-logic-apps'; +import { isEmptyString } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import type { Artifacts, AzureConnectorDetails, ConnectionsData, FileDetails, Parameter } from '@microsoft/vscode-extension'; import type { WebviewPanel, WebviewOptions, WebviewPanelOptions } from 'vscode'; diff --git a/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerForLocalProject.ts b/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerForLocalProject.ts index b4d51613abe..7683d10c3f6 100644 --- a/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerForLocalProject.ts +++ b/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerForLocalProject.ts @@ -23,7 +23,7 @@ import { saveParameters } from '../../../utils/codeless/parameter'; import { startDesignTimeApi } from '../../../utils/codeless/startDesignTimeApi'; import { sendRequest } from '../../../utils/requestUtils'; import { OpenDesignerBase } from './openDesignerBase'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import type { AzureConnectorDetails, FileSystemConnectionInfo, IDesignerPanelMetadata, Parameter } from '@microsoft/vscode-extension'; import { ExtensionCommand, ProjectName } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/commands/workflows/openMonitoringView/openMonitoringViewForAzureResource.ts b/apps/vs-code-designer/src/app/commands/workflows/openMonitoringView/openMonitoringViewForAzureResource.ts index 06a7ab4c8bf..1a6233b3461 100644 --- a/apps/vs-code-designer/src/app/commands/workflows/openMonitoringView/openMonitoringViewForAzureResource.ts +++ b/apps/vs-code-designer/src/app/commands/workflows/openMonitoringView/openMonitoringViewForAzureResource.ts @@ -18,7 +18,7 @@ import { sendAzureRequest } from '../../../utils/requestUtils'; import type { IAzureConnectorsContext } from '../azureConnectorWizard'; import { OpenMonitoringViewBase } from './openMonitoringViewBase'; import type { ServiceClientCredentials } from '@azure/ms-rest-js'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import type { IDesignerPanelMetadata, IWorkflowFileContent } from '@microsoft/vscode-extension'; import { ExtensionCommand, ProjectName } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/commands/workflows/openMonitoringView/openMonitoringViewForLocal.ts b/apps/vs-code-designer/src/app/commands/workflows/openMonitoringView/openMonitoringViewForLocal.ts index 3f4fb8bbeb8..be8b4053494 100644 --- a/apps/vs-code-designer/src/app/commands/workflows/openMonitoringView/openMonitoringViewForLocal.ts +++ b/apps/vs-code-designer/src/app/commands/workflows/openMonitoringView/openMonitoringViewForLocal.ts @@ -17,7 +17,7 @@ import { import { getConnectionsFromFile, getLogicAppProjectRoot, getParametersFromFile } from '../../../utils/codeless/connection'; import { sendRequest } from '../../../utils/requestUtils'; import { OpenMonitoringViewBase } from './openMonitoringViewBase'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import type { AzureConnectorDetails, IDesignerPanelMetadata, Parameter } from '@microsoft/vscode-extension'; import { ExtensionCommand, ProjectName } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/funcConfig/host.ts b/apps/vs-code-designer/src/app/funcConfig/host.ts index fda79a28fc4..f057092f45a 100644 --- a/apps/vs-code-designer/src/app/funcConfig/host.ts +++ b/apps/vs-code-designer/src/app/funcConfig/host.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import { defaultRoutePrefix } from '../../constants'; -import { isObject, isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import { isObject, isNullOrUndefined } from '@microsoft/logic-apps-shared'; import type { IBundleMetadata, IHostJsonV1, IHostJsonV2, IParsedHostJson } from '@microsoft/vscode-extension'; import { FuncVersion } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/tree/LogicAppResourceTree.ts b/apps/vs-code-designer/src/app/tree/LogicAppResourceTree.ts index b609dcb279f..013c4f4a094 100644 --- a/apps/vs-code-designer/src/app/tree/LogicAppResourceTree.ts +++ b/apps/vs-code-designer/src/app/tree/LogicAppResourceTree.ts @@ -16,7 +16,7 @@ import type { SlotTreeItem } from './slotsTree/SlotTreeItem'; import { SlotsTreeItem } from './slotsTree/SlotsTreeItem'; import { ArtifactsTreeItem } from './slotsTree/artifactsTree/ArtifactsTreeItem'; import type { Site, SiteConfig, SiteSourceControl, StringDictionary } from '@azure/arm-appservice'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import { DeleteLastServicePlanStep, DeleteSiteStep, diff --git a/apps/vs-code-designer/src/app/tree/remoteWorkflowsTree/RemoteWorkflowTreeItem.ts b/apps/vs-code-designer/src/app/tree/remoteWorkflowsTree/RemoteWorkflowTreeItem.ts index d8841d146ed..02bad24a4fb 100644 --- a/apps/vs-code-designer/src/app/tree/remoteWorkflowsTree/RemoteWorkflowTreeItem.ts +++ b/apps/vs-code-designer/src/app/tree/remoteWorkflowsTree/RemoteWorkflowTreeItem.ts @@ -13,7 +13,7 @@ import { getProjectContextValue } from '../../utils/tree/projectContextValues'; import type { RemoteWorkflowsTreeItem } from './RemoteWorkflowsTreeItem'; import type { StringDictionary } from '@azure/arm-appservice'; import type { ServiceClientCredentials } from '@azure/ms-rest-js'; -import { isEmptyString, HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { isEmptyString, HTTP_METHODS } from '@microsoft/logic-apps-shared'; import { AzExtTreeItem, DialogResponses } from '@microsoft/vscode-azext-utils'; import type { IActionContext, TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import { ProjectResource } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/tree/remoteWorkflowsTree/RemoteWorkflowsTreeItem.ts b/apps/vs-code-designer/src/app/tree/remoteWorkflowsTree/RemoteWorkflowsTreeItem.ts index 6200f62edd0..0f6cc785751 100644 --- a/apps/vs-code-designer/src/app/tree/remoteWorkflowsTree/RemoteWorkflowsTreeItem.ts +++ b/apps/vs-code-designer/src/app/tree/remoteWorkflowsTree/RemoteWorkflowsTreeItem.ts @@ -10,7 +10,7 @@ import { getThemedIconPath } from '../../utils/tree/assets'; import { getProjectContextValue } from '../../utils/tree/projectContextValues'; import type { SlotTreeItem } from '../slotsTree/SlotTreeItem'; import { RemoteWorkflowTreeItem } from './RemoteWorkflowTreeItem'; -import { isNullOrEmpty } from '@microsoft/utils-logic-apps'; +import { isNullOrEmpty } from '@microsoft/logic-apps-shared'; import { AzExtParentTreeItem } from '@microsoft/vscode-azext-utils'; import type { AzExtTreeItem, IActionContext, TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import { ProjectAccess, ProjectResource } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/tree/subscriptionTree/SubscriptionTreeItem.ts b/apps/vs-code-designer/src/app/tree/subscriptionTree/SubscriptionTreeItem.ts index 67394399d95..472d581a3bf 100644 --- a/apps/vs-code-designer/src/app/tree/subscriptionTree/SubscriptionTreeItem.ts +++ b/apps/vs-code-designer/src/app/tree/subscriptionTree/SubscriptionTreeItem.ts @@ -20,7 +20,7 @@ import { getFunctionsWorkerRuntime, getWorkspaceSettingFromAnyFolder } from '../ import { LogicAppResourceTree } from '../LogicAppResourceTree'; import { SlotTreeItem } from '../slotsTree/SlotTreeItem'; import type { Site, WebSiteManagementClient } from '@azure/arm-appservice'; -import { isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import { isNullOrUndefined } from '@microsoft/logic-apps-shared'; import { AppInsightsCreateStep, AppInsightsListStep, diff --git a/apps/vs-code-designer/src/app/utils/codeless/apiUtils.ts b/apps/vs-code-designer/src/app/utils/codeless/apiUtils.ts index d61fa301c82..3569863c4d8 100644 --- a/apps/vs-code-designer/src/app/utils/codeless/apiUtils.ts +++ b/apps/vs-code-designer/src/app/utils/codeless/apiUtils.ts @@ -7,7 +7,7 @@ import { localize } from '../../../localize'; import type { RemoteWorkflowTreeItem } from '../../tree/remoteWorkflowsTree/RemoteWorkflowTreeItem'; import type { SlotTreeItem } from '../../tree/slotsTree/SlotTreeItem'; import { sendAzureRequest } from '../requestUtils'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import type { IParametersFileContent, diff --git a/apps/vs-code-designer/src/app/utils/codeless/connection.ts b/apps/vs-code-designer/src/app/utils/codeless/connection.ts index 9e46b2c4750..32080cd7e2f 100644 --- a/apps/vs-code-designer/src/app/utils/codeless/connection.ts +++ b/apps/vs-code-designer/src/app/utils/codeless/connection.ts @@ -9,7 +9,7 @@ import { getContainingWorkspace } from '../workspace'; import { getAuthorizationToken } from './getAuthorizationToken'; import { getParametersJson } from './parameter'; import { addNewFileInCSharpProject } from './updateBuildFile'; -import { HTTP_METHODS, isString } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS, isString } from '@microsoft/logic-apps-shared'; import type { ParsedSite } from '@microsoft/vscode-azext-azureappservice'; import { nonNullValue } from '@microsoft/vscode-azext-utils'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; diff --git a/apps/vs-code-designer/src/app/utils/codeless/startDesignTimeApi.ts b/apps/vs-code-designer/src/app/utils/codeless/startDesignTimeApi.ts index df91458510e..019c395bab3 100644 --- a/apps/vs-code-designer/src/app/utils/codeless/startDesignTimeApi.ts +++ b/apps/vs-code-designer/src/app/utils/codeless/startDesignTimeApi.ts @@ -28,7 +28,7 @@ import { tryGetLogicAppProjectRoot } from '../verifyIsProject'; import { getWorkspaceSetting, updateGlobalSetting } from '../vsCodeConfig/settings'; import { getWorkspaceFolder } from '../workspace'; import { delay } from '@azure/ms-rest-js'; -import { extend } from '@microsoft/utils-logic-apps'; +import { extend } from '@microsoft/logic-apps-shared'; import { DialogResponses, openUrl, diff --git a/apps/vs-code-designer/src/app/utils/feed.ts b/apps/vs-code-designer/src/app/utils/feed.ts index e9bc21a7eb0..0829ea8d57c 100644 --- a/apps/vs-code-designer/src/app/utils/feed.ts +++ b/apps/vs-code-designer/src/app/utils/feed.ts @@ -5,7 +5,7 @@ import { parseJson } from './parseJson'; import { sendRequestWithExtTimeout } from './requestUtils'; import type { HttpOperationResponse } from '@azure/ms-rest-js'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { nonNullProp } from '@microsoft/vscode-azext-utils'; diff --git a/apps/vs-code-designer/src/app/utils/fs.ts b/apps/vs-code-designer/src/app/utils/fs.ts index 09e2a8f51ec..ce8c0a10edd 100644 --- a/apps/vs-code-designer/src/app/utils/fs.ts +++ b/apps/vs-code-designer/src/app/utils/fs.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import { localize } from '../../localize'; -import { isEmptyString } from '@microsoft/utils-logic-apps'; +import { isEmptyString } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { DialogResponses } from '@microsoft/vscode-azext-utils'; import type { pathRelativeFunc } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/utils/funcCoreTools/cpUtils.ts b/apps/vs-code-designer/src/app/utils/funcCoreTools/cpUtils.ts index b1f9d468b06..6b7b7cf171e 100644 --- a/apps/vs-code-designer/src/app/utils/funcCoreTools/cpUtils.ts +++ b/apps/vs-code-designer/src/app/utils/funcCoreTools/cpUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Platform } from '../../../constants'; import { localize } from '../../../localize'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import type { IAzExtOutputChannel } from '@microsoft/vscode-azext-utils'; import type { ICommandResult } from '@microsoft/vscode-extension'; import * as cp from 'child_process'; diff --git a/apps/vs-code-designer/src/app/utils/funcCoreTools/funcHostTask.ts b/apps/vs-code-designer/src/app/utils/funcCoreTools/funcHostTask.ts index 72b98bdc343..b0bf5166268 100644 --- a/apps/vs-code-designer/src/app/utils/funcCoreTools/funcHostTask.ts +++ b/apps/vs-code-designer/src/app/utils/funcCoreTools/funcHostTask.ts @@ -7,7 +7,7 @@ import { getLocalSettingsJson } from '../appSettings/localSettings'; import { tryGetLogicAppProjectRoot } from '../verifyIsProject'; import { getWorkspaceSetting } from '../vsCodeConfig/settings'; import { delay } from '@azure/ms-rest-js'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { registerEvent } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; diff --git a/apps/vs-code-designer/src/app/utils/funcCoreTools/funcVersion.ts b/apps/vs-code-designer/src/app/utils/funcCoreTools/funcVersion.ts index 34897e8dd93..3399d118199 100644 --- a/apps/vs-code-designer/src/app/utils/funcCoreTools/funcVersion.ts +++ b/apps/vs-code-designer/src/app/utils/funcCoreTools/funcVersion.ts @@ -12,7 +12,7 @@ import { ext } from '../../../extensionVariables'; import { localize } from '../../../localize'; import { getGlobalSetting, getWorkspaceSettingFromAnyFolder, updateGlobalSetting } from '../vsCodeConfig/settings'; import { executeCommand } from './cpUtils'; -import { isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import { isNullOrUndefined } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import { FuncVersion, latestGAVersion } from '@microsoft/vscode-extension'; import * as fs from 'fs'; diff --git a/apps/vs-code-designer/src/app/utils/funcCoreTools/getNpmDistTag.ts b/apps/vs-code-designer/src/app/utils/funcCoreTools/getNpmDistTag.ts index 17e172a0de0..e94dfd8a33a 100644 --- a/apps/vs-code-designer/src/app/utils/funcCoreTools/getNpmDistTag.ts +++ b/apps/vs-code-designer/src/app/utils/funcCoreTools/getNpmDistTag.ts @@ -6,7 +6,7 @@ import { localize } from '../../../localize'; import { parseJson } from '../parseJson'; import { sendRequestWithExtTimeout } from '../requestUtils'; import { tryGetMajorVersion } from './funcVersion'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import type { IActionContext } from '@microsoft/vscode-azext-utils'; import type { FuncVersion, INpmDistTag, IPackageMetadata } from '@microsoft/vscode-extension'; import * as semver from 'semver'; diff --git a/apps/vs-code-designer/src/app/utils/requestUtils.ts b/apps/vs-code-designer/src/app/utils/requestUtils.ts index bd087a9338f..5f0cada895c 100644 --- a/apps/vs-code-designer/src/app/utils/requestUtils.ts +++ b/apps/vs-code-designer/src/app/utils/requestUtils.ts @@ -8,7 +8,7 @@ import { localize } from '../../localize'; import { getWorkspaceSetting } from './vsCodeConfig/settings'; import { RestError, WebResource } from '@azure/ms-rest-js'; import type { HttpOperationResponse, RequestPrepareOptions, ServiceClient } from '@azure/ms-rest-js'; -import { HTTP_METHODS, isString } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS, isString } from '@microsoft/logic-apps-shared'; import { createGenericClient, sendRequestWithTimeout } from '@microsoft/vscode-azext-azureutils'; import type { AzExtRequestPrepareOptions } from '@microsoft/vscode-azext-azureutils'; import { nonNullProp, nonNullValue, parseError } from '@microsoft/vscode-azext-utils'; diff --git a/apps/vs-code-designer/src/app/utils/tree/assets.ts b/apps/vs-code-designer/src/app/utils/tree/assets.ts index 803df5aedbf..5a81effc5e4 100644 --- a/apps/vs-code-designer/src/app/utils/tree/assets.ts +++ b/apps/vs-code-designer/src/app/utils/tree/assets.ts @@ -1,5 +1,5 @@ import { ext } from '../../../extensionVariables'; -import { Theme } from '@microsoft/utils-logic-apps'; +import { Theme } from '@microsoft/logic-apps-shared'; import type { TreeItemIconPath } from '@microsoft/vscode-azext-utils'; import * as path from 'path'; diff --git a/apps/vs-code-designer/src/app/utils/tree/projectContextValues.ts b/apps/vs-code-designer/src/app/utils/tree/projectContextValues.ts index 1667d8cef89..5d33b78aaf1 100644 --- a/apps/vs-code-designer/src/app/utils/tree/projectContextValues.ts +++ b/apps/vs-code-designer/src/app/utils/tree/projectContextValues.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See LICENSE.md in the project root for license information. *--------------------------------------------------------------------------------------------*/ import { contextValuePrefix, contextValueSeparator } from '../../../constants'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import type { ProjectAccess, ProjectResource } from '@microsoft/vscode-extension'; import { ProjectSource } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/utils/verifyIsProject.ts b/apps/vs-code-designer/src/app/utils/verifyIsProject.ts index e08b3abdb39..73806fe4892 100644 --- a/apps/vs-code-designer/src/app/utils/verifyIsProject.ts +++ b/apps/vs-code-designer/src/app/utils/verifyIsProject.ts @@ -6,7 +6,7 @@ import { extensionBundleId, hostFileName, localSettingsFileName } from '../../co import { localize } from '../../localize'; import { createNewProjectInternal } from '../commands/createNewProject/createNewProject'; import { getWorkspaceSetting, updateWorkspaceSetting } from './vsCodeConfig/settings'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import { DialogResponses } from '@microsoft/vscode-azext-utils'; import type { IActionContext, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import type { ICreateFunctionOptions } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/utils/vsCodeConfig/settings.ts b/apps/vs-code-designer/src/app/utils/vsCodeConfig/settings.ts index 77eebd289ba..d477433f30d 100644 --- a/apps/vs-code-designer/src/app/utils/vsCodeConfig/settings.ts +++ b/apps/vs-code-designer/src/app/utils/vsCodeConfig/settings.ts @@ -5,7 +5,7 @@ import { Platform } from '../../../constants'; import { ext } from '../../../extensionVariables'; import { localize } from '../../../localize'; -import { isString } from '@microsoft/utils-logic-apps'; +import { isString } from '@microsoft/logic-apps-shared'; import type { IActionContext, IAzureQuickPickItem, IAzureQuickPickOptions } from '@microsoft/vscode-azext-utils'; import { openUrl } from '@microsoft/vscode-azext-utils'; import { FuncVersion, ProjectLanguage, WorkerRuntime } from '@microsoft/vscode-extension'; diff --git a/apps/vs-code-designer/src/app/utils/workspace.ts b/apps/vs-code-designer/src/app/utils/workspace.ts index c8c7f0837a5..3b0c24203af 100644 --- a/apps/vs-code-designer/src/app/utils/workspace.ts +++ b/apps/vs-code-designer/src/app/utils/workspace.ts @@ -7,7 +7,7 @@ import type { RemoteWorkflowTreeItem } from '../tree/remoteWorkflowsTree/RemoteW import { NoWorkspaceError } from './errors'; import { isPathEqual, isSubpath } from './fs'; import { tryGetLogicAppProjectRoot } from './verifyIsProject'; -import { isNullOrUndefined, isString } from '@microsoft/utils-logic-apps'; +import { isNullOrUndefined, isString } from '@microsoft/logic-apps-shared'; import { UserCancelledError } from '@microsoft/vscode-azext-utils'; import type { IActionContext, IAzureQuickPickItem } from '@microsoft/vscode-azext-utils'; import * as globby from 'globby'; diff --git a/apps/vs-code-react/src/app/dataMapper/app.tsx b/apps/vs-code-react/src/app/dataMapper/app.tsx index a5a2d97ee90..20e97ac1492 100644 --- a/apps/vs-code-react/src/app/dataMapper/app.tsx +++ b/apps/vs-code-react/src/app/dataMapper/app.tsx @@ -12,7 +12,7 @@ import { getSelectedSchema, } from '@microsoft/logic-apps-data-mapper'; import { getTheme, useThemeObserver } from '@microsoft/logic-apps-designer'; -import type { Theme, SchemaType } from '@microsoft/utils-logic-apps'; +import type { Theme, SchemaType } from '@microsoft/logic-apps-shared'; import type { MessageToVsix } from '@microsoft/vscode-extension'; import { ExtensionCommand } from '@microsoft/vscode-extension'; import { useCallback, useContext, useEffect, useState } from 'react'; diff --git a/apps/vs-code-react/src/app/designer/DesignerCommandBar/index.tsx b/apps/vs-code-react/src/app/designer/DesignerCommandBar/index.tsx index 0d56bd88fa4..3e14abea4b2 100644 --- a/apps/vs-code-react/src/app/designer/DesignerCommandBar/index.tsx +++ b/apps/vs-code-react/src/app/designer/DesignerCommandBar/index.tsx @@ -11,7 +11,7 @@ import { openPanel, } from '@microsoft/logic-apps-designer'; import type { RootState } from '@microsoft/logic-apps-designer'; -import { RUN_AFTER_COLORS, isNullOrEmpty } from '@microsoft/utils-logic-apps'; +import { RUN_AFTER_COLORS, isNullOrEmpty } from '@microsoft/logic-apps-shared'; import { ExtensionCommand } from '@microsoft/vscode-extension'; import { createSelector } from '@reduxjs/toolkit'; import { useContext, useMemo } from 'react'; diff --git a/apps/vs-code-react/src/app/designer/app.tsx b/apps/vs-code-react/src/app/designer/app.tsx index 8407a07e2bf..18e5e4fbcfe 100644 --- a/apps/vs-code-react/src/app/designer/app.tsx +++ b/apps/vs-code-react/src/app/designer/app.tsx @@ -9,8 +9,8 @@ import { Spinner, SpinnerSize, Text } from '@fluentui/react'; import type { ConnectionCreationInfo } from '@microsoft/designer-client-services-logic-apps'; import type { ConnectionReferences } from '@microsoft/logic-apps-designer'; import { DesignerProvider, BJSWorkflowProvider, Designer, getTheme, useThemeObserver } from '@microsoft/logic-apps-designer'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { isEmptyString, Theme } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { isEmptyString, Theme } from '@microsoft/logic-apps-shared'; import type { FileSystemConnectionInfo, StandardApp } from '@microsoft/vscode-extension'; import { ExtensionCommand } from '@microsoft/vscode-extension'; import { useContext, useMemo, useState, useEffect } from 'react'; diff --git a/apps/vs-code-react/src/app/designer/models/workflow.ts b/apps/vs-code-react/src/app/designer/models/workflow.ts index 34bd27567f3..d5196830885 100644 --- a/apps/vs-code-react/src/app/designer/models/workflow.ts +++ b/apps/vs-code-react/src/app/designer/models/workflow.ts @@ -1,4 +1,4 @@ -import type { ArmResource } from '@microsoft/utils-logic-apps'; +import type { ArmResource } from '@microsoft/logic-apps-shared'; export const WorkflowState = { Disabled: 'Disabled', diff --git a/apps/vs-code-react/src/app/designer/servicesHelper.ts b/apps/vs-code-react/src/app/designer/servicesHelper.ts index 20794fae0a4..19b7dbadacd 100644 --- a/apps/vs-code-react/src/app/designer/servicesHelper.ts +++ b/apps/vs-code-react/src/app/designer/servicesHelper.ts @@ -20,8 +20,8 @@ import type { IHostService, IWorkflowService, } from '@microsoft/designer-client-services-logic-apps'; -import type { ManagedIdentity } from '@microsoft/utils-logic-apps'; -import { HTTP_METHODS, clone } from '@microsoft/utils-logic-apps'; +import type { ManagedIdentity } from '@microsoft/logic-apps-shared'; +import { HTTP_METHODS, clone } from '@microsoft/logic-apps-shared'; import type { ConnectionAndAppSetting, ConnectionsData, IDesignerPanelMetadata } from '@microsoft/vscode-extension'; import { ExtensionCommand, HttpClient } from '@microsoft/vscode-extension'; import type { QueryClient } from 'react-query'; diff --git a/apps/vs-code-react/src/app/export/instanceSelection/instanceSelection.tsx b/apps/vs-code-react/src/app/export/instanceSelection/instanceSelection.tsx index a899474a20d..bb532b388a2 100644 --- a/apps/vs-code-react/src/app/export/instanceSelection/instanceSelection.tsx +++ b/apps/vs-code-react/src/app/export/instanceSelection/instanceSelection.tsx @@ -6,7 +6,7 @@ import { SearchableDropdown } from '../../components/searchableDropdown'; import { getDropdownPlaceholder, parseIseList, parseRegionList, parseSubscriptionsList } from './helper'; import { Text, DropdownMenuItemType } from '@fluentui/react'; import type { IDropdownOption } from '@fluentui/react'; -import { isEmptyString } from '@microsoft/utils-logic-apps'; +import { isEmptyString } from '@microsoft/logic-apps-shared'; import { useEffect, useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useQuery } from 'react-query'; diff --git a/apps/vs-code-react/src/app/export/workflowsSelection/workflowsSelection.tsx b/apps/vs-code-react/src/app/export/workflowsSelection/workflowsSelection.tsx index 02223a4f7dd..6fc0baac2d7 100644 --- a/apps/vs-code-react/src/app/export/workflowsSelection/workflowsSelection.tsx +++ b/apps/vs-code-react/src/app/export/workflowsSelection/workflowsSelection.tsx @@ -10,7 +10,7 @@ import { filterWorkflows, getListColumns, getSelectedItems, parseResourceGroups, import { SelectedList } from './selectedList'; import { Separator, ShimmeredDetailsList, Text, SelectionMode, Selection, MessageBar, MessageBarType } from '@fluentui/react'; import type { IDropdownOption } from '@fluentui/react'; -import { isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import { isNullOrUndefined } from '@microsoft/logic-apps-shared'; import { useMemo, useRef, useState, useEffect, useCallback } from 'react'; import { useIntl } from 'react-intl'; import { useQuery } from 'react-query'; diff --git a/apps/vs-code-react/src/app/overview/app.tsx b/apps/vs-code-react/src/app/overview/app.tsx index 979f9962c1f..0c768fe92fb 100644 --- a/apps/vs-code-react/src/app/overview/app.tsx +++ b/apps/vs-code-react/src/app/overview/app.tsx @@ -5,7 +5,7 @@ import { VSCodeContext } from '../../webviewCommunication'; import { StandardRunService } from '@microsoft/designer-client-services-logic-apps'; import type { CallbackInfo } from '@microsoft/designer-client-services-logic-apps'; import { Overview, isRunError, mapToRunItem } from '@microsoft/designer-ui'; -import type { Runs } from '@microsoft/utils-logic-apps'; +import type { Runs } from '@microsoft/logic-apps-shared'; import { ExtensionCommand, HttpClient } from '@microsoft/vscode-extension'; import { useCallback, useContext, useMemo } from 'react'; import { useInfiniteQuery, useMutation } from 'react-query'; diff --git a/apps/vs-code-react/src/run-service/export/index.ts b/apps/vs-code-react/src/run-service/export/index.ts index aa3a2c3fde7..0e38a4f0e3a 100644 --- a/apps/vs-code-react/src/run-service/export/index.ts +++ b/apps/vs-code-react/src/run-service/export/index.ts @@ -10,7 +10,7 @@ import type { IIse, } from '../types'; import { getValidationPayload, getExportUri } from './helper'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import { getBaseGraphApi } from '@microsoft/vscode-extension'; export interface ApiServiceOptions { diff --git a/apps/vs-code-react/src/run-service/types.ts b/apps/vs-code-react/src/run-service/types.ts index 5d72d82624a..acd74e0d36a 100644 --- a/apps/vs-code-react/src/run-service/types.ts +++ b/apps/vs-code-react/src/run-service/types.ts @@ -1,6 +1,6 @@ import type { InitializePayload, Status } from '../state/WorkflowSlice'; import type { ApiHubServiceDetails } from '@microsoft/designer-client-services-logic-apps'; -import type { SchemaType } from '@microsoft/utils-logic-apps'; +import type { SchemaType } from '@microsoft/logic-apps-shared'; import type { MapDefinitionData, ExtensionCommand, ConnectionsData, IDesignerPanelMetadata } from '@microsoft/vscode-extension'; export interface IApiService { diff --git a/apps/vs-code-react/src/state/DataMapSlice.ts b/apps/vs-code-react/src/state/DataMapSlice.ts index 954a96d8dae..d898665518e 100644 --- a/apps/vs-code-react/src/state/DataMapSlice.ts +++ b/apps/vs-code-react/src/state/DataMapSlice.ts @@ -1,5 +1,5 @@ import type { FunctionData } from '@microsoft/logic-apps-data-mapper'; -import type { MapDefinitionEntry, MapMetadata, Schema } from '@microsoft/utils-logic-apps'; +import type { DataMapSchema, MapDefinitionEntry, MapMetadata } from '@microsoft/logic-apps-shared'; import type { PayloadAction } from '@reduxjs/toolkit'; import { createSlice } from '@reduxjs/toolkit'; @@ -11,9 +11,9 @@ export interface DataMapState { dataMapMetadata?: MapMetadata; sourceSchemaFilename?: string; - sourceSchema?: Schema; + sourceSchema?: DataMapSchema; targetSchemaFilename?: string; - targetSchema?: Schema; + targetSchema?: DataMapSchema; schemaFileList?: string[]; customXsltPathsList?: string[]; xsltFilename: string; @@ -57,13 +57,13 @@ export const dataMapSlice = createSlice({ changeSourceSchemaFilename: (state, action: PayloadAction) => { state.sourceSchemaFilename = action.payload; }, - changeSourceSchema: (state, action: PayloadAction) => { + changeSourceSchema: (state, action: PayloadAction) => { state.sourceSchema = action.payload; }, changeTargetSchemaFilename: (state, action: PayloadAction) => { state.targetSchemaFilename = action.payload; }, - changeTargetSchema: (state, action: PayloadAction) => { + changeTargetSchema: (state, action: PayloadAction) => { state.targetSchema = action.payload; }, changeSchemaList: (state, action: PayloadAction) => { diff --git a/apps/vs-code-react/src/webviewCommunication.tsx b/apps/vs-code-react/src/webviewCommunication.tsx index 6e6d90702c4..3659fabe416 100644 --- a/apps/vs-code-react/src/webviewCommunication.tsx +++ b/apps/vs-code-react/src/webviewCommunication.tsx @@ -32,7 +32,7 @@ import type { InitializePayload } from './state/WorkflowSlice'; import { initializeWorkflow, updateAccessToken, updateTargetDirectory, addStatus, setFinalStatus } from './state/WorkflowSlice'; import { initialize } from './state/projectSlice'; import type { AppDispatch, RootState } from './state/store'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { ExtensionCommand, ProjectName } from '@microsoft/vscode-extension'; import useEventListener from '@use-it/event-listener'; import type { ReactNode } from 'react'; diff --git a/libs/chatbot/src/lib/ui/chatbot.tsx b/libs/chatbot/src/lib/ui/chatbot.tsx index b85219387c8..35df1b44a02 100644 --- a/libs/chatbot/src/lib/ui/chatbot.tsx +++ b/libs/chatbot/src/lib/ui/chatbot.tsx @@ -18,7 +18,7 @@ import { ChatSuggestion, } from '@microsoft/designer-ui'; import type { Workflow } from '@microsoft/logic-apps-designer'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/data-mapper/src/lib/__mocks__/FunctionMock.ts b/libs/data-mapper/src/lib/__mocks__/FunctionMock.ts index d2c5234848c..06e2dc2451f 100644 --- a/libs/data-mapper/src/lib/__mocks__/FunctionMock.ts +++ b/libs/data-mapper/src/lib/__mocks__/FunctionMock.ts @@ -1,6 +1,6 @@ import type { FunctionData } from '../models/Function'; import { FunctionCategory } from '../models/Function'; -import { NormalizedDataType } from '@microsoft/utils-logic-apps'; +import { NormalizedDataType } from '@microsoft/logic-apps-shared'; export const addFunction: FunctionData = { key: 'Add', diff --git a/libs/data-mapper/src/lib/__test__/schema.spec.ts b/libs/data-mapper/src/lib/__test__/schema.spec.ts index 6c2fc5da320..1f2b6dd0b7b 100644 --- a/libs/data-mapper/src/lib/__test__/schema.spec.ts +++ b/libs/data-mapper/src/lib/__test__/schema.spec.ts @@ -1,6 +1,6 @@ import { simpleMockSchema, noChildrenMockSchema } from '../__mocks__'; import { convertSchemaToSchemaExtended } from '../utils/Schema.Utils'; -import type { Schema } from '@microsoft/utils-logic-apps'; +import type { Schema } from '@microsoft/logic-apps-shared'; describe('models/Schema', () => { describe('convertSchemaToSchemaExtended', () => { diff --git a/libs/data-mapper/src/lib/components/breadcrumb/EditorBreadcrumb.tsx b/libs/data-mapper/src/lib/components/breadcrumb/EditorBreadcrumb.tsx index 25d16d17afa..ac805996f87 100644 --- a/libs/data-mapper/src/lib/components/breadcrumb/EditorBreadcrumb.tsx +++ b/libs/data-mapper/src/lib/components/breadcrumb/EditorBreadcrumb.tsx @@ -5,7 +5,7 @@ import type { IBreadcrumbItem, IContextualMenuItem, IContextualMenuProps, IDivid import { Breadcrumb, ContextualMenu, IconButton } from '@fluentui/react'; import { Button, tokens, makeStyles, Text, typographyStyles } from '@fluentui/react-components'; import { Code20Regular } from '@fluentui/react-icons'; -import type { SchemaExtended, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaExtended, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/canvasToolbox/CanvasToolbox.tsx b/libs/data-mapper/src/lib/components/canvasToolbox/CanvasToolbox.tsx index 74f4d6d12d1..1876a4fbf7e 100644 --- a/libs/data-mapper/src/lib/components/canvasToolbox/CanvasToolbox.tsx +++ b/libs/data-mapper/src/lib/components/canvasToolbox/CanvasToolbox.tsx @@ -17,7 +17,7 @@ import { Stack } from '@fluentui/react'; import type { SelectTabData, SelectTabEvent } from '@fluentui/react-components'; import { Button, MenuItem, Text, mergeClasses, tokens, typographyStyles } from '@fluentui/react-components'; import { CubeTree20Filled, CubeTree20Regular, MathFormula20Filled, MathFormula20Regular } from '@fluentui/react-icons'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/configPanel/AddOrUpdateSchemaView.tsx b/libs/data-mapper/src/lib/components/configPanel/AddOrUpdateSchemaView.tsx index 23fe09f7921..430c42396f8 100644 --- a/libs/data-mapper/src/lib/components/configPanel/AddOrUpdateSchemaView.tsx +++ b/libs/data-mapper/src/lib/components/configPanel/AddOrUpdateSchemaView.tsx @@ -5,7 +5,7 @@ import { UploadNewSchema } from './UploadNewSchema'; import { ChoiceGroup, MessageBar, MessageBarType } from '@fluentui/react'; import type { IChoiceGroupOption } from '@fluentui/react'; import { Text } from '@fluentui/react-components'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/configPanel/ConfigPanel.tsx b/libs/data-mapper/src/lib/components/configPanel/ConfigPanel.tsx index ba898220d54..703a5b07d07 100644 --- a/libs/data-mapper/src/lib/components/configPanel/ConfigPanel.tsx +++ b/libs/data-mapper/src/lib/components/configPanel/ConfigPanel.tsx @@ -8,8 +8,8 @@ import type { SchemaFile } from './AddOrUpdateSchemaView'; import { AddOrUpdateSchemaView, UploadSchemaTypes } from './AddOrUpdateSchemaView'; import { DefaultConfigView } from './DefaultConfigView'; import { DefaultButton, Panel, PrimaryButton } from '@fluentui/react'; -import type { Schema } from '@microsoft/utils-logic-apps'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import type { DataMapSchema } from '@microsoft/logic-apps-shared'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useState } from 'react'; import { useIntl } from 'react-intl'; import { useQuery } from 'react-query'; @@ -117,7 +117,7 @@ export const ConfigPanel = ({ }, [dispatch, setErrorMessage]); const onSubmitSchema = useCallback( - (schema: Schema) => { + (schema: DataMapSchema) => { if (schemaType) { const extendedSchema = convertSchemaToSchemaExtended(schema); dispatch(setInitialSchema({ schema: extendedSchema, schemaType: schemaType })); @@ -156,7 +156,8 @@ export const ConfigPanel = ({ return; } - const selectedSchema = schemaType === SchemaType.Source ? (fetchedSourceSchema.data as Schema) : (fetchedTargetSchema.data as Schema); + const selectedSchema = + schemaType === SchemaType.Source ? (fetchedSourceSchema.data as DataMapSchema) : (fetchedTargetSchema.data as DataMapSchema); if (uploadType === UploadSchemaTypes.SelectFrom && selectedSchema) { onSubmitSchema(selectedSchema); diff --git a/libs/data-mapper/src/lib/components/configPanel/DefaultConfigView.tsx b/libs/data-mapper/src/lib/components/configPanel/DefaultConfigView.tsx index e67e410e0dd..3dc1f356426 100644 --- a/libs/data-mapper/src/lib/components/configPanel/DefaultConfigView.tsx +++ b/libs/data-mapper/src/lib/components/configPanel/DefaultConfigView.tsx @@ -4,7 +4,7 @@ import { LogCategory, LogService } from '../../utils/Logging.Utils'; import type { IChoiceGroupOption } from '@fluentui/react'; import { ChoiceGroup, IconButton, Label, Stack, StackItem, Text } from '@fluentui/react'; import { useId } from '@microsoft/designer-ui'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { useCallback } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/configPanel/SelectExistingSchema.tsx b/libs/data-mapper/src/lib/components/configPanel/SelectExistingSchema.tsx index 104ce9cadf7..54a075b56ac 100644 --- a/libs/data-mapper/src/lib/components/configPanel/SelectExistingSchema.tsx +++ b/libs/data-mapper/src/lib/components/configPanel/SelectExistingSchema.tsx @@ -1,6 +1,6 @@ import type { RootState } from '../../core/state/Store'; import { FileDropdown } from '../fileDropdown/fileDropdown'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import React, { useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/configPanel/UploadNewSchema.tsx b/libs/data-mapper/src/lib/components/configPanel/UploadNewSchema.tsx index 42fc1830cfd..0e8bc5bbb83 100644 --- a/libs/data-mapper/src/lib/components/configPanel/UploadNewSchema.tsx +++ b/libs/data-mapper/src/lib/components/configPanel/UploadNewSchema.tsx @@ -1,7 +1,7 @@ import type { FileWithVsCodePath, SchemaFile } from './AddOrUpdateSchemaView'; import { Button, Input } from '@fluentui/react-components'; import { StackShim } from '@fluentui/react-migration-v8-v9'; -import type { SchemaType } from '@microsoft/utils-logic-apps'; +import type { SchemaType } from '@microsoft/logic-apps-shared'; import { useRef } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/data-mapper/src/lib/components/functionList/FunctionList.tsx b/libs/data-mapper/src/lib/components/functionList/FunctionList.tsx index af06d45f1d5..fdf57379f37 100644 --- a/libs/data-mapper/src/lib/components/functionList/FunctionList.tsx +++ b/libs/data-mapper/src/lib/components/functionList/FunctionList.tsx @@ -19,7 +19,7 @@ import FunctionListHeader from './FunctionListHeader'; import FunctionListItem from './FunctionListItem'; import { Button, Input, Tooltip } from '@fluentui/react-components'; import { Dismiss20Regular } from '@fluentui/react-icons'; -import type { FunctionPositionMetadata } from '@microsoft/utils-logic-apps'; +import type { FunctionPositionMetadata } from '@microsoft/logic-apps-shared'; import Fuse from 'fuse.js'; import { useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/data-mapper/src/lib/components/globalView/GlobalView.tsx b/libs/data-mapper/src/lib/components/globalView/GlobalView.tsx index f3886740d6d..3ad5a2056b0 100644 --- a/libs/data-mapper/src/lib/components/globalView/GlobalView.tsx +++ b/libs/data-mapper/src/lib/components/globalView/GlobalView.tsx @@ -5,7 +5,7 @@ import { SchemaCard } from '../nodeCard/SchemaCard'; import { SimpleFunctionCard } from '../nodeCard/functionCard/SimpleFunctionCard'; import { SchemaNameBadge } from '../schemaSelection/SchemaNameBadge'; import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { useEffect, useMemo } from 'react'; import { useSelector } from 'react-redux'; // eslint-disable-next-line import/no-named-as-default diff --git a/libs/data-mapper/src/lib/components/inputTypes/InputDropdown.tsx b/libs/data-mapper/src/lib/components/inputTypes/InputDropdown.tsx index e0ac5e18316..47cad901170 100644 --- a/libs/data-mapper/src/lib/components/inputTypes/InputDropdown.tsx +++ b/libs/data-mapper/src/lib/components/inputTypes/InputDropdown.tsx @@ -14,8 +14,8 @@ import { DMTooltip } from '../tooltip/tooltip'; import { Stack } from '@fluentui/react'; import type { ComboboxProps } from '@fluentui/react-components'; import { Combobox, Option, Text, makeStyles, tokens, typographyStyles } from '@fluentui/react-components'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { isNullOrEmpty, NormalizedDataType, numericalDataType } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { isNullOrEmpty, NormalizedDataType, numericalDataType } from '@microsoft/logic-apps-shared'; import React, { useEffect, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/mapOverview/MapOverview.tsx b/libs/data-mapper/src/lib/components/mapOverview/MapOverview.tsx index a6297f86fef..8737ed1a4d1 100644 --- a/libs/data-mapper/src/lib/components/mapOverview/MapOverview.tsx +++ b/libs/data-mapper/src/lib/components/mapOverview/MapOverview.tsx @@ -9,7 +9,7 @@ import { checkNodeStatuses } from '../sidePane/tabs/targetSchemaTab/TargetSchema import type { NodeToggledStateDictionary } from '../tree/TargetSchemaTreeItem'; import { Stack } from '@fluentui/react'; import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { useEffect, useMemo } from 'react'; import { useSelector } from 'react-redux'; // eslint-disable-next-line import/no-named-as-default diff --git a/libs/data-mapper/src/lib/components/nodeCard/HandleWrapper.tsx b/libs/data-mapper/src/lib/components/nodeCard/HandleWrapper.tsx index bd881a35001..12173e163f4 100644 --- a/libs/data-mapper/src/lib/components/nodeCard/HandleWrapper.tsx +++ b/libs/data-mapper/src/lib/components/nodeCard/HandleWrapper.tsx @@ -3,7 +3,7 @@ import type { RootState } from '../../core/state/Store'; import { store } from '../../core/state/Store'; import { isFunctionInputSlotAvailable, newConnectionWillHaveCircularLogic } from '../../utils/Connection.Utils'; import { makeStaticStyles, tokens } from '@fluentui/react-components'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; import type { Position as HandlePosition, HandleType, Connection as ReactFlowConnection } from 'reactflow'; diff --git a/libs/data-mapper/src/lib/components/nodeCard/SchemaCard.tsx b/libs/data-mapper/src/lib/components/nodeCard/SchemaCard.tsx index 9f241759351..13af751543f 100644 --- a/libs/data-mapper/src/lib/components/nodeCard/SchemaCard.tsx +++ b/libs/data-mapper/src/lib/components/nodeCard/SchemaCard.tsx @@ -35,8 +35,8 @@ import { bundleIcon, } from '@fluentui/react-icons'; import { CardContextMenu, useCardContextMenu } from '@microsoft/designer-ui'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { SchemaNodeProperty, SchemaType } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { SchemaNodeProperty, SchemaType } from '@microsoft/logic-apps-shared'; import { useMemo, useRef, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/propertiesPane/tabs/BoundedInputEntry.tsx b/libs/data-mapper/src/lib/components/propertiesPane/tabs/BoundedInputEntry.tsx index d8ef3da0b83..655ce2ae2bf 100644 --- a/libs/data-mapper/src/lib/components/propertiesPane/tabs/BoundedInputEntry.tsx +++ b/libs/data-mapper/src/lib/components/propertiesPane/tabs/BoundedInputEntry.tsx @@ -7,7 +7,7 @@ import { FileDropdown } from '../../fileDropdown/fileDropdown'; import { InputDropdown } from '../../inputTypes/InputDropdown'; import { InputTextbox } from '../../inputTypes/InputTextbox'; import { Tooltip } from '@fluentui/react-components'; -import { InputFormat } from '@microsoft/utils-logic-apps'; +import { InputFormat } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/propertiesPane/tabs/CodeTab.tsx b/libs/data-mapper/src/lib/components/propertiesPane/tabs/CodeTab.tsx index 6efcabd887d..90bc50f5418 100644 --- a/libs/data-mapper/src/lib/components/propertiesPane/tabs/CodeTab.tsx +++ b/libs/data-mapper/src/lib/components/propertiesPane/tabs/CodeTab.tsx @@ -9,7 +9,7 @@ import { addSourceReactFlowPrefix } from '../../../utils/ReactFlow.Util'; import { commonCodeEditorProps } from '../../testMapPanel/TestMapPanel'; import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; import { EditorLanguage, MonacoEditor } from '@microsoft/designer-ui'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/propertiesPane/tabs/SchemaNodePropertiesTab.tsx b/libs/data-mapper/src/lib/components/propertiesPane/tabs/SchemaNodePropertiesTab.tsx index a0070ddee6f..a049e8725ed 100644 --- a/libs/data-mapper/src/lib/components/propertiesPane/tabs/SchemaNodePropertiesTab.tsx +++ b/libs/data-mapper/src/lib/components/propertiesPane/tabs/SchemaNodePropertiesTab.tsx @@ -8,7 +8,7 @@ import { addTargetReactFlowPrefix } from '../../../utils/ReactFlow.Util'; import { InputDropdown } from '../../inputTypes/InputDropdown'; import { Stack } from '@fluentui/react'; import { Label, makeStyles, Text, tokens, typographyStyles } from '@fluentui/react-components'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/schemaSelection/SelectSchemaCard.tsx b/libs/data-mapper/src/lib/components/schemaSelection/SelectSchemaCard.tsx index e8ccdfb5157..f6d22797a20 100644 --- a/libs/data-mapper/src/lib/components/schemaSelection/SelectSchemaCard.tsx +++ b/libs/data-mapper/src/lib/components/schemaSelection/SelectSchemaCard.tsx @@ -7,7 +7,7 @@ import CardOnRest from './card_onRest.svg'; import CardOnRestDark from './card_onRest_dark.svg'; import { Image, Stack } from '@fluentui/react'; import { Button, makeStyles, shorthands, Text, tokens, typographyStyles } from '@fluentui/react-components'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/sidePane/tabs/mapCheckerTab/MapCheckerTab.tsx b/libs/data-mapper/src/lib/components/sidePane/tabs/mapCheckerTab/MapCheckerTab.tsx index b06dc6638b2..4c15f4e7eac 100644 --- a/libs/data-mapper/src/lib/components/sidePane/tabs/mapCheckerTab/MapCheckerTab.tsx +++ b/libs/data-mapper/src/lib/components/sidePane/tabs/mapCheckerTab/MapCheckerTab.tsx @@ -15,7 +15,7 @@ import { MapCheckerItem, MapCheckerItemSeverity } from './MapCheckerItem'; import { Stack } from '@fluentui/react'; import { Accordion, AccordionHeader, AccordionItem, AccordionPanel, Text, tokens } from '@fluentui/react-components'; import { CheckmarkCircle20Filled } from '@fluentui/react-icons'; -import type { SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/sidePane/tabs/targetSchemaTab/TargetSchemaTab.tsx b/libs/data-mapper/src/lib/components/sidePane/tabs/targetSchemaTab/TargetSchemaTab.tsx index eca99b2d475..de143ea062b 100644 --- a/libs/data-mapper/src/lib/components/sidePane/tabs/targetSchemaTab/TargetSchemaTab.tsx +++ b/libs/data-mapper/src/lib/components/sidePane/tabs/targetSchemaTab/TargetSchemaTab.tsx @@ -9,7 +9,7 @@ import TargetSchemaTreeItem, { ItemToggledState, TargetSchemaTreeHeader } from ' import type { ITreeNode } from '../../../tree/Tree'; import Tree from '../../../tree/Tree'; import { mergeClasses, tokens } from '@fluentui/react-components'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useEffect, useMemo, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/testMapPanel/TestMapPanel.tsx b/libs/data-mapper/src/lib/components/testMapPanel/TestMapPanel.tsx index bb24d5abbbd..024cb57d260 100644 --- a/libs/data-mapper/src/lib/components/testMapPanel/TestMapPanel.tsx +++ b/libs/data-mapper/src/lib/components/testMapPanel/TestMapPanel.tsx @@ -6,7 +6,7 @@ import { ChoiceGroup, DefaultButton, Panel, PanelType, Pivot, PivotItem, Primary import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; import type { MonacoProps } from '@microsoft/designer-ui'; import { EditorLanguage, MonacoEditor } from '@microsoft/designer-ui'; -import { guid, isNullOrEmpty, SchemaFileFormat } from '@microsoft/utils-logic-apps'; +import { guid, isNullOrEmpty, SchemaFileFormat } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/components/tree/SchemaTreeSearchbar.tsx b/libs/data-mapper/src/lib/components/tree/SchemaTreeSearchbar.tsx index e3566c3238b..651072c3bcd 100644 --- a/libs/data-mapper/src/lib/components/tree/SchemaTreeSearchbar.tsx +++ b/libs/data-mapper/src/lib/components/tree/SchemaTreeSearchbar.tsx @@ -14,7 +14,7 @@ import { Tooltip, } from '@fluentui/react-components'; import { Dismiss20Regular, Filter20Regular, Checkmark20Filled } from '@fluentui/react-icons'; -import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/logic-apps-shared'; import { useDebouncedCallback } from '@react-hookz/web'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/data-mapper/src/lib/components/tree/SourceSchemaTreeItem.tsx b/libs/data-mapper/src/lib/components/tree/SourceSchemaTreeItem.tsx index 2b75c53e7ba..df09a1b15cf 100644 --- a/libs/data-mapper/src/lib/components/tree/SourceSchemaTreeItem.tsx +++ b/libs/data-mapper/src/lib/components/tree/SourceSchemaTreeItem.tsx @@ -3,7 +3,7 @@ import { iconForNormalizedDataType } from '../../utils/Icon.Utils'; import { Stack } from '@fluentui/react'; import { makeStyles, mergeClasses, shorthands, Text, tokens, typographyStyles } from '@fluentui/react-components'; import { AddCircle16Regular, CheckmarkCircle16Filled, Circle16Regular, Document20Regular } from '@fluentui/react-icons'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useSelector } from 'react-redux'; export const useSchemaTreeItemStyles = makeStyles({ diff --git a/libs/data-mapper/src/lib/components/tree/TargetSchemaTreeItem.tsx b/libs/data-mapper/src/lib/components/tree/TargetSchemaTreeItem.tsx index ba09d8df37c..53c64a0d7e0 100644 --- a/libs/data-mapper/src/lib/components/tree/TargetSchemaTreeItem.tsx +++ b/libs/data-mapper/src/lib/components/tree/TargetSchemaTreeItem.tsx @@ -6,7 +6,7 @@ import { TreeIndicator } from './TreeBranch'; import { Stack } from '@fluentui/react'; import { mergeClasses, Text, tokens } from '@fluentui/react-components'; import { CheckmarkCircle12Filled, Circle12Regular, CircleHalfFill12Regular, Document20Regular } from '@fluentui/react-icons'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/constants/ReactFlowConstants.ts b/libs/data-mapper/src/lib/constants/ReactFlowConstants.ts index 30e7791bc26..79b133f5007 100644 --- a/libs/data-mapper/src/lib/constants/ReactFlowConstants.ts +++ b/libs/data-mapper/src/lib/constants/ReactFlowConstants.ts @@ -1,5 +1,5 @@ import { tokens } from '@fluentui/react-components'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; export const checkerboardBackgroundImage = `repeating-linear-gradient(45deg, ${tokens.colorNeutralBackground1} 25%, transparent 25%, transparent 75%, ${tokens.colorNeutralBackground1} 75%, ${tokens.colorNeutralBackground1}), repeating-linear-gradient(45deg, ${tokens.colorNeutralBackground1} 25%, ${tokens.colorNeutralBackground2} 25%, ${tokens.colorNeutralBackground2} 75%, ${tokens.colorNeutralBackground1} 75%, ${tokens.colorNeutralBackground1})`; diff --git a/libs/data-mapper/src/lib/core/DataMapDataProvider.tsx b/libs/data-mapper/src/lib/core/DataMapDataProvider.tsx index df7bf97446b..f6c5f523e34 100644 --- a/libs/data-mapper/src/lib/core/DataMapDataProvider.tsx +++ b/libs/data-mapper/src/lib/core/DataMapDataProvider.tsx @@ -7,8 +7,8 @@ import { setInitialDataMap, setInitialSchema, setXsltContent, setXsltFilename } import { loadCustomXsltFilePaths, loadFunctions } from './state/FunctionSlice'; import { setAvailableSchemas } from './state/SchemaSlice'; import type { AppDispatch } from './state/Store'; -import type { MapMetadata, MapDefinitionEntry, Schema } from '@microsoft/utils-logic-apps'; -import { Theme as ThemeType, SchemaType } from '@microsoft/utils-logic-apps'; +import type { MapMetadata, MapDefinitionEntry, DataMapSchema } from '@microsoft/logic-apps-shared'; +import { Theme as ThemeType, SchemaType } from '@microsoft/logic-apps-shared'; import React, { useContext, useEffect, useMemo } from 'react'; import { useDispatch } from 'react-redux'; @@ -17,8 +17,8 @@ export interface DataMapDataProviderProps { xsltContent: string; mapDefinition?: MapDefinitionEntry; dataMapMetadata?: MapMetadata; - sourceSchema?: Schema; - targetSchema?: Schema; + sourceSchema?: DataMapSchema; + targetSchema?: DataMapSchema; availableSchemas?: string[]; customXsltPaths?: string[]; fetchedFunctions?: FunctionData[]; diff --git a/libs/data-mapper/src/lib/core/DataMapperDesignerProvider.tsx b/libs/data-mapper/src/lib/core/DataMapperDesignerProvider.tsx index 43ecff49ded..f0aaa463e77 100644 --- a/libs/data-mapper/src/lib/core/DataMapperDesignerProvider.tsx +++ b/libs/data-mapper/src/lib/core/DataMapperDesignerProvider.tsx @@ -10,7 +10,7 @@ import { FluentProvider, themeToTokensObject, webDarkTheme, webLightTheme } from import { PortalCompatProvider } from '@fluentui/react-portal-compat'; import { AppInsightsContext } from '@microsoft/applicationinsights-react-js'; import { IntlProvider } from '@microsoft/intl-logic-apps'; -import { Theme as ThemeType } from '@microsoft/utils-logic-apps'; +import { Theme as ThemeType } from '@microsoft/logic-apps-shared'; import React from 'react'; import { QueryClient, QueryClientProvider } from 'react-query'; import { Provider as ReduxProvider } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/core/queries/schema.ts b/libs/data-mapper/src/lib/core/queries/schema.ts index 59181635e50..8b208acf361 100644 --- a/libs/data-mapper/src/lib/core/queries/schema.ts +++ b/libs/data-mapper/src/lib/core/queries/schema.ts @@ -1,7 +1,7 @@ import { DataMapperApiServiceInstance } from '../services'; -import type { Schema } from '@microsoft/utils-logic-apps'; +import type { DataMapSchema } from '@microsoft/logic-apps-shared'; -export const getSelectedSchema = (fileName: string, schemaFilePath: string): Promise => { +export const getSelectedSchema = (fileName: string, schemaFilePath: string): Promise => { const service = DataMapperApiServiceInstance(); const response = service.getSchemaFile(fileName, schemaFilePath); diff --git a/libs/data-mapper/src/lib/core/services/dataMapperApiService/DataMapperApiService.ts b/libs/data-mapper/src/lib/core/services/dataMapperApiService/DataMapperApiService.ts index 6ee1ec31bdc..8cc6f1576ad 100644 --- a/libs/data-mapper/src/lib/core/services/dataMapperApiService/DataMapperApiService.ts +++ b/libs/data-mapper/src/lib/core/services/dataMapperApiService/DataMapperApiService.ts @@ -1,7 +1,7 @@ import type { GenerateXsltResponse, TestMapResponse } from '.'; import { dataMapperApiVersions } from '.'; import type { FunctionManifest } from '../../../models/Function'; -import type { Schema } from '@microsoft/utils-logic-apps'; +import type { DataMapSchema } from '@microsoft/logic-apps-shared'; type DmErrorResponse = { code: string; message: string }; @@ -79,7 +79,7 @@ export class DataMapperApiService { } // NOTE: From BPM repo, looks like two schema files with the same name will prefer the JSON one - async getSchemaFile(schemaFilename: string, schemaFilePath: string): Promise { + async getSchemaFile(schemaFilename: string, schemaFilePath: string): Promise { const headers = this.getHeaders(); const schemaFileUri = this.getSchemaFileUri(schemaFilename.substring(0, schemaFilename.lastIndexOf('.')), schemaFilePath); console.log(schemaFileUri); @@ -90,7 +90,7 @@ export class DataMapperApiService { throw new Error(`${response.status} - ${errorResponse.code}: ${errorResponse.message}`); } - const schemaFileResponse: Schema = await response.json(); + const schemaFileResponse: DataMapSchema = await response.json(); return schemaFileResponse; } diff --git a/libs/data-mapper/src/lib/core/services/dataMapperApiService/index.ts b/libs/data-mapper/src/lib/core/services/dataMapperApiService/index.ts index a046a3160ee..622cf334896 100644 --- a/libs/data-mapper/src/lib/core/services/dataMapperApiService/index.ts +++ b/libs/data-mapper/src/lib/core/services/dataMapperApiService/index.ts @@ -1,7 +1,7 @@ import type { FunctionManifest } from '../../../models/Function'; import type { DataMapperApiServiceOptions } from './DataMapperApiService'; import { DataMapperApiService } from './DataMapperApiService'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; let service: IDataMapperApiService; diff --git a/libs/data-mapper/src/lib/core/state/AppSlice.ts b/libs/data-mapper/src/lib/core/state/AppSlice.ts index e06774f440f..24e08c168db 100644 --- a/libs/data-mapper/src/lib/core/state/AppSlice.ts +++ b/libs/data-mapper/src/lib/core/state/AppSlice.ts @@ -1,4 +1,4 @@ -import { Theme as ThemeType } from '@microsoft/utils-logic-apps'; +import { Theme as ThemeType } from '@microsoft/logic-apps-shared'; import { createSlice } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; diff --git a/libs/data-mapper/src/lib/core/state/DataMapSlice.ts b/libs/data-mapper/src/lib/core/state/DataMapSlice.ts index 5bf5a27e854..cde2627da8a 100644 --- a/libs/data-mapper/src/lib/core/state/DataMapSlice.ts +++ b/libs/data-mapper/src/lib/core/state/DataMapSlice.ts @@ -54,8 +54,8 @@ import type { SchemaExtended, SchemaNodeDictionary, SchemaNodeExtended, -} from '@microsoft/utils-logic-apps'; -import { SchemaNodeProperty, SchemaType } from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; +import { SchemaNodeProperty, SchemaType } from '@microsoft/logic-apps-shared'; import type { PayloadAction } from '@reduxjs/toolkit'; import { createSlice } from '@reduxjs/toolkit'; diff --git a/libs/data-mapper/src/lib/core/state/PanelSlice.ts b/libs/data-mapper/src/lib/core/state/PanelSlice.ts index 9c5f739408e..8ab085666e2 100644 --- a/libs/data-mapper/src/lib/core/state/PanelSlice.ts +++ b/libs/data-mapper/src/lib/core/state/PanelSlice.ts @@ -1,4 +1,4 @@ -import { SchemaType } from '@microsoft/utils-logic-apps'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import { createSlice } from '@reduxjs/toolkit'; export const ConfigPanelView = { diff --git a/libs/data-mapper/src/lib/core/state/__test__/DataMapSlice.spec.ts b/libs/data-mapper/src/lib/core/state/__test__/DataMapSlice.spec.ts index 13b1f8fa94a..23f1ac52d62 100644 --- a/libs/data-mapper/src/lib/core/state/__test__/DataMapSlice.spec.ts +++ b/libs/data-mapper/src/lib/core/state/__test__/DataMapSlice.spec.ts @@ -18,8 +18,8 @@ import { deleteNodeFromConnections, deleteParentRepeatingConnections, } from '../DataMapSlice'; -import type { FunctionMetadata, FunctionPositionMetadata, Schema, SchemaExtended } from '@microsoft/utils-logic-apps'; -import { NormalizedDataType, SchemaNodeProperty, SchemaType } from '@microsoft/utils-logic-apps'; +import type { FunctionMetadata, FunctionPositionMetadata, Schema, SchemaExtended } from '@microsoft/logic-apps-shared'; +import { NormalizedDataType, SchemaNodeProperty, SchemaType } from '@microsoft/logic-apps-shared'; // NOTE: Functions with an unbounded input (like our concatFunction mock) will have two empty (undefined) values/fields by default describe('DataMapSlice', () => { diff --git a/libs/data-mapper/src/lib/exceptions/MapDefinitionExceptions.ts b/libs/data-mapper/src/lib/exceptions/MapDefinitionExceptions.ts index bbf70f50046..4913e7ca40d 100644 --- a/libs/data-mapper/src/lib/exceptions/MapDefinitionExceptions.ts +++ b/libs/data-mapper/src/lib/exceptions/MapDefinitionExceptions.ts @@ -1,4 +1,4 @@ -import { BaseException } from '@microsoft/utils-logic-apps'; +import { BaseException } from '@microsoft/logic-apps-shared'; export const InvalidFormatExceptionCode = { MISSING_MAPPINGS_PARAM: 'MissingMappingParam', diff --git a/libs/data-mapper/src/lib/mapDefinitions/MapDefinitionDeserializer.ts b/libs/data-mapper/src/lib/mapDefinitions/MapDefinitionDeserializer.ts index a1ec8f20ed9..7ab7636610c 100644 --- a/libs/data-mapper/src/lib/mapDefinitions/MapDefinitionDeserializer.ts +++ b/libs/data-mapper/src/lib/mapDefinitions/MapDefinitionDeserializer.ts @@ -24,8 +24,8 @@ import { isFunctionData, isKeyAnIndexValue } from '../utils/Function.Utils'; import { LogCategory, LogService } from '../utils/Logging.Utils'; import { createReactFlowFunctionKey } from '../utils/ReactFlow.Util'; import { findNodeForKey, flattenSchemaIntoDictionary } from '../utils/Schema.Utils'; -import type { MapDefinitionEntry, SchemaExtended, SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { isAGuid, SchemaType } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry, SchemaExtended, SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { isAGuid, SchemaType } from '@microsoft/logic-apps-shared'; export class MapDefinitionDeserializer { private readonly _mapDefinition: MapDefinitionEntry; diff --git a/libs/data-mapper/src/lib/mapDefinitions/MapDefinitionSerializer.ts b/libs/data-mapper/src/lib/mapDefinitions/MapDefinitionSerializer.ts index 3de7b8bd454..b5c0af2a8e8 100644 --- a/libs/data-mapper/src/lib/mapDefinitions/MapDefinitionSerializer.ts +++ b/libs/data-mapper/src/lib/mapDefinitions/MapDefinitionSerializer.ts @@ -17,8 +17,8 @@ import { import { formatDirectAccess, getIndexValueForCurrentConnection, isFunctionData } from '../utils/Function.Utils'; import { addTargetReactFlowPrefix } from '../utils/ReactFlow.Util'; import { isObjectType, isSchemaNodeExtended } from '../utils/Schema.Utils'; -import type { MapDefinitionEntry, PathItem, SchemaExtended, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { extend, SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry, PathItem, SchemaExtended, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { extend, SchemaNodeProperty } from '@microsoft/logic-apps-shared'; import yaml from 'js-yaml'; interface OutputPathItem { diff --git a/libs/data-mapper/src/lib/mapDefinitions/MapMetadataSerializer.ts b/libs/data-mapper/src/lib/mapDefinitions/MapMetadataSerializer.ts index 3d3709fbdcb..e3ec8699baf 100644 --- a/libs/data-mapper/src/lib/mapDefinitions/MapMetadataSerializer.ts +++ b/libs/data-mapper/src/lib/mapDefinitions/MapMetadataSerializer.ts @@ -1,6 +1,6 @@ import type { FunctionDictionary } from '../models'; import type { ConnectionDictionary } from '../models/Connection'; -import type { ConnectionAndOrder, FunctionMetadata, MapMetadata } from '@microsoft/utils-logic-apps'; +import type { ConnectionAndOrder, FunctionMetadata, MapMetadata } from '@microsoft/logic-apps-shared'; export const generateMapMetadata = (functionDictionary: FunctionDictionary, connections: ConnectionDictionary): MapMetadata => { const functionMetadata: FunctionMetadata[] = []; diff --git a/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionDeserializer.spec.ts b/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionDeserializer.spec.ts index 58b81dc3285..952287dce65 100644 --- a/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionDeserializer.spec.ts +++ b/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionDeserializer.spec.ts @@ -2,7 +2,7 @@ import { directAccessPseudoFunctionKey, functionMock, ifPseudoFunctionKey, index import type { Connection, ConnectionUnit } from '../../models/Connection'; import { convertSchemaToSchemaExtended } from '../../utils/Schema.Utils'; import { getLoopTargetNodeWithJson, MapDefinitionDeserializer } from '../MapDefinitionDeserializer'; -import type { MapDefinitionEntry, Schema, SchemaExtended, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry, Schema, SchemaExtended, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { comprehensiveSourceSchema, comprehensiveTargetSchema, diff --git a/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionE2e.spec.ts b/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionE2e.spec.ts index a5241081438..973a45caf3a 100644 --- a/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionE2e.spec.ts +++ b/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionE2e.spec.ts @@ -3,7 +3,7 @@ import { loadMapDefinition } from '../../utils/MapDefinition.Utils'; import { convertSchemaToSchemaExtended, flattenSchemaIntoSortArray } from '../../utils/Schema.Utils'; import { MapDefinitionDeserializer } from '../MapDefinitionDeserializer'; import { convertToMapDefinition } from '../MapDefinitionSerializer'; -import type { SchemaExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaExtended } from '@microsoft/logic-apps-shared'; import { comprehensiveMapDefinition, transcriptJsonMapDefinitionString } from '__mocks__/mapDefinitions'; import { comprehensiveSourceSchema, comprehensiveTargetSchema, sourceMockJsonSchema, targetMockJsonSchema } from '__mocks__/schemas'; diff --git a/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionSerializer.spec.ts b/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionSerializer.spec.ts index 5a39a892dcd..cfbe3904448 100644 --- a/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionSerializer.spec.ts +++ b/libs/data-mapper/src/lib/mapDefinitions/__test__/MapDefinitionSerializer.spec.ts @@ -6,8 +6,8 @@ import { applyConnectionValue } from '../../utils/Connection.Utils'; import { addReactFlowPrefix, createReactFlowFunctionKey } from '../../utils/ReactFlow.Util'; import { convertSchemaToSchemaExtended } from '../../utils/Schema.Utils'; import { generateMapDefinitionBody, generateMapDefinitionHeader } from '../MapDefinitionSerializer'; -import type { MapDefinitionEntry, Schema, SchemaExtended, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { SchemaFileFormat, SchemaType } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry, Schema, SchemaExtended, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { SchemaFileFormat, SchemaType } from '@microsoft/logic-apps-shared'; import { deepNestedSequenceAndObject, comprehensiveSourceSchema, diff --git a/libs/data-mapper/src/lib/mapDefinitions/__test__/MapMetadataSerializer.spec.ts b/libs/data-mapper/src/lib/mapDefinitions/__test__/MapMetadataSerializer.spec.ts index 92d8948ff55..a326134ec4c 100644 --- a/libs/data-mapper/src/lib/mapDefinitions/__test__/MapMetadataSerializer.spec.ts +++ b/libs/data-mapper/src/lib/mapDefinitions/__test__/MapMetadataSerializer.spec.ts @@ -1,6 +1,6 @@ import type { ConnectionDictionary } from '../../models/Connection'; import { convertConnectionShorthandToId, generateFunctionConnectionMetadata } from '../MapMetadataSerializer'; -import type { ConnectionAndOrder } from '@microsoft/utils-logic-apps'; +import type { ConnectionAndOrder } from '@microsoft/logic-apps-shared'; describe('mapMetadataSerializer', () => { describe('generateFunctionConnectionMetadata', () => { diff --git a/libs/data-mapper/src/lib/models/Connection.ts b/libs/data-mapper/src/lib/models/Connection.ts index c282c0021e6..2218ed3b562 100644 --- a/libs/data-mapper/src/lib/models/Connection.ts +++ b/libs/data-mapper/src/lib/models/Connection.ts @@ -1,5 +1,5 @@ import type { FunctionData } from './Function'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; export type ConnectionDictionary = { [key: string]: Connection }; // key = "{(target)||(source)}-{nodeId}" export type InputConnectionDictionary = { [inputNumber: string]: InputConnection[] }; diff --git a/libs/data-mapper/src/lib/models/Function.ts b/libs/data-mapper/src/lib/models/Function.ts index 81bea5e25c1..2ba30e92b7b 100644 --- a/libs/data-mapper/src/lib/models/Function.ts +++ b/libs/data-mapper/src/lib/models/Function.ts @@ -1,6 +1,6 @@ import { mapNodeParams } from '../constants/MapDefinitionConstants'; -import type { FunctionPositionMetadata, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { InputFormat as InputEntryType, NormalizedDataType } from '@microsoft/utils-logic-apps'; +import type { FunctionPositionMetadata, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { InputFormat as InputEntryType, NormalizedDataType } from '@microsoft/logic-apps-shared'; export interface FunctionManifest { version: string; diff --git a/libs/data-mapper/src/lib/ui/ReactFlowWrapper.tsx b/libs/data-mapper/src/lib/ui/ReactFlowWrapper.tsx index fc0b393b7fb..84a7c15cd0d 100644 --- a/libs/data-mapper/src/lib/ui/ReactFlowWrapper.tsx +++ b/libs/data-mapper/src/lib/ui/ReactFlowWrapper.tsx @@ -35,8 +35,8 @@ import { isFunctionData } from '../utils/Function.Utils'; import { useLayout } from '../utils/ReactFlow.Util'; import { tokens } from '@fluentui/react-components'; import { useBoolean } from '@fluentui/react-hooks'; -import type { FunctionPositionMetadata } from '@microsoft/utils-logic-apps'; -import { SchemaType } from '@microsoft/utils-logic-apps'; +import type { FunctionPositionMetadata } from '@microsoft/logic-apps-shared'; +import { SchemaType } from '@microsoft/logic-apps-shared'; import type { MouseEvent as ReactMouseEvent } from 'react'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/data-mapper/src/lib/utils/Connection.Utils.ts b/libs/data-mapper/src/lib/utils/Connection.Utils.ts index d1bef87cc5d..8b24d64778d 100644 --- a/libs/data-mapper/src/lib/utils/Connection.Utils.ts +++ b/libs/data-mapper/src/lib/utils/Connection.Utils.ts @@ -7,8 +7,8 @@ import { isFunctionData } from './Function.Utils'; import { LogCategory, LogService } from './Logging.Utils'; import { addReactFlowPrefix, addTargetReactFlowPrefix } from './ReactFlow.Util'; import { isSchemaNodeExtended } from './Schema.Utils'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { NormalizedDataType, SchemaNodeProperty, SchemaType } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { NormalizedDataType, SchemaNodeProperty, SchemaType } from '@microsoft/logic-apps-shared'; import type { WritableDraft } from 'immer/dist/internal'; /** diff --git a/libs/data-mapper/src/lib/utils/DataMap.Utils.ts b/libs/data-mapper/src/lib/utils/DataMap.Utils.ts index 376abcfc04a..f57b0133f1e 100644 --- a/libs/data-mapper/src/lib/utils/DataMap.Utils.ts +++ b/libs/data-mapper/src/lib/utils/DataMap.Utils.ts @@ -28,8 +28,8 @@ import { } from './Function.Utils'; import { addReactFlowPrefix, addSourceReactFlowPrefix } from './ReactFlow.Util'; import { findNodeForKey, isSchemaNodeExtended } from './Schema.Utils'; -import type { MapDefinitionEntry, SchemaExtended, SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { isAGuid, SchemaType } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry, SchemaExtended, SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { isAGuid, SchemaType } from '@microsoft/logic-apps-shared'; export type UnknownNode = SchemaNodeExtended | FunctionData | undefined; diff --git a/libs/data-mapper/src/lib/utils/Function.Utils.ts b/libs/data-mapper/src/lib/utils/Function.Utils.ts index 80ffcc33bfc..cc8aeaff685 100644 --- a/libs/data-mapper/src/lib/utils/Function.Utils.ts +++ b/libs/data-mapper/src/lib/utils/Function.Utils.ts @@ -16,7 +16,7 @@ import { getInputValues } from './DataMap.Utils'; import { LogCategory, LogService } from './Logging.Utils'; import { addTargetReactFlowPrefix } from './ReactFlow.Util'; import { isSchemaNodeExtended } from './Schema.Utils'; -import { isAGuid, InputFormat, type SchemaNodeDictionary, type SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import { isAGuid, InputFormat, type SchemaNodeDictionary, type SchemaNodeExtended } from '@microsoft/logic-apps-shared'; export const getFunctionBrandingForCategory = (functionCategory: FunctionCategory) => { switch (functionCategory) { diff --git a/libs/data-mapper/src/lib/utils/Icon.Utils.tsx b/libs/data-mapper/src/lib/utils/Icon.Utils.tsx index 2e49b64acd9..2aca289bd28 100644 --- a/libs/data-mapper/src/lib/utils/Icon.Utils.tsx +++ b/libs/data-mapper/src/lib/utils/Icon.Utils.tsx @@ -99,7 +99,7 @@ import { WarningFilled, Wrench20Regular, } from '@fluentui/react-icons'; -import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/logic-apps-shared'; import type { ReactElement } from 'react'; // Using Fluent v8 as it has option for fallback icon diff --git a/libs/data-mapper/src/lib/utils/Layout.Utils.ts b/libs/data-mapper/src/lib/utils/Layout.Utils.ts index 7b8d91068f2..e18db95a0d0 100644 --- a/libs/data-mapper/src/lib/utils/Layout.Utils.ts +++ b/libs/data-mapper/src/lib/utils/Layout.Utils.ts @@ -11,7 +11,7 @@ import { generateInputHandleId, isConnectionUnit } from './Connection.Utils'; import { isFunctionData } from './Function.Utils'; import { LogCategory, LogService } from './Logging.Utils'; import { addSourceReactFlowPrefix, addTargetReactFlowPrefix, functionPlaceholderPosition } from './ReactFlow.Util'; -import type { SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; const rootLayoutNodeId = 'root'; const LayoutContainer = { diff --git a/libs/data-mapper/src/lib/utils/MapChecker.Utils.ts b/libs/data-mapper/src/lib/utils/MapChecker.Utils.ts index ee1a7a75130..dccd3ae5496 100644 --- a/libs/data-mapper/src/lib/utils/MapChecker.Utils.ts +++ b/libs/data-mapper/src/lib/utils/MapChecker.Utils.ts @@ -12,8 +12,8 @@ import { } from './Connection.Utils'; import { isFunctionData } from './Function.Utils'; import { isObjectType, isSchemaNodeExtended } from './Schema.Utils'; -import type { SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { SchemaNodeProperty } from '@microsoft/logic-apps-shared'; import { defineMessages } from 'react-intl'; export const collectErrorsForMapChecker = (connections: ConnectionDictionary, _targetSchema: SchemaNodeDictionary): MapCheckerEntry[] => { diff --git a/libs/data-mapper/src/lib/utils/MapDefinition.Utils.ts b/libs/data-mapper/src/lib/utils/MapDefinition.Utils.ts index 5dc0500998b..cdfc42d8b94 100644 --- a/libs/data-mapper/src/lib/utils/MapDefinition.Utils.ts +++ b/libs/data-mapper/src/lib/utils/MapDefinition.Utils.ts @@ -1,4 +1,4 @@ -import type { MapDefinitionEntry } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry } from '@microsoft/logic-apps-shared'; import * as yaml from 'js-yaml'; /* diff --git a/libs/data-mapper/src/lib/utils/ReactFlow.Util.ts b/libs/data-mapper/src/lib/utils/ReactFlow.Util.ts index 97510c85a1c..d7897830bcb 100644 --- a/libs/data-mapper/src/lib/utils/ReactFlow.Util.ts +++ b/libs/data-mapper/src/lib/utils/ReactFlow.Util.ts @@ -16,8 +16,8 @@ import type { LayoutNode, RootLayoutNode } from './Layout.Utils'; import { applyCustomLayout, convertDataMapNodesToLayoutTree, convertWholeDataMapToLayoutTree } from './Layout.Utils'; import { LogCategory, LogService } from './Logging.Utils'; import { isLeafNode } from './Schema.Utils'; -import { guid, SchemaType } from '@microsoft/utils-logic-apps'; -import type { SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; +import { guid, SchemaType } from '@microsoft/logic-apps-shared'; +import type { SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; import { useEffect, useState } from 'react'; import type { Edge as ReactFlowEdge, Node as ReactFlowNode, XYPosition } from 'reactflow'; import { Position } from 'reactflow'; diff --git a/libs/data-mapper/src/lib/utils/Schema.Utils.ts b/libs/data-mapper/src/lib/utils/Schema.Utils.ts index a1fbab4de37..71c125c7272 100644 --- a/libs/data-mapper/src/lib/utils/Schema.Utils.ts +++ b/libs/data-mapper/src/lib/utils/Schema.Utils.ts @@ -6,11 +6,18 @@ import { sourcePrefix, targetPrefix } from '../constants/ReactFlowConstants'; import { getLoopTargetNodeWithJson } from '../mapDefinitions'; import type { FunctionData } from '../models/Function'; import { LogCategory, LogService } from './Logging.Utils'; -import type { PathItem, Schema, SchemaExtended, SchemaNode, SchemaNodeDictionary, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { NormalizedDataType, SchemaNodeProperty, SchemaType } from '@microsoft/utils-logic-apps'; +import type { + PathItem, + DataMapSchema, + SchemaExtended, + SchemaNode, + SchemaNodeDictionary, + SchemaNodeExtended, +} from '@microsoft/logic-apps-shared'; +import { NormalizedDataType, SchemaNodeProperty, SchemaType } from '@microsoft/logic-apps-shared'; import Fuse from 'fuse.js'; -export const convertSchemaToSchemaExtended = (schema: Schema): SchemaExtended => { +export const convertSchemaToSchemaExtended = (schema: DataMapSchema): SchemaExtended => { const extendedSchema: SchemaExtended = { ...schema, schemaTreeRoot: convertSchemaNodeToSchemaNodeExtended(schema.schemaTreeRoot, undefined, []), diff --git a/libs/data-mapper/src/lib/utils/__mocks__/indexedConnections.ts b/libs/data-mapper/src/lib/utils/__mocks__/indexedConnections.ts index ada90bd4e12..708efb844c7 100644 --- a/libs/data-mapper/src/lib/utils/__mocks__/indexedConnections.ts +++ b/libs/data-mapper/src/lib/utils/__mocks__/indexedConnections.ts @@ -1,6 +1,6 @@ import { FunctionCategory } from '../../models'; import type { ConnectionDictionary } from '../../models/Connection'; -import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/logic-apps-shared'; export const indexedConnections: ConnectionDictionary = { 'target-/ns0:Root/Looping/Person/Name': { diff --git a/libs/data-mapper/src/lib/utils/__mocks__/linkedLoopConnections.ts b/libs/data-mapper/src/lib/utils/__mocks__/linkedLoopConnections.ts index 588c968aad9..fc0dfa8f2d3 100644 --- a/libs/data-mapper/src/lib/utils/__mocks__/linkedLoopConnections.ts +++ b/libs/data-mapper/src/lib/utils/__mocks__/linkedLoopConnections.ts @@ -1,5 +1,5 @@ import type { Connection, ConnectionDictionary } from '../../models/Connection'; -import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/logic-apps-shared'; export const manyToManyConnectionSourceName = 'source-/ns0:SourceSchemaRoot/Looping/ManyToMany/Simple/SourceSimpleChild/SourceSimpleChildChild/SourceDirect'; diff --git a/libs/data-mapper/src/lib/utils/__mocks__/sourceSchemaNodes.ts b/libs/data-mapper/src/lib/utils/__mocks__/sourceSchemaNodes.ts index 4fddc7a1bd5..e81dc0813bf 100644 --- a/libs/data-mapper/src/lib/utils/__mocks__/sourceSchemaNodes.ts +++ b/libs/data-mapper/src/lib/utils/__mocks__/sourceSchemaNodes.ts @@ -1,5 +1,5 @@ -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/logic-apps-shared'; export const sourceSchemaNodes: SchemaNodeExtended[] = [ { diff --git a/libs/data-mapper/src/lib/utils/__test__/ConnectionUtils.spec.ts b/libs/data-mapper/src/lib/utils/__test__/ConnectionUtils.spec.ts index 1e150a503df..48d6d1a9594 100644 --- a/libs/data-mapper/src/lib/utils/__test__/ConnectionUtils.spec.ts +++ b/libs/data-mapper/src/lib/utils/__test__/ConnectionUtils.spec.ts @@ -18,8 +18,8 @@ import { } from '../Connection.Utils'; import { isSchemaNodeExtended } from '../Schema.Utils'; import { fullConnectionDictionaryForOneToManyLoop, fullMapForSimplifiedLoop } from '../__mocks__'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/logic-apps-shared'; const mockBoundedFunctionInputs: FunctionInput[] = [ { diff --git a/libs/data-mapper/src/lib/utils/__test__/DataMapUtils.spec.ts b/libs/data-mapper/src/lib/utils/__test__/DataMapUtils.spec.ts index 307b8d24a85..ca86b59ffae 100644 --- a/libs/data-mapper/src/lib/utils/__test__/DataMapUtils.spec.ts +++ b/libs/data-mapper/src/lib/utils/__test__/DataMapUtils.spec.ts @@ -26,8 +26,8 @@ import { manyToOneConnectionSourceName, manyToOneConnectionTargetName, } from '../__mocks__'; -import type { Schema, SchemaExtended, SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { NormalizedDataType, SchemaNodeProperty, SchemaType } from '@microsoft/utils-logic-apps'; +import type { Schema, SchemaExtended, SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { NormalizedDataType, SchemaNodeProperty, SchemaType } from '@microsoft/logic-apps-shared'; import { comprehensiveSourceSchema, comprehensiveTargetSchema, sourceMockSchema } from '__mocks__/schemas'; describe('utils/DataMap', () => { diff --git a/libs/data-mapper/src/lib/utils/__test__/FunctionUtils.spec.ts b/libs/data-mapper/src/lib/utils/__test__/FunctionUtils.spec.ts index 721dfc75e9d..38d69fc78e4 100644 --- a/libs/data-mapper/src/lib/utils/__test__/FunctionUtils.spec.ts +++ b/libs/data-mapper/src/lib/utils/__test__/FunctionUtils.spec.ts @@ -17,7 +17,7 @@ import { type Schema, type SchemaExtended, type SchemaNodeDictionary, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; describe('utils/Functions', () => { describe('getFunctionOutputValue', () => { diff --git a/libs/data-mapper/src/lib/utils/__test__/SchemaUtils.spec.ts b/libs/data-mapper/src/lib/utils/__test__/SchemaUtils.spec.ts index a64a6f02599..4ea6eceaaa6 100644 --- a/libs/data-mapper/src/lib/utils/__test__/SchemaUtils.spec.ts +++ b/libs/data-mapper/src/lib/utils/__test__/SchemaUtils.spec.ts @@ -1,5 +1,5 @@ import { convertSchemaToSchemaExtended, findNodeForKey, getFileNameAndPath, parsePropertiesIntoNodeProperties } from '../Schema.Utils'; -import { SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import { SchemaNodeProperty } from '@microsoft/logic-apps-shared'; import { targetMockSchema } from '__mocks__/schemas'; describe('utils/Schema', () => { diff --git a/libs/data-mapper/src/lib/utils/__test__/TypeCheckUtils.spec.ts b/libs/data-mapper/src/lib/utils/__test__/TypeCheckUtils.spec.ts index d8a05b87f68..8459830d90b 100644 --- a/libs/data-mapper/src/lib/utils/__test__/TypeCheckUtils.spec.ts +++ b/libs/data-mapper/src/lib/utils/__test__/TypeCheckUtils.spec.ts @@ -4,8 +4,8 @@ import { FunctionCategory } from '../../models/Function'; import { isConnectionUnit, isCustomValue } from '../Connection.Utils'; import { isFunctionData } from '../Function.Utils'; import { isSchemaNodeExtended } from '../Schema.Utils'; -import type { SchemaNodeExtended } from '@microsoft/utils-logic-apps'; -import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/utils-logic-apps'; +import type { SchemaNodeExtended } from '@microsoft/logic-apps-shared'; +import { NormalizedDataType, SchemaNodeProperty } from '@microsoft/logic-apps-shared'; describe('utils/type-checker-utils', () => { const mockSchemaNodeExtended: SchemaNodeExtended = { diff --git a/libs/designer-ui/src/lib/__test__/helper.spec.ts b/libs/designer-ui/src/lib/__test__/helper.spec.ts index 3171cf784b2..99e0c6aa08b 100644 --- a/libs/designer-ui/src/lib/__test__/helper.spec.ts +++ b/libs/designer-ui/src/lib/__test__/helper.spec.ts @@ -1,5 +1,5 @@ import { getDragStartHandlerWhenDisabled } from '../helper'; -import { isEdge, isFirefox } from '@microsoft/utils-logic-apps'; +import { isEdge, isFirefox } from '@microsoft/logic-apps-shared'; describe('lib/helper', () => { afterEach(() => { diff --git a/libs/designer-ui/src/lib/about/index.tsx b/libs/designer-ui/src/lib/about/index.tsx index ca5833f52d2..5c3685ad01c 100644 --- a/libs/designer-ui/src/lib/about/index.tsx +++ b/libs/designer-ui/src/lib/about/index.tsx @@ -3,7 +3,7 @@ import { DocumentationItem } from '../recommendation/documentationItem'; import { Spinner, SpinnerSize } from '@fluentui/react'; import type { ILabelStyles } from '@fluentui/react/lib/Label'; import { Label } from '@fluentui/react/lib/Label'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; const labelStyles: Partial = { diff --git a/libs/designer-ui/src/lib/arrayeditor/expandedcomplexarray.tsx b/libs/designer-ui/src/lib/arrayeditor/expandedcomplexarray.tsx index 54be028b922..66bb460bfb0 100644 --- a/libs/designer-ui/src/lib/arrayeditor/expandedcomplexarray.tsx +++ b/libs/designer-ui/src/lib/arrayeditor/expandedcomplexarray.tsx @@ -6,7 +6,7 @@ import { ItemMenuButton } from './expandedsimplearray'; import { hideComplexArray, type ItemSchemaItemProps } from './util/util'; import type { IIconProps } from '@fluentui/react'; import { Label, css, DefaultButton } from '@fluentui/react'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; const addItemButtonIconProps: IIconProps = { diff --git a/libs/designer-ui/src/lib/arrayeditor/expandedsimplearray.tsx b/libs/designer-ui/src/lib/arrayeditor/expandedsimplearray.tsx index de87563393a..48f662cde1c 100644 --- a/libs/designer-ui/src/lib/arrayeditor/expandedsimplearray.tsx +++ b/libs/designer-ui/src/lib/arrayeditor/expandedsimplearray.tsx @@ -6,7 +6,7 @@ import { Label } from '../label'; import type { LabelProps } from '../label'; import type { IContextualMenuProps, IIconProps, IIconStyles } from '@fluentui/react'; import { IconButton, TooltipHost, DefaultButton } from '@fluentui/react'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; const addItemButtonIconProps: IIconProps = { diff --git a/libs/designer-ui/src/lib/arrayeditor/util/serializecollapsedarray.ts b/libs/designer-ui/src/lib/arrayeditor/util/serializecollapsedarray.ts index a0a927bb9ac..60cb3570fb3 100644 --- a/libs/designer-ui/src/lib/arrayeditor/util/serializecollapsedarray.ts +++ b/libs/designer-ui/src/lib/arrayeditor/util/serializecollapsedarray.ts @@ -6,7 +6,7 @@ import { convertStringToSegments } from '../../editor/base/utils/editorToSegment import { getChildrenNodes, insertQutationForStringType } from '../../editor/base/utils/helper'; import { convertSegmentsToString } from '../../editor/base/utils/parsesegments'; import { convertComplexItemsToArray, validationAndSerializeComplexArray, validationAndSerializeSimpleArray } from './util'; -import { guid, prettifyJsonString } from '@microsoft/utils-logic-apps'; +import { guid, prettifyJsonString } from '@microsoft/logic-apps-shared'; import type { LexicalEditor } from 'lexical'; import { $getRoot } from 'lexical'; diff --git a/libs/designer-ui/src/lib/arrayeditor/util/util.ts b/libs/designer-ui/src/lib/arrayeditor/util/util.ts index 1018ac298b5..d300e86da7d 100644 --- a/libs/designer-ui/src/lib/arrayeditor/util/util.ts +++ b/libs/designer-ui/src/lib/arrayeditor/util/util.ts @@ -4,7 +4,7 @@ import type { ValueSegment } from '../../editor'; import type { CastHandler } from '../../editor/base'; import { convertStringToSegments } from '../../editor/base/utils/editorToSegment'; import { convertSegmentsToString } from '../../editor/base/utils/parsesegments'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; export interface ItemSchemaItemProps { key: string; diff --git a/libs/designer-ui/src/lib/authentication/MSIAuth/MSIAuth.tsx b/libs/designer-ui/src/lib/authentication/MSIAuth/MSIAuth.tsx index 6b0d5966fdc..1096da6855d 100644 --- a/libs/designer-ui/src/lib/authentication/MSIAuth/MSIAuth.tsx +++ b/libs/designer-ui/src/lib/authentication/MSIAuth/MSIAuth.tsx @@ -8,8 +8,8 @@ import { AUTHENTICATION_PROPERTIES, containsUserAssignedIdentities } from '../ut import { MSIAuthenticationDefault } from './MSIAuthDefault'; import type { IDropdownOption } from '@fluentui/react'; import { isTemplateExpression } from '@microsoft/logic-apps-shared'; -import type { ManagedIdentity } from '@microsoft/utils-logic-apps'; -import { ResourceIdentityType, equals } from '@microsoft/utils-logic-apps'; +import type { ManagedIdentity } from '@microsoft/logic-apps-shared'; +import { ResourceIdentityType, equals } from '@microsoft/logic-apps-shared'; import type { Dispatch, SetStateAction } from 'react'; import { useState } from 'react'; import type { IntlShape } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/authentication/MSIAuth/MSIAuthDefault.tsx b/libs/designer-ui/src/lib/authentication/MSIAuth/MSIAuthDefault.tsx index 9134e4c3446..f4870e011f8 100644 --- a/libs/designer-ui/src/lib/authentication/MSIAuth/MSIAuthDefault.tsx +++ b/libs/designer-ui/src/lib/authentication/MSIAuth/MSIAuthDefault.tsx @@ -6,7 +6,7 @@ import { AuthenticationDropdown } from '../AuthenticationDropdown'; import { AuthenticationProperty } from '../AuthenticationProperty'; import { AUTHENTICATION_PROPERTIES } from '../util'; import type { IDropdownOption } from '@fluentui/react'; -import { ResourceIdentityType } from '@microsoft/utils-logic-apps'; +import { ResourceIdentityType } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; interface MSIAuthenticationDefaultProps { diff --git a/libs/designer-ui/src/lib/authentication/index.tsx b/libs/designer-ui/src/lib/authentication/index.tsx index 4d74393db60..1ed1fda250e 100644 --- a/libs/designer-ui/src/lib/authentication/index.tsx +++ b/libs/designer-ui/src/lib/authentication/index.tsx @@ -13,8 +13,8 @@ import { RawAuthentication } from './RawAuth'; import { parseAuthEditor } from './util'; import type { IDropdownOption } from '@fluentui/react/lib/Dropdown'; import { getIntl } from '@microsoft/intl-logic-apps'; -import type { ManagedIdentity } from '@microsoft/utils-logic-apps'; -import { AssertionErrorCode, AssertionException, format } from '@microsoft/utils-logic-apps'; +import type { ManagedIdentity } from '@microsoft/logic-apps-shared'; +import { AssertionErrorCode, AssertionException, format } from '@microsoft/logic-apps-shared'; import { useUpdateEffect } from '@react-hookz/web'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/authentication/util.ts b/libs/designer-ui/src/lib/authentication/util.ts index 59c9b143863..1d3c0ce4560 100644 --- a/libs/designer-ui/src/lib/authentication/util.ts +++ b/libs/designer-ui/src/lib/authentication/util.ts @@ -7,8 +7,8 @@ import { convertStringToSegments } from '../editor/base/utils/editorToSegment'; import { convertKeyValueItemToSegments } from '../editor/base/utils/keyvalueitem'; import { AuthenticationOAuthType } from './AADOAuth/AADOAuth'; import { getIntl } from '@microsoft/intl-logic-apps'; -import type { ManagedIdentity } from '@microsoft/utils-logic-apps'; -import { guid, equals, ResourceIdentityType } from '@microsoft/utils-logic-apps'; +import type { ManagedIdentity } from '@microsoft/logic-apps-shared'; +import { guid, equals, ResourceIdentityType } from '@microsoft/logic-apps-shared'; export interface AuthProperty { displayName: string; diff --git a/libs/designer-ui/src/lib/azureResourcePicker/index.tsx b/libs/designer-ui/src/lib/azureResourcePicker/index.tsx index e9dc2166343..6a67878bec5 100644 --- a/libs/designer-ui/src/lib/azureResourcePicker/index.tsx +++ b/libs/designer-ui/src/lib/azureResourcePicker/index.tsx @@ -1,6 +1,6 @@ import { ChoiceGroup, css, Label, List, MessageBar, MessageBarType, SearchBox, Text } from '@fluentui/react'; import { Spinner } from '@fluentui/react-components'; -import { labelCase } from '@microsoft/utils-logic-apps'; +import { labelCase } from '@microsoft/logic-apps-shared'; import Fuse from 'fuse.js'; import { useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/card/hooks.ts b/libs/designer-ui/src/lib/card/hooks.ts index dae6d629cda..0f669ebc91c 100644 --- a/libs/designer-ui/src/lib/card/hooks.ts +++ b/libs/designer-ui/src/lib/card/hooks.ts @@ -1,5 +1,5 @@ import { isDeleteKey, isEnterKey, isSpaceKey } from '../utils'; -import { equals } from '@microsoft/utils-logic-apps'; +import { equals } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; export const useCardContextMenu = () => { diff --git a/libs/designer-ui/src/lib/card/index.tsx b/libs/designer-ui/src/lib/card/index.tsx index e49a9740d52..75fbe9c5cb1 100644 --- a/libs/designer-ui/src/lib/card/index.tsx +++ b/libs/designer-ui/src/lib/card/index.tsx @@ -10,7 +10,7 @@ import { getCardStyle } from './utils'; import type { ISpinnerStyles, MessageBarType } from '@fluentui/react'; import { Icon, css } from '@fluentui/react'; import { Spinner } from '@fluentui/react-components'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; import { useEffect, useMemo, useRef } from 'react'; import type { ConnectDragPreview, ConnectDragSource } from 'react-dnd'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/card/subgraphCard/index.tsx b/libs/designer-ui/src/lib/card/subgraphCard/index.tsx index 0d1631d7a10..cb77b48c251 100644 --- a/libs/designer-ui/src/lib/card/subgraphCard/index.tsx +++ b/libs/designer-ui/src/lib/card/subgraphCard/index.tsx @@ -3,8 +3,8 @@ import NodeCollapseToggle from '../../nodeCollapseToggle'; import { CardContextMenu } from '../cardcontextmenu'; import { useCardContextMenu, useCardKeyboardInteraction } from '../hooks'; import { css } from '@fluentui/react'; -import type { SubgraphType } from '@microsoft/utils-logic-apps'; -import { SUBGRAPH_TYPES } from '@microsoft/utils-logic-apps'; +import type { SubgraphType } from '@microsoft/logic-apps-shared'; +import { SUBGRAPH_TYPES } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; interface SubgraphCardProps { diff --git a/libs/designer-ui/src/lib/card/utils.ts b/libs/designer-ui/src/lib/card/utils.ts index da7e1f3927f..49f6881661b 100644 --- a/libs/designer-ui/src/lib/card/utils.ts +++ b/libs/designer-ui/src/lib/card/utils.ts @@ -1,6 +1,6 @@ import Constants from '../constants'; import type { IButtonStyles } from '@fluentui/react'; -import { hexToRgbA } from '@microsoft/utils-logic-apps'; +import { hexToRgbA } from '@microsoft/logic-apps-shared'; export function getCardStyle(brandColor?: string): React.CSSProperties { return { diff --git a/libs/designer-ui/src/lib/chatbot/components/chatSuggestion.tsx b/libs/designer-ui/src/lib/chatbot/components/chatSuggestion.tsx index 5e4569e5337..11f49296471 100644 --- a/libs/designer-ui/src/lib/chatbot/components/chatSuggestion.tsx +++ b/libs/designer-ui/src/lib/chatbot/components/chatSuggestion.tsx @@ -1,6 +1,6 @@ import Constants from '../constants'; import { ActionButton, FontSizes } from '@fluentui/react'; -import { hexToRgbA } from '@microsoft/utils-logic-apps'; +import { hexToRgbA } from '@microsoft/logic-apps-shared'; import * as React from 'react'; export interface IChatSuggestionGroupProps { diff --git a/libs/designer-ui/src/lib/code/util.ts b/libs/designer-ui/src/lib/code/util.ts index 925aad3bf1b..79ec830447c 100644 --- a/libs/designer-ui/src/lib/code/util.ts +++ b/libs/designer-ui/src/lib/code/util.ts @@ -3,7 +3,7 @@ import type { Token, ValueSegment } from '../editor'; import { TokenType } from '../editor'; import { getIntl } from '@microsoft/intl-logic-apps'; import { decodePropertySegment, OutputKeys } from '@microsoft/logic-apps-shared'; -import { ArgumentException, endsWith, equals, prettifyJsonString, UnsupportedException } from '@microsoft/utils-logic-apps'; +import { ArgumentException, endsWith, equals, prettifyJsonString, UnsupportedException } from '@microsoft/logic-apps-shared'; const OperationCategory = { Actions: 'actions', diff --git a/libs/designer-ui/src/lib/combobox/index.tsx b/libs/designer-ui/src/lib/combobox/index.tsx index 5921111b79c..6644aca0669 100644 --- a/libs/designer-ui/src/lib/combobox/index.tsx +++ b/libs/designer-ui/src/lib/combobox/index.tsx @@ -8,7 +8,7 @@ import { SelectableOptionMenuItemType, ComboBox } from '@fluentui/react'; import { Button, Spinner, Tooltip } from '@fluentui/react-components'; import { bundleIcon, Dismiss24Filled, Dismiss24Regular } from '@fluentui/react-icons'; import { getIntl } from '@microsoft/intl-logic-apps'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useRef, useState, useCallback, useMemo, useEffect } from 'react'; import type { FormEvent } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/connectorsummarycard/index.tsx b/libs/designer-ui/src/lib/connectorsummarycard/index.tsx index cdb33df235d..7f40f16fb37 100644 --- a/libs/designer-ui/src/lib/connectorsummarycard/index.tsx +++ b/libs/designer-ui/src/lib/connectorsummarycard/index.tsx @@ -1,6 +1,6 @@ import { InfoDot } from '../infoDot'; import { Text, css } from '@fluentui/react'; -import { fallbackConnectorIconUrl, isBuiltInConnector } from '@microsoft/utils-logic-apps'; +import { fallbackConnectorIconUrl, isBuiltInConnector } from '@microsoft/logic-apps-shared'; import { useCallback } from 'react'; export interface ConnectorSummaryCardProps { diff --git a/libs/designer-ui/src/lib/dictionary/expandeddictionary.tsx b/libs/designer-ui/src/lib/dictionary/expandeddictionary.tsx index 0eb9d4cbd6a..3e6c54ce096 100644 --- a/libs/designer-ui/src/lib/dictionary/expandeddictionary.tsx +++ b/libs/designer-ui/src/lib/dictionary/expandeddictionary.tsx @@ -4,7 +4,7 @@ import type { GetTokenPickerHandler } from '../editor/base'; import { isEmptySegments } from '../editor/base/utils/parsesegments'; import { StringEditor } from '../editor/string'; import { DictionaryDeleteButton } from './expandeddictionarydelete'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useRef } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/dictionary/expandeddictionarydelete.tsx b/libs/designer-ui/src/lib/dictionary/expandeddictionarydelete.tsx index 070c09ff18d..3211c3b21d4 100644 --- a/libs/designer-ui/src/lib/dictionary/expandeddictionarydelete.tsx +++ b/libs/designer-ui/src/lib/dictionary/expandeddictionarydelete.tsx @@ -1,7 +1,7 @@ import type { DictionaryEditorItemProps } from '.'; import type { IIconProps } from '@fluentui/react'; import { css, IconButton, TooltipHost } from '@fluentui/react'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; const deleteButtonIconProps: IIconProps = { diff --git a/libs/designer-ui/src/lib/dictionary/index.tsx b/libs/designer-ui/src/lib/dictionary/index.tsx index dbfe316e01a..fcc4528d791 100644 --- a/libs/designer-ui/src/lib/dictionary/index.tsx +++ b/libs/designer-ui/src/lib/dictionary/index.tsx @@ -5,7 +5,7 @@ import type { BaseEditorProps } from '../editor/base'; import { convertKeyValueItemToSegments } from '../editor/base/utils/keyvalueitem'; import { CollapsedDictionary } from './collapsedDictionary'; import { ExpandedDictionary } from './expandeddictionary'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/dictionary/plugins/CollapsedDictionaryValidation.tsx b/libs/designer-ui/src/lib/dictionary/plugins/CollapsedDictionaryValidation.tsx index c5d56fddd81..c2fe49d6e89 100644 --- a/libs/designer-ui/src/lib/dictionary/plugins/CollapsedDictionaryValidation.tsx +++ b/libs/designer-ui/src/lib/dictionary/plugins/CollapsedDictionaryValidation.tsx @@ -6,7 +6,7 @@ import { getChildrenNodes } from '../../editor/base/utils/helper'; import { serializeDictionary } from '../util/serializecollapseddictionary'; import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import type { EditorState } from 'lexical'; import { $getRoot } from 'lexical'; import { useEffect } from 'react'; diff --git a/libs/designer-ui/src/lib/dictionary/util/serializecollapseddictionary.ts b/libs/designer-ui/src/lib/dictionary/util/serializecollapseddictionary.ts index d8731568a1e..e1da3635224 100644 --- a/libs/designer-ui/src/lib/dictionary/util/serializecollapseddictionary.ts +++ b/libs/designer-ui/src/lib/dictionary/util/serializecollapseddictionary.ts @@ -3,7 +3,7 @@ import constants from '../../constants'; import type { ValueSegment } from '../../editor'; import { convertStringToSegments } from '../../editor/base/utils/editorToSegment'; import { getChildrenNodesWithTokenInterpolation, removeQuotes } from '../../editor/base/utils/helper'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import type { LexicalEditor } from 'lexical'; import { $getRoot } from 'lexical'; diff --git a/libs/designer-ui/src/lib/documentationlinkitem/index.tsx b/libs/designer-ui/src/lib/documentationlinkitem/index.tsx index 22810f12971..5c74d0199e7 100644 --- a/libs/designer-ui/src/lib/documentationlinkitem/index.tsx +++ b/libs/designer-ui/src/lib/documentationlinkitem/index.tsx @@ -1,4 +1,4 @@ -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; export interface DocumentationLinkItemProps extends OpenAPIV2.ExternalDocumentationObject { onClick?(): void; diff --git a/libs/designer-ui/src/lib/dropdown/index.tsx b/libs/designer-ui/src/lib/dropdown/index.tsx index 444054ae8f6..ba0149d17ec 100644 --- a/libs/designer-ui/src/lib/dropdown/index.tsx +++ b/libs/designer-ui/src/lib/dropdown/index.tsx @@ -3,7 +3,7 @@ import { ValueSegmentType } from '../editor'; import type { ChangeHandler } from '../editor/base'; import type { IDropdownOption, IDropdownStyles } from '@fluentui/react'; import { SelectableOptionMenuItemType, Dropdown } from '@fluentui/react'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import type { FormEvent } from 'react'; import { useMemo, useState } from 'react'; diff --git a/libs/designer-ui/src/lib/dynamicallyaddedparameter/helper.ts b/libs/designer-ui/src/lib/dynamicallyaddedparameter/helper.ts index aa3007a8a2b..f1cecdb4c35 100644 --- a/libs/designer-ui/src/lib/dynamicallyaddedparameter/helper.ts +++ b/libs/designer-ui/src/lib/dynamicallyaddedparameter/helper.ts @@ -1,7 +1,7 @@ import type { DynamicallyAddedParameterTypeType } from '../dynamicallyaddedparameter'; import { DynamicallyAddedParameterType } from '../dynamicallyaddedparameter'; import { getIntl } from '@microsoft/intl-logic-apps'; -import { generateUniqueName } from '@microsoft/utils-logic-apps'; +import { generateUniqueName } from '@microsoft/logic-apps-shared'; export type DynamicallyAddedParameterIcon = string; diff --git a/libs/designer-ui/src/lib/editor/base/plugins/FloatingLinkEditor.tsx b/libs/designer-ui/src/lib/editor/base/plugins/FloatingLinkEditor.tsx index 7bb445b88c4..1bc5e50de4e 100644 --- a/libs/designer-ui/src/lib/editor/base/plugins/FloatingLinkEditor.tsx +++ b/libs/designer-ui/src/lib/editor/base/plugins/FloatingLinkEditor.tsx @@ -4,7 +4,7 @@ import type { IButtonStyles } from '@fluentui/react'; import { $isAutoLinkNode, $isLinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link'; import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; import { $findMatchingParent, mergeRegister } from '@lexical/utils'; -import { useOutsideClick } from '@microsoft/utils-logic-apps'; +import { useOutsideClick } from '@microsoft/logic-apps-shared'; import type { GridSelection, LexicalEditor, NodeSelection, RangeSelection } from 'lexical'; import { $getSelection, diff --git a/libs/designer-ui/src/lib/editor/base/utils/editorToSegment.ts b/libs/designer-ui/src/lib/editor/base/utils/editorToSegment.ts index 2c7bf582932..625f1d61247 100644 --- a/libs/designer-ui/src/lib/editor/base/utils/editorToSegment.ts +++ b/libs/designer-ui/src/lib/editor/base/utils/editorToSegment.ts @@ -2,7 +2,7 @@ import type { ValueSegment } from '../../models/parameter'; import { ValueSegmentType } from '../../models/parameter'; import { $isTokenNode } from '../nodes/tokenNode'; import type { SegmentParserOptions } from './parsesegments'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import type { EditorState, ElementNode } from 'lexical'; import { $getNodeByKey, $getRoot, $isElementNode, $isLineBreakNode, $isTextNode } from 'lexical'; diff --git a/libs/designer-ui/src/lib/editor/base/utils/helper.ts b/libs/designer-ui/src/lib/editor/base/utils/helper.ts index a46d0840756..da36d488870 100644 --- a/libs/designer-ui/src/lib/editor/base/utils/helper.ts +++ b/libs/designer-ui/src/lib/editor/base/utils/helper.ts @@ -2,7 +2,7 @@ import constants from '../../../constants'; import type { ValueSegment, TokenType } from '../../models/parameter'; import { ValueSegmentType } from '../../models/parameter'; import { $isTokenNode } from '../nodes/tokenNode'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import type { ElementNode } from 'lexical'; import { $getNodeByKey, $isElementNode, $isLineBreakNode, $isTextNode } from 'lexical'; diff --git a/libs/designer-ui/src/lib/editor/base/utils/keyvalueitem.ts b/libs/designer-ui/src/lib/editor/base/utils/keyvalueitem.ts index 8db898c1fa8..acd73056f13 100644 --- a/libs/designer-ui/src/lib/editor/base/utils/keyvalueitem.ts +++ b/libs/designer-ui/src/lib/editor/base/utils/keyvalueitem.ts @@ -4,7 +4,7 @@ import { ValueSegmentType, type ValueSegment } from '../../models/parameter'; import { insertQutationForStringType } from './helper'; import { convertSegmentsToString } from './parsesegments'; import { isNumber } from '@microsoft/logic-apps-shared'; -import { guid, isBoolean } from '@microsoft/utils-logic-apps'; +import { guid, isBoolean } from '@microsoft/logic-apps-shared'; export interface KeyValueItem { id: string; diff --git a/libs/designer-ui/src/lib/editor/base/utils/parsesegments.ts b/libs/designer-ui/src/lib/editor/base/utils/parsesegments.ts index cde41e0931d..6577664dfb6 100644 --- a/libs/designer-ui/src/lib/editor/base/utils/parsesegments.ts +++ b/libs/designer-ui/src/lib/editor/base/utils/parsesegments.ts @@ -22,7 +22,7 @@ import type { HeadingNode } from '@lexical/rich-text'; import { $isHeadingNode } from '@lexical/rich-text'; import type { Expression } from '@microsoft/logic-apps-shared'; import { ExpressionParser } from '@microsoft/logic-apps-shared'; -import { wrapTokenValue } from '@microsoft/utils-logic-apps'; +import { wrapTokenValue } from '@microsoft/logic-apps-shared'; import type { LexicalNode, ParagraphNode, RootNode } from 'lexical'; import { $createParagraphNode, diff --git a/libs/designer-ui/src/lib/editor/models/parameter.ts b/libs/designer-ui/src/lib/editor/models/parameter.ts index dc8a29ace85..2dfa21851ec 100644 --- a/libs/designer-ui/src/lib/editor/models/parameter.ts +++ b/libs/designer-ui/src/lib/editor/models/parameter.ts @@ -4,7 +4,7 @@ import type { ParameterDeserializationOptions, ParameterSerializationOptions, } from '@microsoft/logic-apps-shared'; -import type { Exception, OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { Exception, OpenAPIV2 } from '@microsoft/logic-apps-shared'; export interface ParameterInfo { alternativeKey?: string; diff --git a/libs/designer-ui/src/lib/editor/shared/testtokensegment.ts b/libs/designer-ui/src/lib/editor/shared/testtokensegment.ts index 485199b86ab..4f1b4ec5c1e 100644 --- a/libs/designer-ui/src/lib/editor/shared/testtokensegment.ts +++ b/libs/designer-ui/src/lib/editor/shared/testtokensegment.ts @@ -1,7 +1,7 @@ import type { OutputToken } from '../../tokenpicker'; import type { ValueSegment } from '../models/parameter'; import { TokenType, ValueSegmentType } from '../models/parameter'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; export const testTokenSegment: ValueSegment = { id: guid(), diff --git a/libs/designer-ui/src/lib/errorsPanel/nodeErrorCard.tsx b/libs/designer-ui/src/lib/errorsPanel/nodeErrorCard.tsx index 99c9c1be82b..c1227616cd9 100644 --- a/libs/designer-ui/src/lib/errorsPanel/nodeErrorCard.tsx +++ b/libs/designer-ui/src/lib/errorsPanel/nodeErrorCard.tsx @@ -2,7 +2,7 @@ import { isEnterKey, isSpaceKey } from '../utils'; import type { NodeMessage } from './errorsPanel.types'; import { MessageLevel } from './errorsPanel.types'; import { Text, Icon } from '@fluentui/react'; -import { fallbackConnectorIconUrl } from '@microsoft/utils-logic-apps'; +import { fallbackConnectorIconUrl } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; interface NodeErrorCardProps { diff --git a/libs/designer-ui/src/lib/expressioneditor/index.tsx b/libs/designer-ui/src/lib/expressioneditor/index.tsx index d4028d7abc5..84df8e2f319 100644 --- a/libs/designer-ui/src/lib/expressioneditor/index.tsx +++ b/libs/designer-ui/src/lib/expressioneditor/index.tsx @@ -1,6 +1,6 @@ import { MonacoEditor, EditorLanguage } from '../editor/monaco'; import type { EventHandler } from '../eventhandler'; -import { clamp } from '@microsoft/utils-logic-apps'; +import { clamp } from '@microsoft/logic-apps-shared'; import type { editor } from 'monaco-editor'; import type { MutableRefObject } from 'react'; import { useState, useEffect } from 'react'; diff --git a/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenubase/index.tsx b/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenubase/index.tsx index a13d50f0af7..3b9197d0139 100644 --- a/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenubase/index.tsx +++ b/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenubase/index.tsx @@ -2,7 +2,7 @@ import type { DynamicallyAddedParameterTypeType } from '../../dynamicallyaddedpa import { getMenuItemsForDynamicAddedParameters } from './helper'; import { Icon, KeyCodes } from '@fluentui/react'; import { useBoolean } from '@fluentui/react-hooks'; -import { ValidationErrorCode, ValidationException } from '@microsoft/utils-logic-apps'; +import { ValidationErrorCode, ValidationException } from '@microsoft/logic-apps-shared'; import type { PropsWithChildren } from 'react'; import React from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuinputs/helper.ts b/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuinputs/helper.ts index a7faf34ca71..48c4a1176bc 100644 --- a/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuinputs/helper.ts +++ b/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuinputs/helper.ts @@ -9,8 +9,8 @@ import { } from '../../dynamicallyaddedparameter/helper'; import type { ValueSegment } from '../../editor'; import { ValueSegmentType } from '../../editor'; -import type { Schema } from '@microsoft/logic-apps-shared'; -import { guid } from '@microsoft/utils-logic-apps'; +import type { OpenApiSchema } from '@microsoft/logic-apps-shared'; +import { guid } from '@microsoft/logic-apps-shared'; type PartialDynamicallyAddedParameterInputsModel = Pick< DynamicallyAddedParameterInputsModel, @@ -109,7 +109,7 @@ export function serialize(models: DynamicallyAddedParameterInputsModel[], isRequ return { ...resultPropertiesObj, [schemaKey]: propertyValue }; }, {}); - let rootObject: Schema; + let rootObject: OpenApiSchema; rootObject = { type: 'object', @@ -140,7 +140,7 @@ export function serialize(models: DynamicallyAddedParameterInputsModel[], isRequ } export function getEmptySchemaValueSegmentForInitialization(useStaticInputs: boolean, isRequestApiConnectionTrigger = false) { - let rootObject: Schema; + let rootObject: OpenApiSchema; rootObject = { type: 'object', diff --git a/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuinputs/index.tsx b/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuinputs/index.tsx index 7b7b27fb4fb..fe25838e462 100644 --- a/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuinputs/index.tsx +++ b/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuinputs/index.tsx @@ -7,7 +7,7 @@ import type { FloatingActionMenuItem } from '../floatingactionmenubase'; import { FloatingActionMenuBase } from '../floatingactionmenubase'; import { createDynamicallyAddedParameterProperties, deserialize, getEmptySchemaValueSegmentForInitialization, serialize } from './helper'; import { TextField } from '@fluentui/react'; -import { safeSetObjectPropertyValue } from '@microsoft/utils-logic-apps'; +import { safeSetObjectPropertyValue } from '@microsoft/logic-apps-shared'; import React from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuoutputs/index.tsx b/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuoutputs/index.tsx index e46890776e7..713f5525876 100644 --- a/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuoutputs/index.tsx +++ b/libs/designer-ui/src/lib/floatingactionmenu/floatingactionmenuoutputs/index.tsx @@ -8,7 +8,7 @@ import type { TokenPickerButtonEditorProps } from '../../editor/base/plugins/tok import { StringEditor } from '../../editor/string'; import type { FloatingActionMenuItem } from '../floatingactionmenubase'; import { FloatingActionMenuBase } from '../floatingactionmenubase'; -import { clone, ValidationErrorCode, ValidationException } from '@microsoft/utils-logic-apps'; +import { clone, ValidationErrorCode, ValidationException } from '@microsoft/logic-apps-shared'; import React from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/flyout2/flyoutballoon.tsx b/libs/designer-ui/src/lib/flyout2/flyoutballoon.tsx index 6d841534680..efbfc4ffb2f 100644 --- a/libs/designer-ui/src/lib/flyout2/flyoutballoon.tsx +++ b/libs/designer-ui/src/lib/flyout2/flyoutballoon.tsx @@ -3,7 +3,7 @@ import { calloutContentStyles } from '../fabric'; import type { FlyoutSelectedEventHandler } from './types'; import type { Target } from '@fluentui/react'; import { Callout, DirectionalHint } from '@fluentui/react'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; export interface FlyoutBalloonProps { documentationLink?: OpenAPIV2.ExternalDocumentationObject; diff --git a/libs/designer-ui/src/lib/flyout2/index.tsx b/libs/designer-ui/src/lib/flyout2/index.tsx index 230389c95a7..4f71e47c2c1 100644 --- a/libs/designer-ui/src/lib/flyout2/index.tsx +++ b/libs/designer-ui/src/lib/flyout2/index.tsx @@ -3,7 +3,7 @@ import Constants from '../constants'; import { getDragStartHandlerWhenDisabled } from '../helper'; import { FlyoutBalloon } from './flyoutballoon'; import type { FlyoutSelectedEventHandler } from './types'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; import { useRef } from 'react'; export interface Flyout2Props { diff --git a/libs/designer-ui/src/lib/helper.ts b/libs/designer-ui/src/lib/helper.ts index 1e573bf2cab..772346ab829 100644 --- a/libs/designer-ui/src/lib/helper.ts +++ b/libs/designer-ui/src/lib/helper.ts @@ -1,4 +1,4 @@ -import { isFirefox } from '@microsoft/utils-logic-apps'; +import { isFirefox } from '@microsoft/logic-apps-shared'; /** * Returns an "onDragStart" event handler to use on Firefox when draggable is set to false. diff --git a/libs/designer-ui/src/lib/html/plugins/toolbar/DropdownColorPicker.tsx b/libs/designer-ui/src/lib/html/plugins/toolbar/DropdownColorPicker.tsx index 06a321c619c..4f5485c6712 100644 --- a/libs/designer-ui/src/lib/html/plugins/toolbar/DropdownColorPicker.tsx +++ b/libs/designer-ui/src/lib/html/plugins/toolbar/DropdownColorPicker.tsx @@ -4,7 +4,7 @@ import { MoveWrapper } from './helper/MoveWrapper'; import { basicColors, COLORPICKER_HEIGHT as HEIGHT, COLORPICKER_WIDTH as WIDTH } from './helper/constants'; import type { Position } from './helper/util'; import { Text } from '@fluentui/react'; -import { capitalizeFirstLetter, transformColor } from '@microsoft/utils-logic-apps'; +import { capitalizeFirstLetter, transformColor } from '@microsoft/logic-apps-shared'; import type { LexicalEditor } from 'lexical'; import type { ReactNode } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react'; diff --git a/libs/designer-ui/src/lib/html/plugins/toolbar/Format.tsx b/libs/designer-ui/src/lib/html/plugins/toolbar/Format.tsx index ba0f1c1dec3..dfaf8530d7b 100644 --- a/libs/designer-ui/src/lib/html/plugins/toolbar/Format.tsx +++ b/libs/designer-ui/src/lib/html/plugins/toolbar/Format.tsx @@ -17,7 +17,7 @@ import { useTheme } from '@fluentui/react'; import { $isLinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link'; import { $patchStyleText, $getSelectionStyleValueForProperty } from '@lexical/selection'; import { mergeRegister } from '@lexical/utils'; -import { isApple } from '@microsoft/utils-logic-apps'; +import { isApple } from '@microsoft/logic-apps-shared'; import type { LexicalEditor } from 'lexical'; import { COMMAND_PRIORITY_NORMAL, diff --git a/libs/designer-ui/src/lib/html/plugins/toolbar/Toolbar.tsx b/libs/designer-ui/src/lib/html/plugins/toolbar/Toolbar.tsx index cbcb6cd6d48..fa27b4cc49c 100644 --- a/libs/designer-ui/src/lib/html/plugins/toolbar/Toolbar.tsx +++ b/libs/designer-ui/src/lib/html/plugins/toolbar/Toolbar.tsx @@ -21,7 +21,7 @@ import { $isHeadingNode } from '@lexical/rich-text'; import { $getSelectionStyleValueForProperty } from '@lexical/selection'; import { mergeRegister, $getNearestNodeOfType, $findMatchingParent } from '@lexical/utils'; import type { ValueSegment } from '@microsoft/designer-client-services-logic-apps'; -import { isApple } from '@microsoft/utils-logic-apps'; +import { isApple } from '@microsoft/logic-apps-shared'; import { $getRoot, $getSelection, diff --git a/libs/designer-ui/src/lib/html/plugins/toolbar/helper/Dropdown.tsx b/libs/designer-ui/src/lib/html/plugins/toolbar/helper/Dropdown.tsx index 707a11fb4c5..50a833af9e9 100644 --- a/libs/designer-ui/src/lib/html/plugins/toolbar/helper/Dropdown.tsx +++ b/libs/designer-ui/src/lib/html/plugins/toolbar/helper/Dropdown.tsx @@ -2,7 +2,7 @@ import chevronDownDark from './../../icons/dark/chevron-down.svg'; import chevronDownLight from './../../icons/light/chevron-down.svg'; import { DropDownItems } from './DropdownItems'; import { useTheme } from '@fluentui/react'; -import { useOutsideClick } from '@microsoft/utils-logic-apps'; +import { useOutsideClick } from '@microsoft/logic-apps-shared'; import type { LexicalCommand, LexicalEditor } from 'lexical'; import { COMMAND_PRIORITY_CRITICAL, createCommand } from 'lexical'; import type { ReactNode } from 'react'; diff --git a/libs/designer-ui/src/lib/modals/DeleteNodeModal.tsx b/libs/designer-ui/src/lib/modals/DeleteNodeModal.tsx index be82b1774c3..ac01d81224c 100644 --- a/libs/designer-ui/src/lib/modals/DeleteNodeModal.tsx +++ b/libs/designer-ui/src/lib/modals/DeleteNodeModal.tsx @@ -1,7 +1,7 @@ import { Modal } from '@fluentui/react'; import { Button, Spinner } from '@fluentui/react-components'; -import type { WorkflowNodeType } from '@microsoft/utils-logic-apps'; -import { idDisplayCase, WORKFLOW_NODE_TYPES } from '@microsoft/utils-logic-apps'; +import type { WorkflowNodeType } from '@microsoft/logic-apps-shared'; +import { idDisplayCase, WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; export interface DeleteNodeModalProps { diff --git a/libs/designer-ui/src/lib/monitoring/requestpanel/index.tsx b/libs/designer-ui/src/lib/monitoring/requestpanel/index.tsx index 0c1c7e8a1da..843f5b63187 100644 --- a/libs/designer-ui/src/lib/monitoring/requestpanel/index.tsx +++ b/libs/designer-ui/src/lib/monitoring/requestpanel/index.tsx @@ -7,7 +7,7 @@ import { Request } from './request'; import { Response } from './response'; import { SecureDataSection } from './securedatasection'; import type { RequestHistory } from './types'; -import { equals } from '@microsoft/utils-logic-apps'; +import { equals } from '@microsoft/logic-apps-shared'; import React, { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/monitoring/requestpanel/types.ts b/libs/designer-ui/src/lib/monitoring/requestpanel/types.ts index af2b107b38d..39d469e19b3 100644 --- a/libs/designer-ui/src/lib/monitoring/requestpanel/types.ts +++ b/libs/designer-ui/src/lib/monitoring/requestpanel/types.ts @@ -1,4 +1,4 @@ -import type { ContentLink, SecureData } from '@microsoft/utils-logic-apps'; +import type { ContentLink, SecureData } from '@microsoft/logic-apps-shared'; export interface RequestHistory { properties: RequestHistoryProperties; diff --git a/libs/designer-ui/src/lib/monitoring/retrypanel/index.tsx b/libs/designer-ui/src/lib/monitoring/retrypanel/index.tsx index 1eeed3c7711..c19789bf21d 100644 --- a/libs/designer-ui/src/lib/monitoring/retrypanel/index.tsx +++ b/libs/designer-ui/src/lib/monitoring/retrypanel/index.tsx @@ -3,7 +3,7 @@ import { Pager } from '../../pager'; import { ErrorSection } from '../errorsection'; import { calculateDuration } from '../utils'; import { Value } from '../values'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; import { useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/monitoring/values/utils.ts b/libs/designer-ui/src/lib/monitoring/values/utils.ts index 88ec328d79b..bfd50f5e6cb 100644 --- a/libs/designer-ui/src/lib/monitoring/values/utils.ts +++ b/libs/designer-ui/src/lib/monitoring/values/utils.ts @@ -1,6 +1,6 @@ import type { Xml } from './types'; -import type { ContentHash, ContentLink, SecureData } from '@microsoft/utils-logic-apps'; -import { isObject } from '@microsoft/utils-logic-apps'; +import type { ContentHash, ContentLink, SecureData } from '@microsoft/logic-apps-shared'; +import { isObject } from '@microsoft/logic-apps-shared'; export function isContentLink(value: any): value is ContentLink { return ( diff --git a/libs/designer-ui/src/lib/monitoring/valuespanel/index.tsx b/libs/designer-ui/src/lib/monitoring/valuespanel/index.tsx index 84c74c5fa10..8e97466290d 100644 --- a/libs/designer-ui/src/lib/monitoring/valuespanel/index.tsx +++ b/libs/designer-ui/src/lib/monitoring/valuespanel/index.tsx @@ -3,7 +3,7 @@ import Constants from '../../constants'; import { ValueDownload } from './valuedownload'; import { ValueLink } from './valuelink'; import { ValueList } from './valuelist'; -import type { BoundParameters } from '@microsoft/utils-logic-apps'; +import type { BoundParameters } from '@microsoft/logic-apps-shared'; import React from 'react'; export interface ValuesPanelProps { diff --git a/libs/designer-ui/src/lib/monitoring/valuespanel/valuelist.tsx b/libs/designer-ui/src/lib/monitoring/valuespanel/valuelist.tsx index 47e0e8bb9c0..28ffeec0b55 100644 --- a/libs/designer-ui/src/lib/monitoring/valuespanel/valuelist.tsx +++ b/libs/designer-ui/src/lib/monitoring/valuespanel/valuelist.tsx @@ -1,7 +1,7 @@ import { Value } from '../values'; import { DefaultButton } from '@fluentui/react'; -import type { BoundParameters } from '@microsoft/utils-logic-apps'; -import { equals } from '@microsoft/utils-logic-apps'; +import type { BoundParameters } from '@microsoft/logic-apps-shared'; +import { equals } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; export interface ValueListProps { diff --git a/libs/designer-ui/src/lib/overview/__test__/utils.spec.ts b/libs/designer-ui/src/lib/overview/__test__/utils.spec.ts index 66112e03d99..70e3bdce7ba 100644 --- a/libs/designer-ui/src/lib/overview/__test__/utils.spec.ts +++ b/libs/designer-ui/src/lib/overview/__test__/utils.spec.ts @@ -1,5 +1,5 @@ import { isRunError, mapToRunItem } from '../utils'; -import type { Run, RunError } from '@microsoft/utils-logic-apps'; +import type { Run, RunError } from '@microsoft/logic-apps-shared'; describe('lib/overview/utils', () => { describe('isRunError', () => { diff --git a/libs/designer-ui/src/lib/overview/index.tsx b/libs/designer-ui/src/lib/overview/index.tsx index 58e4d6262b8..e07ee36f22d 100644 --- a/libs/designer-ui/src/lib/overview/index.tsx +++ b/libs/designer-ui/src/lib/overview/index.tsx @@ -6,8 +6,8 @@ import type { RunDisplayItem } from './types'; import { isRunError, mapToRunItem } from './utils'; import type { IIconProps, ITextFieldStyles } from '@fluentui/react'; import { IconButton, MessageBar, MessageBarType, Pivot, PivotItem, TextField } from '@fluentui/react'; -import type { Run, RunError, getCallbackUrl } from '@microsoft/utils-logic-apps'; -import { isCallbackInfoWithRelativePath } from '@microsoft/utils-logic-apps'; +import type { Run, RunError, getCallbackUrl } from '@microsoft/logic-apps-shared'; +import { isCallbackInfoWithRelativePath } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import InfiniteScroll from 'react-infinite-scroll-component'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/overview/overviewcommandbar.tsx b/libs/designer-ui/src/lib/overview/overviewcommandbar.tsx index ec165ec0012..661ea26ac36 100644 --- a/libs/designer-ui/src/lib/overview/overviewcommandbar.tsx +++ b/libs/designer-ui/src/lib/overview/overviewcommandbar.tsx @@ -1,7 +1,7 @@ import type { ICommandBarItemProps } from '@fluentui/react'; import { CommandBar } from '@fluentui/react'; -import { getCallbackUrl } from '@microsoft/utils-logic-apps'; -import type { CallbackInfo } from '@microsoft/utils-logic-apps'; +import { getCallbackUrl } from '@microsoft/logic-apps-shared'; +import type { CallbackInfo } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/overview/overviewproperties.tsx b/libs/designer-ui/src/lib/overview/overviewproperties.tsx index f9900fbe20f..993c088112a 100644 --- a/libs/designer-ui/src/lib/overview/overviewproperties.tsx +++ b/libs/designer-ui/src/lib/overview/overviewproperties.tsx @@ -1,6 +1,6 @@ import { Label, Link, Pivot, PivotItem, Text } from '@fluentui/react'; -import { getCallbackUrl } from '@microsoft/utils-logic-apps'; -import type { CallbackInfo } from '@microsoft/utils-logic-apps'; +import { getCallbackUrl } from '@microsoft/logic-apps-shared'; +import type { CallbackInfo } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/overview/utils.ts b/libs/designer-ui/src/lib/overview/utils.ts index 99a8b297bf5..68861fd188e 100644 --- a/libs/designer-ui/src/lib/overview/utils.ts +++ b/libs/designer-ui/src/lib/overview/utils.ts @@ -1,7 +1,7 @@ import { getDurationString } from '../utils'; import type { RunDisplayItem } from './types'; -import type { Run, RunError } from '@microsoft/utils-logic-apps'; -import { isObject } from '@microsoft/utils-logic-apps'; +import type { Run, RunError } from '@microsoft/logic-apps-shared'; +import { isObject } from '@microsoft/logic-apps-shared'; export function isRunError(value: any): value is RunError { return isObject(value) && isObject(value.error) && typeof value.error.code === 'string' && typeof value.error.message === 'string'; diff --git a/libs/designer-ui/src/lib/panel/recommendationpanel/browseResults.tsx b/libs/designer-ui/src/lib/panel/recommendationpanel/browseResults.tsx index c5548afc003..279743b9c80 100644 --- a/libs/designer-ui/src/lib/panel/recommendationpanel/browseResults.tsx +++ b/libs/designer-ui/src/lib/panel/recommendationpanel/browseResults.tsx @@ -3,7 +3,7 @@ import { ConnectorSummaryCard } from '../../connectorsummarycard'; import { getConnectorCategoryString } from '../../utils'; import { List, Text } from '@fluentui/react'; import { Spinner } from '@fluentui/react-components'; -import type { Connector } from '@microsoft/utils-logic-apps'; +import type { Connector } from '@microsoft/logic-apps-shared'; import { useCallback, useLayoutEffect, useRef, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/index.tsx b/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/index.tsx index a2773f653ce..b1c244df35e 100644 --- a/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/index.tsx +++ b/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/index.tsx @@ -4,7 +4,7 @@ import HybridNotice from './HybridNotice'; import { OperationGroupHeader } from './operationGroupHeader'; import { MessageBar, MessageBarType } from '@fluentui/react'; import { Spinner } from '@fluentui/react-components'; -import type { Connector } from '@microsoft/utils-logic-apps'; +import type { Connector } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; export interface OperationGroupDetailsPageProps { diff --git a/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/mocks.ts b/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/mocks.ts index 1498b3c653a..24cd9b9970d 100644 --- a/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/mocks.ts +++ b/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/mocks.ts @@ -1,5 +1,5 @@ import type { OperationActionData } from '../interfaces'; -import type { OperationApi } from '@microsoft/utils-logic-apps'; +import type { OperationApi } from '@microsoft/logic-apps-shared'; export const mockOperationApi: OperationApi = { id: 'id', diff --git a/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/operationGroupHeader/index.tsx b/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/operationGroupHeader/index.tsx index 1c9357022c2..c11cc7da288 100644 --- a/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/operationGroupHeader/index.tsx +++ b/libs/designer-ui/src/lib/panel/recommendationpanel/operationGroupDetails/operationGroupHeader/index.tsx @@ -1,5 +1,5 @@ import { css, Icon, Image, ImageFit, Link } from '@fluentui/react'; -import { fallbackConnectorIconUrl } from '@microsoft/utils-logic-apps'; +import { fallbackConnectorIconUrl } from '@microsoft/logic-apps-shared'; import { useMeasure } from '@react-hookz/web'; import { useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/panel/recommendationpanel/operationSearchGroup/index.tsx b/libs/designer-ui/src/lib/panel/recommendationpanel/operationSearchGroup/index.tsx index 9670ed1a5d6..752ee4d7cda 100644 --- a/libs/designer-ui/src/lib/panel/recommendationpanel/operationSearchGroup/index.tsx +++ b/libs/designer-ui/src/lib/panel/recommendationpanel/operationSearchGroup/index.tsx @@ -3,7 +3,7 @@ import { getConnectorCategoryString } from '../../../utils'; import type { OperationActionData } from '../interfaces'; import { OperationSearchCard } from '../operationSearchCard'; import { Link } from '@fluentui/react'; -import type { OperationApi } from '@microsoft/utils-logic-apps'; +import type { OperationApi } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; export interface OperationSearchGroupProps { diff --git a/libs/designer-ui/src/lib/panel/recommendationpanel/searchResult.tsx b/libs/designer-ui/src/lib/panel/recommendationpanel/searchResult.tsx index 19dba5b5fc2..ea068b234ea 100644 --- a/libs/designer-ui/src/lib/panel/recommendationpanel/searchResult.tsx +++ b/libs/designer-ui/src/lib/panel/recommendationpanel/searchResult.tsx @@ -6,8 +6,8 @@ import { OperationSearchCard } from './operationSearchCard'; import { OperationSearchGroup } from './operationSearchGroup'; import { List, Text } from '@fluentui/react'; import { Spinner } from '@fluentui/react-components'; -import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/utils-logic-apps'; -import { isBuiltInConnector } from '@microsoft/utils-logic-apps'; +import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/logic-apps-shared'; +import { isBuiltInConnector } from '@microsoft/logic-apps-shared'; import type { PropsWithChildren } from 'react'; import React, { useMemo } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/picker/filepickereditor.tsx b/libs/designer-ui/src/lib/picker/filepickereditor.tsx index e713f07aafa..9fdd7438556 100644 --- a/libs/designer-ui/src/lib/picker/filepickereditor.tsx +++ b/libs/designer-ui/src/lib/picker/filepickereditor.tsx @@ -12,7 +12,7 @@ import type { IBreadcrumbItem, IIconProps, ITooltipHostStyles } from '@fluentui/ import { TooltipHost, IconButton } from '@fluentui/react'; import { useId } from '@fluentui/react-hooks'; import type { TreeDynamicValue } from '@microsoft/designer-client-services-logic-apps'; -import { equals, guid } from '@microsoft/utils-logic-apps'; +import { equals, guid } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/querybuilder/GroupDropdown.tsx b/libs/designer-ui/src/lib/querybuilder/GroupDropdown.tsx index d6291ebcdda..42165449700 100644 --- a/libs/designer-ui/src/lib/querybuilder/GroupDropdown.tsx +++ b/libs/designer-ui/src/lib/querybuilder/GroupDropdown.tsx @@ -2,7 +2,7 @@ import type { DropdownItem } from '../dropdown'; import { DropdownEditor } from '../dropdown'; import { ValueSegmentType } from '../editor'; import type { ChangeHandler } from '../editor/base'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; export const GroupDropdownOptions = { AND: 'and', diff --git a/libs/designer-ui/src/lib/querybuilder/HybridQueryBuilder.tsx b/libs/designer-ui/src/lib/querybuilder/HybridQueryBuilder.tsx index 825b4ff74b6..f536d2cd754 100644 --- a/libs/designer-ui/src/lib/querybuilder/HybridQueryBuilder.tsx +++ b/libs/designer-ui/src/lib/querybuilder/HybridQueryBuilder.tsx @@ -2,7 +2,7 @@ import { ValueSegmentType } from '../editor'; import { Group } from './Group'; import { checkHeights, getGroupedItems } from './helper'; import type { GroupedItems, GroupItemProps, QueryBuilderProps } from './index'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useFunctionalState, useUpdateEffect } from '@react-hookz/web'; import { useEffect, useRef, useState } from 'react'; diff --git a/libs/designer-ui/src/lib/querybuilder/Row.tsx b/libs/designer-ui/src/lib/querybuilder/Row.tsx index 86a986da136..f7cba315d19 100644 --- a/libs/designer-ui/src/lib/querybuilder/Row.tsx +++ b/libs/designer-ui/src/lib/querybuilder/Row.tsx @@ -13,7 +13,7 @@ import { RowDropdown, RowDropdownOptions } from './RowDropdown'; import { operandNotEmpty } from './helper'; import type { ICalloutProps, IIconProps, IOverflowSetItemProps, IOverflowSetStyles } from '@fluentui/react'; import { css, IconButton, DirectionalHint, TooltipHost, OverflowSet } from '@fluentui/react'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/querybuilder/RowDropdown.tsx b/libs/designer-ui/src/lib/querybuilder/RowDropdown.tsx index 0b36115cf5b..1105c427f44 100644 --- a/libs/designer-ui/src/lib/querybuilder/RowDropdown.tsx +++ b/libs/designer-ui/src/lib/querybuilder/RowDropdown.tsx @@ -2,7 +2,7 @@ import type { DropdownItem } from '../dropdown'; import { DropdownEditor } from '../dropdown'; import { ValueSegmentType } from '../editor'; import type { ChangeHandler } from '../editor/base'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; interface RowDropdownProps { condition?: string; diff --git a/libs/designer-ui/src/lib/querybuilder/SimpleQueryBuilder.tsx b/libs/designer-ui/src/lib/querybuilder/SimpleQueryBuilder.tsx index 5fa19ba3df6..e5aa38e96e1 100644 --- a/libs/designer-ui/src/lib/querybuilder/SimpleQueryBuilder.tsx +++ b/libs/designer-ui/src/lib/querybuilder/SimpleQueryBuilder.tsx @@ -9,7 +9,7 @@ import { Row } from './Row'; import { getOperationValue, getOuterMostCommaIndex } from './helper'; import type { IButtonStyles, IStyle } from '@fluentui/react'; import { ActionButton, FontSizes } from '@fluentui/react'; -import { guid, nthLastIndexOf } from '@microsoft/utils-logic-apps'; +import { guid, nthLastIndexOf } from '@microsoft/logic-apps-shared'; import { useFunctionalState } from '@react-hookz/web'; import { useEffect, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/querybuilder/helper.ts b/libs/designer-ui/src/lib/querybuilder/helper.ts index 319d31536b0..544fa0927df 100644 --- a/libs/designer-ui/src/lib/querybuilder/helper.ts +++ b/libs/designer-ui/src/lib/querybuilder/helper.ts @@ -1,7 +1,7 @@ import type { GroupItemProps, GroupedItems, RowItemProps } from '.'; import { GroupType } from '.'; import type { ValueSegment } from '../editor'; -import { isNumber, isBoolean } from '@microsoft/logic-apps-shared'; +import { isNumber, isStringBoolean } from '@microsoft/logic-apps-shared'; export const checkHeights = (item: GroupItemProps | RowItemProps, returnVal: number[], height: number): number[] => { if (item.checked) { @@ -58,7 +58,7 @@ export const getOperationValue = (valSegment?: ValueSegment): ValueSegment | und const checkIfShouldHaveQuotes = (valSegment: ValueSegment): boolean => { const value = valSegment.value; - if (value && (isNumber(value) || isBoolean(value))) { + if (value && (isNumber(value) || isStringBoolean(value))) { return false; } return true; diff --git a/libs/designer-ui/src/lib/querybuilder/index.tsx b/libs/designer-ui/src/lib/querybuilder/index.tsx index 405020627a3..a6f365f9509 100644 --- a/libs/designer-ui/src/lib/querybuilder/index.tsx +++ b/libs/designer-ui/src/lib/querybuilder/index.tsx @@ -5,7 +5,7 @@ import { Group } from './Group'; import { GroupDropdownOptions } from './GroupDropdown'; import { RowDropdownOptions } from './RowDropdown'; import { checkHeights, getGroupedItems } from './helper'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useFunctionalState, useUpdateEffect } from '@react-hookz/web'; import { useEffect, useRef, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/recurrence/index.tsx b/libs/designer-ui/src/lib/recurrence/index.tsx index 9c56ebf70bc..155d609207a 100644 --- a/libs/designer-ui/src/lib/recurrence/index.tsx +++ b/libs/designer-ui/src/lib/recurrence/index.tsx @@ -15,7 +15,7 @@ import { getTimezoneValues, guid, RecurrenceType, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/recurrence/preview.tsx b/libs/designer-ui/src/lib/recurrence/preview.tsx index e4d69589638..4ea0e822542 100644 --- a/libs/designer-ui/src/lib/recurrence/preview.tsx +++ b/libs/designer-ui/src/lib/recurrence/preview.tsx @@ -2,7 +2,7 @@ import type { Recurrence } from '.'; import constants from '../constants'; import { getIntervalValue } from './util'; import { getIntl } from '@microsoft/intl-logic-apps'; -import { equals, getPropertyValue } from '@microsoft/utils-logic-apps'; +import { equals, getPropertyValue } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; interface PreviewProps { diff --git a/libs/designer-ui/src/lib/settings/settingsection/customTokenField.tsx b/libs/designer-ui/src/lib/settings/settingsection/customTokenField.tsx index 4d2f734ac3b..f721b6614ff 100644 --- a/libs/designer-ui/src/lib/settings/settingsection/customTokenField.tsx +++ b/libs/designer-ui/src/lib/settings/settingsection/customTokenField.tsx @@ -8,7 +8,7 @@ import type { IEditorProps, IRenderDefaultEditorParams, } from '@microsoft/designer-client-services-logic-apps'; -import { equals } from '@microsoft/utils-logic-apps'; +import { equals } from '@microsoft/logic-apps-shared'; import { useCallback } from 'react'; export type CustomTokenFieldProps = Omit & ICustomEditorAndOptions; diff --git a/libs/designer-ui/src/lib/settings/settingsection/settingTokenField.tsx b/libs/designer-ui/src/lib/settings/settingsection/settingTokenField.tsx index 5d73caa7625..3a11735e197 100644 --- a/libs/designer-ui/src/lib/settings/settingsection/settingTokenField.tsx +++ b/libs/designer-ui/src/lib/settings/settingsection/settingTokenField.tsx @@ -28,7 +28,7 @@ import { convertUIElementNameToAutomationId } from '../../utils'; import { CustomTokenField, isCustomEditor } from './customTokenField'; import type { SettingProps } from './settingtoggle'; import { Label } from '@fluentui/react'; -import { equals, getPropertyValue } from '@microsoft/utils-logic-apps'; +import { equals, getPropertyValue } from '@microsoft/logic-apps-shared'; export interface SettingTokenFieldProps extends SettingProps { id?: string; diff --git a/libs/designer-ui/src/lib/settings/settingsection/settingdictionary.tsx b/libs/designer-ui/src/lib/settings/settingsection/settingdictionary.tsx index 8af2b95d448..62b26407939 100644 --- a/libs/designer-ui/src/lib/settings/settingsection/settingdictionary.tsx +++ b/libs/designer-ui/src/lib/settings/settingsection/settingdictionary.tsx @@ -3,7 +3,7 @@ import { SimpleDictionary } from './dictionary/simpledictionary'; import type { SettingProps } from './settingtoggle'; import { TextField } from '@fluentui/react'; import type { ITextFieldStyles } from '@fluentui/react'; -import { isObject } from '@microsoft/utils-logic-apps'; +import { isObject } from '@microsoft/logic-apps-shared'; export type InputChangeHandler = (event: React.FormEvent, newValue?: string) => void; diff --git a/libs/designer-ui/src/lib/staticResult/StaticResult.tsx b/libs/designer-ui/src/lib/staticResult/StaticResult.tsx index 5fb26c17ab3..628faeb0890 100644 --- a/libs/designer-ui/src/lib/staticResult/StaticResult.tsx +++ b/libs/designer-ui/src/lib/staticResult/StaticResult.tsx @@ -2,7 +2,7 @@ import type { StaticResultRootSchemaType } from '.'; import constants from '../constants'; import { StaticResultProperties } from './staticResultProperties'; import { Icon, IconButton, useTheme } from '@fluentui/react'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; import type { Dispatch, SetStateAction } from 'react'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/staticResult/index.tsx b/libs/designer-ui/src/lib/staticResult/index.tsx index a72f646d7dd..238cdc22a81 100644 --- a/libs/designer-ui/src/lib/staticResult/index.tsx +++ b/libs/designer-ui/src/lib/staticResult/index.tsx @@ -3,8 +3,8 @@ import { StaticResult } from './StaticResult'; import { deserializePropertyValues, parseStaticResultSchema, serializePropertyValues } from './util'; import type { IButtonStyles } from '@fluentui/react'; import { DefaultButton, PrimaryButton, Toggle } from '@fluentui/react'; -import type { Schema } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenApiSchema } from '@microsoft/logic-apps-shared'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; import { useEffect, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; @@ -35,10 +35,10 @@ export interface StaticResultContainerProps { export type StaticResultRootSchemaType = OpenAPIV2.SchemaObject & { properties: { - status: Schema; - code: Schema; - error: Schema; - outputs?: Schema; + status: OpenApiSchema; + code: OpenApiSchema; + error: OpenApiSchema; + outputs?: OpenApiSchema; }; }; diff --git a/libs/designer-ui/src/lib/staticResult/propertyEditor/PropertyEditorItem.tsx b/libs/designer-ui/src/lib/staticResult/propertyEditor/PropertyEditorItem.tsx index f23cd95ce70..27ad92cf539 100644 --- a/libs/designer-ui/src/lib/staticResult/propertyEditor/PropertyEditorItem.tsx +++ b/libs/designer-ui/src/lib/staticResult/propertyEditor/PropertyEditorItem.tsx @@ -5,8 +5,8 @@ import { initializeCheckedDropdown, initializePropertyValueText } from '../util' import { ItemMenuButton } from './ItemMenuButton'; import type { IButtonStyles, IContextualMenuItem, IContextualMenuProps, IContextualMenuStyles, ITextFieldStyles } from '@fluentui/react'; import { IconButton, TextField } from '@fluentui/react'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { clone } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { clone } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useMemo, useState } from 'react'; const dropwdownButtonStyles: Partial = { diff --git a/libs/designer-ui/src/lib/staticResult/propertyEditor/index.tsx b/libs/designer-ui/src/lib/staticResult/propertyEditor/index.tsx index 4f7738ed208..84928f68d1b 100644 --- a/libs/designer-ui/src/lib/staticResult/propertyEditor/index.tsx +++ b/libs/designer-ui/src/lib/staticResult/propertyEditor/index.tsx @@ -1,8 +1,8 @@ import { PropertyEditorItem, SchemaPropertyValueType } from './PropertyEditorItem'; import type { IButtonStyles, IIconProps, ITextFieldStyles } from '@fluentui/react'; import { DefaultButton, PrimaryButton, Callout, DirectionalHint, TextField } from '@fluentui/react'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { clone } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { clone } from '@microsoft/logic-apps-shared'; import { useUpdateEffect } from '@react-hookz/web'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/staticResult/staticResultProperties.tsx b/libs/designer-ui/src/lib/staticResult/staticResultProperties.tsx index 102893516f4..3d8b0079873 100644 --- a/libs/designer-ui/src/lib/staticResult/staticResultProperties.tsx +++ b/libs/designer-ui/src/lib/staticResult/staticResultProperties.tsx @@ -3,7 +3,7 @@ import { Label, DropdownEditor } from '..'; import { StaticResultProperty } from './staticResultProperty'; import { formatShownProperties, getOptions, initializeShownProperties } from './util'; import type { IDropdownOption } from '@fluentui/react'; -import { type OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import { type OpenAPIV2 } from '@microsoft/logic-apps-shared'; import type { Dispatch, SetStateAction } from 'react'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/staticResult/staticResultProperty.tsx b/libs/designer-ui/src/lib/staticResult/staticResultProperty.tsx index 7b5ba24f1bb..0bed45d2bcb 100644 --- a/libs/designer-ui/src/lib/staticResult/staticResultProperty.tsx +++ b/libs/designer-ui/src/lib/staticResult/staticResultProperty.tsx @@ -6,7 +6,7 @@ import { PropertyEditor } from './propertyEditor'; import { initializePropertyValueInput } from './util'; import type { IDropdownOption, IDropdownStyles, ITextFieldStyles } from '@fluentui/react'; import { Dropdown, TextField } from '@fluentui/react'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; import { useMountEffect, useUpdateEffect } from '@react-hookz/web'; import React, { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/staticResult/util.ts b/libs/designer-ui/src/lib/staticResult/util.ts index 4e66e429e51..168822d9ec9 100644 --- a/libs/designer-ui/src/lib/staticResult/util.ts +++ b/libs/designer-ui/src/lib/staticResult/util.ts @@ -4,8 +4,8 @@ import type { DropdownItem } from '../dropdown'; import type { ValueSegment } from '../editor'; import { ValueSegmentType } from '../editor'; import { SchemaPropertyValueType } from './propertyEditor/PropertyEditorItem'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { capitalizeFirstLetter, guid } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { capitalizeFirstLetter, guid } from '@microsoft/logic-apps-shared'; export const parseStaticResultSchema = (staticResultSchema: OpenAPIV2.SchemaObject) => { const { additionalProperties, properties, required, type } = staticResultSchema; diff --git a/libs/designer-ui/src/lib/table/index.tsx b/libs/designer-ui/src/lib/table/index.tsx index e57e3f1b054..6357c8003bf 100644 --- a/libs/designer-ui/src/lib/table/index.tsx +++ b/libs/designer-ui/src/lib/table/index.tsx @@ -5,7 +5,7 @@ import type { ChangeState } from '../editor/base'; import type { IDropdownOption, IDropdownStyles } from '@fluentui/react'; import { Dropdown } from '@fluentui/react'; import { getIntl } from '@microsoft/intl-logic-apps'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import type { FormEvent } from 'react'; import { useState } from 'react'; diff --git a/libs/designer-ui/src/lib/tokenpicker/models/token.ts b/libs/designer-ui/src/lib/tokenpicker/models/token.ts index 070422ef2cb..dc737267182 100644 --- a/libs/designer-ui/src/lib/tokenpicker/models/token.ts +++ b/libs/designer-ui/src/lib/tokenpicker/models/token.ts @@ -1,5 +1,5 @@ import type { TokenType } from '../../editor'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; export interface Token { key: string; diff --git a/libs/designer-ui/src/lib/tokenpicker/tokenpickerfooter.tsx b/libs/designer-ui/src/lib/tokenpicker/tokenpickerfooter.tsx index 0eb0262d88e..62ead2e5729 100644 --- a/libs/designer-ui/src/lib/tokenpicker/tokenpickerfooter.tsx +++ b/libs/designer-ui/src/lib/tokenpicker/tokenpickerfooter.tsx @@ -13,7 +13,7 @@ import { PrimaryButton } from '@fluentui/react'; import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; import type { Expression } from '@microsoft/logic-apps-shared'; import { ExpressionExceptionCode, ExpressionParser, ScannerException } from '@microsoft/logic-apps-shared'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import type { LexicalEditor, NodeKey } from 'lexical'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickeroption.tsx b/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickeroption.tsx index 066f0176345..70ddc939c52 100644 --- a/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickeroption.tsx +++ b/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickeroption.tsx @@ -10,7 +10,7 @@ import type { TokenPickerBaseProps } from './tokenpickersection'; import { Icon } from '@fluentui/react'; import { useBoolean } from '@fluentui/react-hooks'; import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; -import { hex2rgb, lighten } from '@microsoft/utils-logic-apps'; +import { hex2rgb, lighten } from '@microsoft/logic-apps-shared'; import Fuse from 'fuse.js'; import type { LexicalEditor } from 'lexical'; import type { Dispatch, SetStateAction } from 'react'; diff --git a/libs/designer-ui/src/lib/tokenpicker/util.ts b/libs/designer-ui/src/lib/tokenpicker/util.ts index ac41ad672d8..b5b5b8dc8b5 100644 --- a/libs/designer-ui/src/lib/tokenpicker/util.ts +++ b/libs/designer-ui/src/lib/tokenpicker/util.ts @@ -1,7 +1,7 @@ import type { Token } from './models/token'; import type { Expression, ExpressionFunction, ExpressionLiteral } from '@microsoft/logic-apps-shared'; import { ExpressionType } from '@microsoft/logic-apps-shared'; -import { UnsupportedException } from '@microsoft/utils-logic-apps'; +import { UnsupportedException } from '@microsoft/logic-apps-shared'; export function getExpressionTokenTitle(expression: Expression): string { switch (expression.type) { diff --git a/libs/designer-ui/src/lib/utils/utils.ts b/libs/designer-ui/src/lib/utils/utils.ts index 5c797211801..2468e9c9f0f 100644 --- a/libs/designer-ui/src/lib/utils/utils.ts +++ b/libs/designer-ui/src/lib/utils/utils.ts @@ -1,6 +1,6 @@ import Constants from '../constants'; import { getIntl } from '@microsoft/intl-logic-apps'; -import { equals, isBuiltInConnector, isCustomConnector } from '@microsoft/utils-logic-apps'; +import { equals, isBuiltInConnector, isCustomConnector } from '@microsoft/logic-apps-shared'; /** * Returns a string with a duration, possibly abbreviated, e.g., 15s or 15 second(s) diff --git a/libs/designer-ui/src/lib/workflow/exceptions/invalidjsonschematype.ts b/libs/designer-ui/src/lib/workflow/exceptions/invalidjsonschematype.ts index de9027eea7a..b5a47befe51 100644 --- a/libs/designer-ui/src/lib/workflow/exceptions/invalidjsonschematype.ts +++ b/libs/designer-ui/src/lib/workflow/exceptions/invalidjsonschematype.ts @@ -1,4 +1,4 @@ -import { BaseException } from '@microsoft/utils-logic-apps'; +import { BaseException } from '@microsoft/logic-apps-shared'; export class InvalidJsonSchemaTypeException extends BaseException { constructor(message: string, data?: Record, innerException?: any) { diff --git a/libs/designer-ui/src/lib/workflow/languageservice/workflowlanguageservice.ts b/libs/designer-ui/src/lib/workflow/languageservice/workflowlanguageservice.ts index c5c75df7a00..d07a793ec7e 100644 --- a/libs/designer-ui/src/lib/workflow/languageservice/workflowlanguageservice.ts +++ b/libs/designer-ui/src/lib/workflow/languageservice/workflowlanguageservice.ts @@ -4,7 +4,7 @@ import type { FunctionDefinition, SignatureInfo } from './templatefunctions'; import { FunctionGroupDefinitions } from './templatefunctions'; import { ExpressionScanner, ExpressionTokenType } from '@microsoft/logic-apps-shared'; import type { ExpressionToken } from '@microsoft/logic-apps-shared'; -import { equals, first, getPropertyValue, map } from '@microsoft/utils-logic-apps'; +import { equals, first, getPropertyValue, map } from '@microsoft/logic-apps-shared'; import type { languages, editor, Position } from 'monaco-editor'; type CompletionList = languages.CompletionList; diff --git a/libs/designer-ui/src/lib/workflow/schema/generator.ts b/libs/designer-ui/src/lib/workflow/schema/generator.ts index b1f5a5a2bd9..623eb61fdc5 100644 --- a/libs/designer-ui/src/lib/workflow/schema/generator.ts +++ b/libs/designer-ui/src/lib/workflow/schema/generator.ts @@ -1,7 +1,7 @@ import { InvalidJsonSchemaTypeException } from '../exceptions/invalidjsonschematype'; import { isTemplateExpression } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { createCopy, clone } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { createCopy, clone } from '@microsoft/logic-apps-shared'; export const Types = { object: 'object', diff --git a/libs/designer-ui/src/lib/workflowparameters/workflowparameter.tsx b/libs/designer-ui/src/lib/workflowparameters/workflowparameter.tsx index 729a8dcf1b5..44cc77ac2ea 100644 --- a/libs/designer-ui/src/lib/workflowparameters/workflowparameter.tsx +++ b/libs/designer-ui/src/lib/workflowparameters/workflowparameter.tsx @@ -4,7 +4,7 @@ import { EditOrDeleteButton } from './workflowparametersButtons'; import { WorkflowparameterField } from './workflowparametersField'; import { Button } from '@fluentui/react-components'; import { bundleIcon, ChevronRight24Regular, ChevronRight24Filled, ChevronDown24Regular, ChevronDown24Filled } from '@fluentui/react-icons'; -import { RUN_AFTER_COLORS } from '@microsoft/utils-logic-apps'; +import { RUN_AFTER_COLORS } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer-ui/src/lib/workflowparameters/workflowparametersField.tsx b/libs/designer-ui/src/lib/workflowparameters/workflowparametersField.tsx index fc2e5d396b5..081e8744fe0 100644 --- a/libs/designer-ui/src/lib/workflowparameters/workflowparametersField.tsx +++ b/libs/designer-ui/src/lib/workflowparameters/workflowparametersField.tsx @@ -10,7 +10,7 @@ import type { ITextStyles, } from '@fluentui/react'; import { Dropdown, FontWeights, getTheme, Label, Text, TextField } from '@fluentui/react'; -import { equals, format } from '@microsoft/utils-logic-apps'; +import { equals, format } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/common/exceptions/exception.ts b/libs/designer/src/lib/common/exceptions/exception.ts index c04e342ad93..57d34b2d103 100644 --- a/libs/designer/src/lib/common/exceptions/exception.ts +++ b/libs/designer/src/lib/common/exceptions/exception.ts @@ -1,6 +1,6 @@ import { getIntl } from '@microsoft/intl-logic-apps'; -import type { Exception } from '@microsoft/utils-logic-apps'; -import { isException } from '@microsoft/utils-logic-apps'; +import type { Exception } from '@microsoft/logic-apps-shared'; +import { isException } from '@microsoft/logic-apps-shared'; export function includeInnerExceptionMessage(error: Error | Exception): string { const intl = getIntl(); diff --git a/libs/designer/src/lib/common/exceptions/unsupported.ts b/libs/designer/src/lib/common/exceptions/unsupported.ts index 28723917bb6..234e52a3c60 100644 --- a/libs/designer/src/lib/common/exceptions/unsupported.ts +++ b/libs/designer/src/lib/common/exceptions/unsupported.ts @@ -1,4 +1,4 @@ -import { BaseException } from '@microsoft/utils-logic-apps'; +import { BaseException } from '@microsoft/logic-apps-shared'; export const UnsupportedExceptionName = 'Common.UnsupportedException'; diff --git a/libs/designer/src/lib/common/models/workflow.ts b/libs/designer/src/lib/common/models/workflow.ts index 0327e1d6e7d..95ef98b6f1c 100644 --- a/libs/designer/src/lib/common/models/workflow.ts +++ b/libs/designer/src/lib/common/models/workflow.ts @@ -1,4 +1,4 @@ -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; export interface Workflow { definition: LogicAppsV2.WorkflowDefinition; diff --git a/libs/designer/src/lib/common/utilities/error.ts b/libs/designer/src/lib/common/utilities/error.ts index a9c5037d90f..35ce6d64675 100644 --- a/libs/designer/src/lib/common/utilities/error.ts +++ b/libs/designer/src/lib/common/utilities/error.ts @@ -1,6 +1,6 @@ import constants from '../constants'; import { MessageBarType } from '@fluentui/react/lib/MessageBar'; -import { isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import { isNullOrUndefined } from '@microsoft/logic-apps-shared'; export interface ErrorProps { errorLevel?: MessageBarType; diff --git a/libs/designer/src/lib/core/BJSWorkflowProvider.tsx b/libs/designer/src/lib/core/BJSWorkflowProvider.tsx index 60d3980f6d3..825cb09352d 100644 --- a/libs/designer/src/lib/core/BJSWorkflowProvider.tsx +++ b/libs/designer/src/lib/core/BJSWorkflowProvider.tsx @@ -6,7 +6,7 @@ import { initializeServices } from './state/designerOptions/designerOptionsSlice import { initWorkflowKind, initRunInstance, initWorkflowSpec } from './state/workflow/workflowSlice'; import type { AppDispatch } from './store'; import { parseWorkflowKind } from './utils/workflow'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; import { useDeepCompareEffect } from '@react-hookz/web'; import React, { useContext, useEffect } from 'react'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/__test__/connections.spec.ts b/libs/designer/src/lib/core/actions/bjsworkflow/__test__/connections.spec.ts index af60c7bb818..de6f49e944c 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/__test__/connections.spec.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/__test__/connections.spec.ts @@ -12,8 +12,8 @@ import { OperationManifestService, } from '@microsoft/designer-client-services-logic-apps'; import { createItem } from '@microsoft/logic-apps-shared'; -import type { LogicAppsV2, OperationManifest } from '@microsoft/utils-logic-apps'; -import { ConnectionReferenceKeyFormat } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2, OperationManifest } from '@microsoft/logic-apps-shared'; +import { ConnectionReferenceKeyFormat } from '@microsoft/logic-apps-shared'; const nodeId = '1'; const connectionName = 'name123'; diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/__test__/initialize.mocks.ts b/libs/designer/src/lib/core/actions/bjsworkflow/__test__/initialize.mocks.ts index e38c100de07..8f425d23f48 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/__test__/initialize.mocks.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/__test__/initialize.mocks.ts @@ -1,4 +1,4 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; export const mockGetMyOffice365ProfileOpenApiManifest: OperationManifest = { properties: { diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/add.ts b/libs/designer/src/lib/core/actions/bjsworkflow/add.ts index 873303a8ee4..3bcbc284fd8 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/add.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/add.ts @@ -38,8 +38,8 @@ import type { DiscoveryResultTypes, OperationManifest, SomeKindOfAzureOperationDiscovery, -} from '@microsoft/utils-logic-apps'; -import { equals, getRecordEntry } from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; +import { equals, getRecordEntry } from '@microsoft/logic-apps-shared'; import type { Dispatch } from '@reduxjs/toolkit'; import { createAsyncThunk } from '@reduxjs/toolkit'; import { batch } from 'react-redux'; diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/connections.ts b/libs/designer/src/lib/core/actions/bjsworkflow/connections.ts index f2beba4ca2e..26015e19531 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/connections.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/connections.ts @@ -17,7 +17,7 @@ import { updateDynamicDataInNode } from '../../utils/parameters/helper'; import { getAllVariables } from '../../utils/variables'; import type { IOperationManifestService } from '@microsoft/designer-client-services-logic-apps'; import { ConnectionService, WorkflowService, OperationManifestService } from '@microsoft/designer-client-services-logic-apps'; -import type { Connection, ConnectionParameter, Connector, OperationManifest, LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { Connection, ConnectionParameter, Connector, OperationManifest, LogicAppsV2 } from '@microsoft/logic-apps-shared'; import { ResourceIdentityType, optional, @@ -26,7 +26,7 @@ import { equals, ConnectionReferenceKeyFormat, getRecordEntry, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import type { Dispatch } from '@reduxjs/toolkit'; import { createAsyncThunk } from '@reduxjs/toolkit'; diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/copypaste.ts b/libs/designer/src/lib/core/actions/bjsworkflow/copypaste.ts index fe3b948a1f2..89bfb35b583 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/copypaste.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/copypaste.ts @@ -7,7 +7,7 @@ import type { RelationshipIds } from '../../state/panel/panelInterfaces'; import { setIsPanelLoading } from '../../state/panel/panelSlice'; import { pasteNode } from '../../state/workflow/workflowSlice'; import { initializeOperationDetails } from './add'; -import { getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getRecordEntry } from '@microsoft/logic-apps-shared'; import { createAsyncThunk } from '@reduxjs/toolkit'; import { batch } from 'react-redux'; diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/delete.ts b/libs/designer/src/lib/core/actions/bjsworkflow/delete.ts index 5b733454c28..4f266ee331b 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/delete.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/delete.ts @@ -8,7 +8,7 @@ import { deinitializeStaticResultProperty } from '../../state/staticresultschema import { deinitializeTokensAndVariables } from '../../state/tokens/tokensSlice'; import { clearFocusNode, deleteNode } from '../../state/workflow/workflowSlice'; import { updateAllUpstreamNodes } from './initialize'; -import { WORKFLOW_NODE_TYPES } from '@microsoft/utils-logic-apps'; +import { WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared'; import type { Dispatch } from '@reduxjs/toolkit'; import { createAsyncThunk } from '@reduxjs/toolkit'; import { batch } from 'react-redux'; diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/initialize.ts b/libs/designer/src/lib/core/actions/bjsworkflow/initialize.ts index 3c86a7c0bff..0bcbb1d2563 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/initialize.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/initialize.ts @@ -68,13 +68,13 @@ import { ConnectionReferenceKeyFormat, unmap, getObjectPropertyValue, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import type { CustomSwaggerServiceDetails, OperationInfo, OperationManifest, OperationManifestProperties, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import type { Dispatch } from '@reduxjs/toolkit'; export interface ServiceOptions { diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/operationdeserializer.ts b/libs/designer/src/lib/core/actions/bjsworkflow/operationdeserializer.ts index 2a41c8b43ab..f598b4c759d 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/operationdeserializer.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/operationdeserializer.ts @@ -59,8 +59,8 @@ import { import { getIntl } from '@microsoft/intl-logic-apps'; import type { InputParameter, OutputParameter } from '@microsoft/logic-apps-shared'; import { ManifestParser } from '@microsoft/logic-apps-shared'; -import type { LogicAppsV2, OperationManifest } from '@microsoft/utils-logic-apps'; -import { isArmResourceId, uniqueArray, getPropertyValue, map, aggregate, equals, getRecordEntry } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2, OperationManifest } from '@microsoft/logic-apps-shared'; +import { isArmResourceId, uniqueArray, getPropertyValue, map, aggregate, equals, getRecordEntry } from '@microsoft/logic-apps-shared'; import type { Dispatch } from '@reduxjs/toolkit'; export interface NodeDataWithOperationMetadata extends NodeData { diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/serializer.ts b/libs/designer/src/lib/core/actions/bjsworkflow/serializer.ts index d5530a070dc..8b70d9eed6c 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/serializer.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/serializer.ts @@ -34,7 +34,7 @@ import { DeserializationType, PropertySerializationType, } from '@microsoft/logic-apps-shared'; -import type { LocationSwapMap, LogicAppsV2, OperationManifest, SubGraphDetail } from '@microsoft/utils-logic-apps'; +import type { LocationSwapMap, LogicAppsV2, OperationManifest, SubGraphDetail } from '@microsoft/logic-apps-shared'; import { SerializationErrorCode, SerializationException, @@ -57,7 +57,7 @@ import { filterRecord, excludePathValueFromTarget, getRecordEntry, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import merge from 'lodash.merge'; export interface SerializeOptions { diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/settings.ts b/libs/designer/src/lib/core/actions/bjsworkflow/settings.ts index fd9caf481fa..7a7f69ad27b 100644 --- a/libs/designer/src/lib/core/actions/bjsworkflow/settings.ts +++ b/libs/designer/src/lib/core/actions/bjsworkflow/settings.ts @@ -15,7 +15,7 @@ import type { OperationManifestSettings, SecureDataOptions, UploadChunkMetadata, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import { equals, getObjectPropertyValue, @@ -24,7 +24,7 @@ import { SettingScope, ValidationErrorCode, ValidationException, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; type OperationManifestSettingType = UploadChunkMetadata | DownloadChunkMetadata | SecureDataOptions | OperationOptions[] | void; diff --git a/libs/designer/src/lib/core/graphlayout/__test__/elklayout.spec.ts b/libs/designer/src/lib/core/graphlayout/__test__/elklayout.spec.ts index e6b4ea292d2..7d544e2914b 100644 --- a/libs/designer/src/lib/core/graphlayout/__test__/elklayout.spec.ts +++ b/libs/designer/src/lib/core/graphlayout/__test__/elklayout.spec.ts @@ -1,8 +1,8 @@ import type { WorkflowNode } from '../../parsers/models/workflowNode'; import { createWorkflowNode, createWorkflowEdge, createElkNode, createElkEdge } from '../../utils/graph'; import { exportForTesting } from '../elklayout'; -import type { WorkflowEdgeType } from '@microsoft/utils-logic-apps'; -import { WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES } from '@microsoft/utils-logic-apps'; +import type { WorkflowEdgeType } from '@microsoft/logic-apps-shared'; +import { WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES } from '@microsoft/logic-apps-shared'; import type { ElkNode } from 'elkjs/lib/elk-api'; import type { Edge, Node } from 'reactflow'; diff --git a/libs/designer/src/lib/core/graphlayout/elklayout.ts b/libs/designer/src/lib/core/graphlayout/elklayout.ts index 5c1c272d38a..4dc64cfd20a 100644 --- a/libs/designer/src/lib/core/graphlayout/elklayout.ts +++ b/libs/designer/src/lib/core/graphlayout/elklayout.ts @@ -3,7 +3,7 @@ import { isWorkflowNode } from '../parsers/models/workflowNode'; import { useReadOnly } from '../state/designerOptions/designerOptionsSelectors'; import { getRootWorkflowGraphForLayout } from '../state/workflow/workflowSelectors'; import { LogEntryLevel, LoggerService, Status } from '@microsoft/designer-client-services-logic-apps'; -import { useThrottledEffect, WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES } from '@microsoft/utils-logic-apps'; +import { useThrottledEffect, WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES } from '@microsoft/logic-apps-shared'; import type { ElkExtendedEdge, ElkNode } from 'elkjs/lib/elk.bundled'; import ELK from 'elkjs/lib/elk.bundled'; import { useState } from 'react'; diff --git a/libs/designer/src/lib/core/parsers/BJSWorkflow/BJSDeserializer.ts b/libs/designer/src/lib/core/parsers/BJSWorkflow/BJSDeserializer.ts index ad2804e7960..fd00e2663bd 100644 --- a/libs/designer/src/lib/core/parsers/BJSWorkflow/BJSDeserializer.ts +++ b/libs/designer/src/lib/core/parsers/BJSWorkflow/BJSDeserializer.ts @@ -7,7 +7,7 @@ import type { WorkflowNode, WorkflowEdge } from '../models/workflowNode'; import { LoggerService, Status } from '@microsoft/designer-client-services-logic-apps'; import { getDurationStringPanelMode } from '@microsoft/designer-ui'; import { getIntl } from '@microsoft/intl-logic-apps'; -import type { LogicAppsV2, SubgraphType } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2, SubgraphType } from '@microsoft/logic-apps-shared'; import { containsIdTag, WORKFLOW_NODE_TYPES, @@ -18,7 +18,7 @@ import { isNullOrUndefined, getUniqueName, getRecordEntry, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; const hasMultipleTriggers = (definition: LogicAppsV2.WorkflowDefinition): boolean => { return definition && definition.triggers ? Object.keys(definition.triggers).length > 1 : false; diff --git a/libs/designer/src/lib/core/parsers/BJSWorkflow/__test__/scopedWorkflowDefinition.ts b/libs/designer/src/lib/core/parsers/BJSWorkflow/__test__/scopedWorkflowDefinition.ts index 2fe9eaa69c1..efbc9ca2d13 100644 --- a/libs/designer/src/lib/core/parsers/BJSWorkflow/__test__/scopedWorkflowDefinition.ts +++ b/libs/designer/src/lib/core/parsers/BJSWorkflow/__test__/scopedWorkflowDefinition.ts @@ -1,7 +1,7 @@ import type { NodesMetadata, Operations } from '../../../state/workflow/workflowInterfaces'; import { createWorkflowNode, createWorkflowEdge } from '../../../utils/graph'; import type { WorkflowNode } from '../../models/workflowNode'; -import { SUBGRAPH_TYPES, WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES } from '@microsoft/utils-logic-apps'; +import { SUBGRAPH_TYPES, WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES } from '@microsoft/logic-apps-shared'; export const scopedWorkflowDefinitionInput = { $schema: 'https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#', diff --git a/libs/designer/src/lib/core/parsers/BJSWorkflow/__test__/simpleWorkflowDefinition.ts b/libs/designer/src/lib/core/parsers/BJSWorkflow/__test__/simpleWorkflowDefinition.ts index e21c96e1819..76725868281 100644 --- a/libs/designer/src/lib/core/parsers/BJSWorkflow/__test__/simpleWorkflowDefinition.ts +++ b/libs/designer/src/lib/core/parsers/BJSWorkflow/__test__/simpleWorkflowDefinition.ts @@ -1,7 +1,7 @@ import type { Operations, NodesMetadata } from '../../../state/workflow/workflowInterfaces'; import { createWorkflowNode, createWorkflowEdge } from '../../../utils/graph'; import type { WorkflowNode } from '../../models/workflowNode'; -import { WORKFLOW_NODE_TYPES } from '@microsoft/utils-logic-apps'; +import { WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared'; export const simpleWorkflowDefinitionInput = { $schema: 'https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#', diff --git a/libs/designer/src/lib/core/parsers/ParseReduxAction.ts b/libs/designer/src/lib/core/parsers/ParseReduxAction.ts index e623ecac102..433c3e6d20d 100644 --- a/libs/designer/src/lib/core/parsers/ParseReduxAction.ts +++ b/libs/designer/src/lib/core/parsers/ParseReduxAction.ts @@ -10,7 +10,7 @@ import type { DeserializedWorkflow } from './BJSWorkflow/BJSDeserializer'; import { Deserialize as BJSDeserialize } from './BJSWorkflow/BJSDeserializer'; import type { WorkflowNode } from './models/workflowNode'; import { LoggerService, Status } from '@microsoft/designer-client-services-logic-apps'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; import { createAsyncThunk } from '@reduxjs/toolkit'; import { batch } from 'react-redux'; diff --git a/libs/designer/src/lib/core/parsers/__test__/mocks/workflowMock.ts b/libs/designer/src/lib/core/parsers/__test__/mocks/workflowMock.ts index 22275e7a7ad..5e086c04622 100644 --- a/libs/designer/src/lib/core/parsers/__test__/mocks/workflowMock.ts +++ b/libs/designer/src/lib/core/parsers/__test__/mocks/workflowMock.ts @@ -1,6 +1,6 @@ import type { WorkflowState } from '../../../state/workflow/workflowInterfaces'; import type { WorkflowNode } from '../../models/workflowNode'; -import { WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES } from '@microsoft/utils-logic-apps'; +import { WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES } from '@microsoft/logic-apps-shared'; export const initialState: WorkflowState = { graph: { diff --git a/libs/designer/src/lib/core/parsers/addNodeToWorkflow.ts b/libs/designer/src/lib/core/parsers/addNodeToWorkflow.ts index 551e00f9427..06e7a96b0d2 100644 --- a/libs/designer/src/lib/core/parsers/addNodeToWorkflow.ts +++ b/libs/designer/src/lib/core/parsers/addNodeToWorkflow.ts @@ -5,7 +5,7 @@ import type { NodesMetadata, WorkflowState } from '../state/workflow/workflowInt import { createWorkflowNode, createWorkflowEdge } from '../utils/graph'; import type { WorkflowEdge, WorkflowNode } from './models/workflowNode'; import { reassignEdgeSources, reassignEdgeTargets, addNewEdge, applyIsRootNode, removeEdge } from './restructuringHelpers'; -import type { DiscoveryOperation, DiscoveryResultTypes, LogicAppsV2, SubgraphType } from '@microsoft/utils-logic-apps'; +import type { DiscoveryOperation, DiscoveryResultTypes, LogicAppsV2, SubgraphType } from '@microsoft/logic-apps-shared'; import { removeIdTag, SUBGRAPH_TYPES, @@ -13,7 +13,7 @@ import { isScopeOperation, WORKFLOW_NODE_TYPES, getRecordEntry, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; export interface AddNodePayload { operation: DiscoveryOperation; diff --git a/libs/designer/src/lib/core/parsers/deleteNodeFromWorkflow.ts b/libs/designer/src/lib/core/parsers/deleteNodeFromWorkflow.ts index 74eae831168..7084ab86484 100644 --- a/libs/designer/src/lib/core/parsers/deleteNodeFromWorkflow.ts +++ b/libs/designer/src/lib/core/parsers/deleteNodeFromWorkflow.ts @@ -2,7 +2,7 @@ import type { NodesMetadata, WorkflowState } from '../state/workflow/workflowInterfaces'; import type { WorkflowNode } from './models/workflowNode'; import { removeEdge, reassignEdgeSources, reassignEdgeTargets } from './restructuringHelpers'; -import { getRecordEntry, type LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import { getRecordEntry, type LogicAppsV2 } from '@microsoft/logic-apps-shared'; export interface DeleteNodePayload { nodeId: string; diff --git a/libs/designer/src/lib/core/parsers/models/workflowNode.ts b/libs/designer/src/lib/core/parsers/models/workflowNode.ts index 33a78d7999b..6649a56db22 100644 --- a/libs/designer/src/lib/core/parsers/models/workflowNode.ts +++ b/libs/designer/src/lib/core/parsers/models/workflowNode.ts @@ -1,5 +1,5 @@ -import type { WorkflowEdgeType, WorkflowNodeType } from '@microsoft/utils-logic-apps'; -import { WORKFLOW_NODE_TYPES } from '@microsoft/utils-logic-apps'; +import type { WorkflowEdgeType, WorkflowNodeType } from '@microsoft/logic-apps-shared'; +import { WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared'; export interface WorkflowNode { id: string; diff --git a/libs/designer/src/lib/core/parsers/moveNodeInWorkflow.ts b/libs/designer/src/lib/core/parsers/moveNodeInWorkflow.ts index 9b82c82dbe9..e9d9c4744f1 100644 --- a/libs/designer/src/lib/core/parsers/moveNodeInWorkflow.ts +++ b/libs/designer/src/lib/core/parsers/moveNodeInWorkflow.ts @@ -3,8 +3,8 @@ import type { RelationshipIds } from '../state/panel/panelInterfaces'; import type { NodesMetadata, WorkflowState } from '../state/workflow/workflowInterfaces'; import type { WorkflowNode } from './models/workflowNode'; import { addNewEdge, reassignEdgeSources, reassignEdgeTargets, removeEdge, applyIsRootNode } from './restructuringHelpers'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { containsIdTag, getRecordEntry } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { containsIdTag, getRecordEntry } from '@microsoft/logic-apps-shared'; export interface MoveNodePayload { nodeId: string; diff --git a/libs/designer/src/lib/core/parsers/restructuringHelpers.ts b/libs/designer/src/lib/core/parsers/restructuringHelpers.ts index 0002fd8d7b8..04bb25f9636 100644 --- a/libs/designer/src/lib/core/parsers/restructuringHelpers.ts +++ b/libs/designer/src/lib/core/parsers/restructuringHelpers.ts @@ -3,8 +3,8 @@ import constants from '../../common/constants'; import { isWorkflowOperationNode } from '../actions/bjsworkflow/serializer'; import type { NodesMetadata, WorkflowState } from '../state/workflow/workflowInterfaces'; import type { WorkflowEdge, WorkflowNode } from './models/workflowNode'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { containsIdTag, getRecordEntry, RUN_AFTER_STATUS, WORKFLOW_EDGE_TYPES } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { containsIdTag, getRecordEntry, RUN_AFTER_STATUS, WORKFLOW_EDGE_TYPES } from '@microsoft/logic-apps-shared'; /////////////////////////////////////////////////////////// // EDGES diff --git a/libs/designer/src/lib/core/queries/browse.ts b/libs/designer/src/lib/core/queries/browse.ts index 4103d4e240b..4c292c77f13 100644 --- a/libs/designer/src/lib/core/queries/browse.ts +++ b/libs/designer/src/lib/core/queries/browse.ts @@ -1,5 +1,5 @@ import { SearchService } from '@microsoft/designer-client-services-logic-apps'; -import { cleanConnectorId } from '@microsoft/utils-logic-apps'; +import { cleanConnectorId } from '@microsoft/logic-apps-shared'; import { useEffect, useMemo } from 'react'; import { useInfiniteQuery, useQuery } from 'react-query'; diff --git a/libs/designer/src/lib/core/queries/connections.ts b/libs/designer/src/lib/core/queries/connections.ts index 65b3c3eef2f..91306be54f2 100644 --- a/libs/designer/src/lib/core/queries/connections.ts +++ b/libs/designer/src/lib/core/queries/connections.ts @@ -1,8 +1,8 @@ import { getReactQueryClient } from '../ReactQueryProvider'; import { ConnectionService } from '@microsoft/designer-client-services-logic-apps'; import { SwaggerParser } from '@microsoft/logic-apps-shared'; -import type { Connector } from '@microsoft/utils-logic-apps'; -import { equals } from '@microsoft/utils-logic-apps'; +import type { Connector } from '@microsoft/logic-apps-shared'; +import { equals } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useQuery } from 'react-query'; diff --git a/libs/designer/src/lib/core/queries/connector.ts b/libs/designer/src/lib/core/queries/connector.ts index 47a84d7eaf9..b3c04521535 100644 --- a/libs/designer/src/lib/core/queries/connector.ts +++ b/libs/designer/src/lib/core/queries/connector.ts @@ -8,8 +8,8 @@ import type { import { ConnectorService } from '@microsoft/designer-client-services-logic-apps'; import type { FilePickerInfo, LegacyDynamicSchemaExtension, LegacyDynamicValuesExtension } from '@microsoft/logic-apps-shared'; import { Types } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { getPropertyValue, equals, getJSONValue, getObjectPropertyValue, isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { getPropertyValue, equals, getJSONValue, getObjectPropertyValue, isNullOrUndefined } from '@microsoft/logic-apps-shared'; export const getLegacyDynamicValues = async ( connectionId: string, diff --git a/libs/designer/src/lib/core/queries/operation.ts b/libs/designer/src/lib/core/queries/operation.ts index 36e9334b012..fb515958b07 100644 --- a/libs/designer/src/lib/core/queries/operation.ts +++ b/libs/designer/src/lib/core/queries/operation.ts @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { getReactQueryClient } from '../ReactQueryProvider'; import { ConnectionService, OperationManifestService } from '@microsoft/designer-client-services-logic-apps'; -import type { Connector, LogicAppsV2, OperationInfo, OperationManifest } from '@microsoft/utils-logic-apps'; +import type { Connector, LogicAppsV2, OperationInfo, OperationManifest } from '@microsoft/logic-apps-shared'; export const getOperationInfo = async ( nodeId: string, diff --git a/libs/designer/src/lib/core/state/__test__/workflowSlice.spec.ts b/libs/designer/src/lib/core/state/__test__/workflowSlice.spec.ts index 978534f8938..d9beb2eee0c 100644 --- a/libs/designer/src/lib/core/state/__test__/workflowSlice.spec.ts +++ b/libs/designer/src/lib/core/state/__test__/workflowSlice.spec.ts @@ -1,7 +1,7 @@ import { initialState } from '../../parsers/__test__/mocks/workflowMock'; import type { AddNodePayload } from '../../parsers/addNodeToWorkflow'; import reducer, { addNode } from '../workflow/workflowSlice'; -import { WORKFLOW_NODE_TYPES } from '@microsoft/utils-logic-apps'; +import { WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared'; describe('workflow slice reducers', () => { it('should add initial node to the workflow', () => { diff --git a/libs/designer/src/lib/core/state/connection/connectionSelector.ts b/libs/designer/src/lib/core/state/connection/connectionSelector.ts index 8b0b10802e7..f561e699f11 100644 --- a/libs/designer/src/lib/core/state/connection/connectionSelector.ts +++ b/libs/designer/src/lib/core/state/connection/connectionSelector.ts @@ -11,7 +11,7 @@ import { OperationManifestService, isServiceProviderOperation, } from '@microsoft/designer-client-services-logic-apps'; -import { getRecordEntry, type Connector } from '@microsoft/utils-logic-apps'; +import { getRecordEntry, type Connector } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useQuery } from 'react-query'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/core/state/connection/connectionSlice.ts b/libs/designer/src/lib/core/state/connection/connectionSlice.ts index 7d51753aaf9..1c60caa7fac 100644 --- a/libs/designer/src/lib/core/state/connection/connectionSlice.ts +++ b/libs/designer/src/lib/core/state/connection/connectionSlice.ts @@ -2,7 +2,7 @@ import type { ConnectionReferences } from '../../../common/models/workflow'; import type { UpdateConnectionPayload } from '../../actions/bjsworkflow/connections'; import { resetWorkflowState } from '../global'; import { LogEntryLevel, LoggerService } from '@microsoft/designer-client-services-logic-apps'; -import { deepCompareObjects, equals, getUniqueName } from '@microsoft/utils-logic-apps'; +import { deepCompareObjects, equals, getUniqueName } from '@microsoft/logic-apps-shared'; import { createSlice } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; diff --git a/libs/designer/src/lib/core/state/designerOptions/designerOptionsInterfaces.ts b/libs/designer/src/lib/core/state/designerOptions/designerOptionsInterfaces.ts index ac200912313..d7ea00dd2d1 100644 --- a/libs/designer/src/lib/core/state/designerOptions/designerOptionsInterfaces.ts +++ b/libs/designer/src/lib/core/state/designerOptions/designerOptionsInterfaces.ts @@ -17,7 +17,7 @@ import type { IConnectionParameterEditorService, IChatbotService, } from '@microsoft/designer-client-services-logic-apps'; -import type { LogicApps } from '@microsoft/utils-logic-apps'; +import type { LogicApps } from '@microsoft/logic-apps-shared'; type PANEL_TAB_NAMES = keyof typeof CONSTANTS.PANEL_TAB_NAMES; diff --git a/libs/designer/src/lib/core/state/operation/operationMetadataSlice.ts b/libs/designer/src/lib/core/state/operation/operationMetadataSlice.ts index 1ea9581702e..bf3d1f83ea2 100644 --- a/libs/designer/src/lib/core/state/operation/operationMetadataSlice.ts +++ b/libs/designer/src/lib/core/state/operation/operationMetadataSlice.ts @@ -9,7 +9,7 @@ import { resetNodesLoadStatus, resetWorkflowState } from '../global'; import { LogEntryLevel, LoggerService } from '@microsoft/designer-client-services-logic-apps'; import type { ParameterInfo, Token } from '@microsoft/designer-ui'; import type { FilePickerInfo, InputParameter, OutputParameter, SwaggerParser } from '@microsoft/logic-apps-shared'; -import { getRecordEntry, type OpenAPIV2, type OperationInfo } from '@microsoft/utils-logic-apps'; +import { getRecordEntry, type OpenAPIV2, type OperationInfo } from '@microsoft/logic-apps-shared'; import { createSlice } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; import type { WritableDraft } from 'immer/dist/internal'; diff --git a/libs/designer/src/lib/core/state/operation/operationSelector.ts b/libs/designer/src/lib/core/state/operation/operationSelector.ts index 19ae1d18eb7..566b75e4a91 100644 --- a/libs/designer/src/lib/core/state/operation/operationSelector.ts +++ b/libs/designer/src/lib/core/state/operation/operationSelector.ts @@ -5,7 +5,7 @@ import type { ErrorInfo, NodeDependencies, NodeInputs } from './operationMetadat import { ErrorLevel } from './operationMetadataSlice'; import type { NodeOutputs } from '@microsoft/designer-client-services-logic-apps'; import type { ParameterInfo } from '@microsoft/designer-ui'; -import { getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getRecordEntry } from '@microsoft/logic-apps-shared'; import { createSelector } from '@reduxjs/toolkit'; import { useMemo } from 'react'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/core/state/panel/panelSlice.ts b/libs/designer/src/lib/core/state/panel/panelSlice.ts index 4f42860fd0e..530ab329d0e 100644 --- a/libs/designer/src/lib/core/state/panel/panelSlice.ts +++ b/libs/designer/src/lib/core/state/panel/panelSlice.ts @@ -2,7 +2,7 @@ import { resetWorkflowState } from '../global'; import type { RelationshipIds, PanelState, PanelMode } from './panelInterfaces'; import { LogEntryLevel, LoggerService } from '@microsoft/designer-client-services-logic-apps'; import { PanelLocation } from '@microsoft/designer-ui'; -import { cleanConnectorId } from '@microsoft/utils-logic-apps'; +import { cleanConnectorId } from '@microsoft/logic-apps-shared'; import { createSlice } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; diff --git a/libs/designer/src/lib/core/state/selectors/__test__/actionMetadataSelector.spec.ts b/libs/designer/src/lib/core/state/selectors/__test__/actionMetadataSelector.spec.ts index 4e6e3908ec2..087f5dcfd88 100644 --- a/libs/designer/src/lib/core/state/selectors/__test__/actionMetadataSelector.spec.ts +++ b/libs/designer/src/lib/core/state/selectors/__test__/actionMetadataSelector.spec.ts @@ -1,7 +1,7 @@ import * as connectionSelector from '../../connection/connectionSelector'; import { useOperationDescription, useOperationDocumentation, useOperationSummary } from '../actionMetadataSelector'; import * as designerClientServices from '@microsoft/designer-client-services-logic-apps'; -import type { Connector, Documentation, OperationManifest } from '@microsoft/utils-logic-apps'; +import type { Connector, Documentation, OperationManifest } from '@microsoft/logic-apps-shared'; import * as reactQuery from 'react-query'; describe('actionMetadataSelector', () => { diff --git a/libs/designer/src/lib/core/state/selectors/actionMetadataSelector.ts b/libs/designer/src/lib/core/state/selectors/actionMetadataSelector.ts index e07af4bfdd5..3b334dc5ff8 100644 --- a/libs/designer/src/lib/core/state/selectors/actionMetadataSelector.ts +++ b/libs/designer/src/lib/core/state/selectors/actionMetadataSelector.ts @@ -5,9 +5,9 @@ import type { RootState } from '../../store'; import { useConnector, useConnectorAndSwagger, useNodeConnectionId } from '../connection/connectionSelector'; import type { NodeOperation } from '../operation/operationMetadataSlice'; import { OperationManifestService } from '@microsoft/designer-client-services-logic-apps'; -import type { Operation } from '@microsoft/logic-apps-shared'; +import type { LAOperation } from '@microsoft/logic-apps-shared'; import { SwaggerParser } from '@microsoft/logic-apps-shared'; -import { getObjectPropertyValue, getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getObjectPropertyValue, getRecordEntry } from '@microsoft/logic-apps-shared'; import { createSelector } from '@reduxjs/toolkit'; import { useMemo } from 'react'; import { useQuery } from 'react-query'; @@ -155,7 +155,7 @@ const useNodeAttributeOrSwagger = ( operationInfo: NodeOperation, propertyInManifest: string[], propertyInConnector: string[], - propertyInSwagger: keyof Operation, + propertyInSwagger: keyof LAOperation, options: { useManifest: boolean } ): QueryResult => { const { data: connectorData } = useConnectorAndSwagger(operationInfo?.connectorId, !options.useManifest); diff --git a/libs/designer/src/lib/core/state/setting/settingSelector.ts b/libs/designer/src/lib/core/state/setting/settingSelector.ts index bea908dc5f8..58c3c9299c7 100644 --- a/libs/designer/src/lib/core/state/setting/settingSelector.ts +++ b/libs/designer/src/lib/core/state/setting/settingSelector.ts @@ -1,5 +1,5 @@ import type { RootState } from '../../store'; -import { getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getRecordEntry } from '@microsoft/logic-apps-shared'; import { createSelector } from '@reduxjs/toolkit'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/core/state/staticresultschema/staticresultsSlice.ts b/libs/designer/src/lib/core/state/staticresultschema/staticresultsSlice.ts index b0e267c1a7e..3be31d81b87 100644 --- a/libs/designer/src/lib/core/state/staticresultschema/staticresultsSlice.ts +++ b/libs/designer/src/lib/core/state/staticresultschema/staticresultsSlice.ts @@ -1,16 +1,16 @@ import { resetWorkflowState } from '../global'; -import type { Schema } from '@microsoft/logic-apps-shared'; +import type { OpenApiSchema } from '@microsoft/logic-apps-shared'; import type { PayloadAction } from '@reduxjs/toolkit'; import { createSlice } from '@reduxjs/toolkit'; export interface StaticResultsState { - schemas: Record; // { [connectorid-operationid]: Schema } + schemas: Record; // { [connectorid-operationid]: Schema } properties: Record; // { [nodeId+0](propertyName): any } interface StaticResultsSchemaUpdateEvent { id: string; - schema: Schema; + schema: OpenApiSchema; } export const initialState: StaticResultsState = { diff --git a/libs/designer/src/lib/core/state/tokens/tokenSelectors.ts b/libs/designer/src/lib/core/state/tokens/tokenSelectors.ts index 54c2816fc5c..f0125488a9c 100644 --- a/libs/designer/src/lib/core/state/tokens/tokenSelectors.ts +++ b/libs/designer/src/lib/core/state/tokens/tokenSelectors.ts @@ -1,6 +1,6 @@ import type { RootState } from '../../store'; import type { TokensState } from './tokensSlice'; -import { getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getRecordEntry } from '@microsoft/logic-apps-shared'; import { createSelector } from '@reduxjs/toolkit'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/core/state/tokens/tokensSlice.ts b/libs/designer/src/lib/core/state/tokens/tokensSlice.ts index ba594be36d3..2820295b87e 100644 --- a/libs/designer/src/lib/core/state/tokens/tokensSlice.ts +++ b/libs/designer/src/lib/core/state/tokens/tokensSlice.ts @@ -1,7 +1,7 @@ import { resetWorkflowState } from '../global'; import { clearDynamicOutputs } from '../operation/operationMetadataSlice'; import type { OutputToken as Token } from '@microsoft/designer-ui'; -import { getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getRecordEntry } from '@microsoft/logic-apps-shared'; import { createSlice } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; diff --git a/libs/designer/src/lib/core/state/workflow/workflowInterfaces.ts b/libs/designer/src/lib/core/state/workflow/workflowInterfaces.ts index 170f1ad2663..050a2cc01dc 100644 --- a/libs/designer/src/lib/core/state/workflow/workflowInterfaces.ts +++ b/libs/designer/src/lib/core/state/workflow/workflowInterfaces.ts @@ -1,6 +1,6 @@ import type { WorkflowNode } from '../../parsers/models/workflowNode'; import type { MessageLevel } from '@microsoft/designer-ui'; -import type { LogicAppsV2, SubgraphType } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2, SubgraphType } from '@microsoft/logic-apps-shared'; export type SpecTypes = 'BJS' | 'CNCF'; diff --git a/libs/designer/src/lib/core/state/workflow/workflowSelectors.ts b/libs/designer/src/lib/core/state/workflow/workflowSelectors.ts index 650d74a335a..a8a4760f5b6 100644 --- a/libs/designer/src/lib/core/state/workflow/workflowSelectors.ts +++ b/libs/designer/src/lib/core/state/workflow/workflowSelectors.ts @@ -3,8 +3,8 @@ import type { WorkflowEdge, WorkflowNode } from '../../parsers/models/workflowNo import type { RootState } from '../../store'; import { createWorkflowEdge, getAllParentsForNode } from '../../utils/graph'; import type { NodesMetadata, WorkflowState } from './workflowInterfaces'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { labelCase, WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES, getRecordEntry } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { labelCase, WORKFLOW_NODE_TYPES, WORKFLOW_EDGE_TYPES, getRecordEntry } from '@microsoft/logic-apps-shared'; import { createSelector } from '@reduxjs/toolkit'; import { useMemo } from 'react'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/core/state/workflow/workflowSlice.ts b/libs/designer/src/lib/core/state/workflow/workflowSlice.ts index 49b773982c0..69bacd69a6c 100644 --- a/libs/designer/src/lib/core/state/workflow/workflowSlice.ts +++ b/libs/designer/src/lib/core/state/workflow/workflowSlice.ts @@ -25,8 +25,8 @@ import { getWorkflowNodeFromGraphState } from './workflowSelectors'; import { LogEntryLevel, LoggerService } from '@microsoft/designer-client-services-logic-apps'; import type { MessageLevel } from '@microsoft/designer-ui'; import { getDurationStringPanelMode } from '@microsoft/designer-ui'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { equals, getRecordEntry, RUN_AFTER_STATUS, WORKFLOW_EDGE_TYPES, WORKFLOW_NODE_TYPES } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { equals, getRecordEntry, RUN_AFTER_STATUS, WORKFLOW_EDGE_TYPES, WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared'; import { createSlice, isAnyOf } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; import type { NodeChange, NodeDimensionChange } from 'reactflow'; diff --git a/libs/designer/src/lib/core/state/workflowparameters/workflowparametersSlice.ts b/libs/designer/src/lib/core/state/workflowparameters/workflowparametersSlice.ts index aaf75b00904..008b8f31991 100644 --- a/libs/designer/src/lib/core/state/workflowparameters/workflowparametersSlice.ts +++ b/libs/designer/src/lib/core/state/workflowparameters/workflowparametersSlice.ts @@ -7,7 +7,7 @@ import { resetWorkflowState } from '../global'; import type { WorkflowParameterUpdateEvent } from '@microsoft/designer-ui'; import { UIConstants } from '@microsoft/designer-ui'; import { getIntl } from '@microsoft/intl-logic-apps'; -import { equals, getRecordEntry, guid } from '@microsoft/utils-logic-apps'; +import { equals, getRecordEntry, guid } from '@microsoft/logic-apps-shared'; import { createSlice } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; diff --git a/libs/designer/src/lib/core/utils/__test__/graph.spec.ts b/libs/designer/src/lib/core/utils/__test__/graph.spec.ts index 2cc744c597c..e208debe44d 100644 --- a/libs/designer/src/lib/core/utils/__test__/graph.spec.ts +++ b/libs/designer/src/lib/core/utils/__test__/graph.spec.ts @@ -1,5 +1,5 @@ import { createWorkflowEdge, createWorkflowNode, isRootNode, getAllNodesInsideNode, getUpstreamNodeIds, isRootNodeInGraph } from '../graph'; -import { WORKFLOW_NODE_TYPES } from '@microsoft/utils-logic-apps'; +import { WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared'; describe('Graph Utilities', () => { const graph = { diff --git a/libs/designer/src/lib/core/utils/__test__/outputs.spec.ts b/libs/designer/src/lib/core/utils/__test__/outputs.spec.ts index bcc4c607abd..2bc92cae5a3 100644 --- a/libs/designer/src/lib/core/utils/__test__/outputs.spec.ts +++ b/libs/designer/src/lib/core/utils/__test__/outputs.spec.ts @@ -1,7 +1,7 @@ import { getUpdatedManifestForSplitOn } from '../outputs'; import { onNewEmail } from '@microsoft/logic-apps-shared'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { ConnectionReferenceKeyFormat } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { ConnectionReferenceKeyFormat } from '@microsoft/logic-apps-shared'; describe('Outputs Utilities', () => { describe('getUpdatedManifestForSpiltOn', () => { diff --git a/libs/designer/src/lib/core/utils/__test__/tokens.spec.ts b/libs/designer/src/lib/core/utils/__test__/tokens.spec.ts index 60cc1cd4445..3f12950dec0 100644 --- a/libs/designer/src/lib/core/utils/__test__/tokens.spec.ts +++ b/libs/designer/src/lib/core/utils/__test__/tokens.spec.ts @@ -1,6 +1,6 @@ import { createWorkflowEdge, createWorkflowNode } from '../graph'; import { getTokenNodeIds } from '../tokens'; -import { WORKFLOW_NODE_TYPES } from '@microsoft/utils-logic-apps'; +import { WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared'; describe('Token Picker Utilities', () => { const graph = { diff --git a/libs/designer/src/lib/core/utils/card.ts b/libs/designer/src/lib/core/utils/card.ts index 5ea7c664953..6e45b7de98b 100644 --- a/libs/designer/src/lib/core/utils/card.ts +++ b/libs/designer/src/lib/core/utils/card.ts @@ -1,5 +1,5 @@ -import type { Connector, OperationManifest } from '@microsoft/utils-logic-apps'; -import { fallbackConnectorIconUrl } from '@microsoft/utils-logic-apps'; +import type { Connector, OperationManifest } from '@microsoft/logic-apps-shared'; +import { fallbackConnectorIconUrl } from '@microsoft/logic-apps-shared'; export function getBrandColorFromManifest(manifest: OperationManifest): string { return manifest.properties?.brandColor ?? getBrandColorFromConnector(manifest.properties?.connector); diff --git a/libs/designer/src/lib/core/utils/connectors/connections.ts b/libs/designer/src/lib/core/utils/connectors/connections.ts index e46c1c74b56..c82f41d428a 100644 --- a/libs/designer/src/lib/core/utils/connectors/connections.ts +++ b/libs/designer/src/lib/core/utils/connectors/connections.ts @@ -20,7 +20,7 @@ import type { Connector, ManagedIdentity, OperationManifest, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import { ConnectionParameterTypes, ResourceIdentityType, @@ -28,7 +28,7 @@ import { ConnectionType, getResourceName, getRecordEntry, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; export function getConnectionId(state: ConnectionsStoreState, nodeId: string): string { return getConnectionReference(state, nodeId)?.connection?.id ?? ''; diff --git a/libs/designer/src/lib/core/utils/graph.ts b/libs/designer/src/lib/core/utils/graph.ts index 599e7867d03..bf8b2eea64c 100644 --- a/libs/designer/src/lib/core/utils/graph.ts +++ b/libs/designer/src/lib/core/utils/graph.ts @@ -2,8 +2,15 @@ import { isWorkflowGraph } from '../parsers/models/workflowNode'; import type { WorkflowEdge, WorkflowNode } from '../parsers/models/workflowNode'; import type { NodesMetadata, Operations, WorkflowState } from '../state/workflow/workflowInterfaces'; import { isTemplateExpression } from '@microsoft/logic-apps-shared'; -import type { WorkflowEdgeType, WorkflowNodeType } from '@microsoft/utils-logic-apps'; -import { hasInvalidChars, startsWith, equals, WORKFLOW_EDGE_TYPES, WORKFLOW_NODE_TYPES, getRecordEntry } from '@microsoft/utils-logic-apps'; +import type { WorkflowEdgeType, WorkflowNodeType } from '@microsoft/logic-apps-shared'; +import { + hasInvalidChars, + startsWith, + equals, + WORKFLOW_EDGE_TYPES, + WORKFLOW_NODE_TYPES, + getRecordEntry, +} from '@microsoft/logic-apps-shared'; import type { ElkExtendedEdge, ElkNode } from 'elkjs'; export const isRootNodeInGraph = (nodeId: string, graphId: string, nodesMetadata: NodesMetadata): boolean => { diff --git a/libs/designer/src/lib/core/utils/loops.ts b/libs/designer/src/lib/core/utils/loops.ts index b74119589b6..3d02cbddcbd 100644 --- a/libs/designer/src/lib/core/utils/loops.ts +++ b/libs/designer/src/lib/core/utils/loops.ts @@ -45,8 +45,8 @@ import { parseEx, SegmentType, } from '@microsoft/logic-apps-shared'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { clone, equals, first, getRecordEntry, isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { clone, equals, first, getRecordEntry, isNullOrUndefined } from '@microsoft/logic-apps-shared'; import { createAsyncThunk } from '@reduxjs/toolkit'; interface ImplicitForeachArrayDetails { diff --git a/libs/designer/src/lib/core/utils/openapi/__test__/schema.test.ts b/libs/designer/src/lib/core/utils/openapi/__test__/schema.test.ts index 9f3aaebc041..38746aa5769 100644 --- a/libs/designer/src/lib/core/utils/openapi/__test__/schema.test.ts +++ b/libs/designer/src/lib/core/utils/openapi/__test__/schema.test.ts @@ -1,5 +1,5 @@ import { getTitleOrSummary, isOneOf } from '../schema'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; describe('OpenAPI schema utilities', () => { describe('getTitleOrSummary', () => { diff --git a/libs/designer/src/lib/core/utils/openapi/schema.ts b/libs/designer/src/lib/core/utils/openapi/schema.ts index c2c97cfacc0..100b6a4a6b7 100644 --- a/libs/designer/src/lib/core/utils/openapi/schema.ts +++ b/libs/designer/src/lib/core/utils/openapi/schema.ts @@ -1,5 +1,5 @@ import { ExtensionProperties as SwaggerExtensionProperties } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; export const getTitleOrSummary = (schema: OpenAPIV2.SchemaObject): string | undefined => { if (!schema) { diff --git a/libs/designer/src/lib/core/utils/outputs.ts b/libs/designer/src/lib/core/utils/outputs.ts index b955f023b59..6b8f30a5cc5 100644 --- a/libs/designer/src/lib/core/utils/outputs.ts +++ b/libs/designer/src/lib/core/utils/outputs.ts @@ -34,7 +34,7 @@ import type { ExpressionLiteral, OutputParameter, OutputParameters, - Schema, + OpenApiSchema, } from '@microsoft/logic-apps-shared'; import { create, @@ -46,7 +46,7 @@ import { isFunction, isStringLiteral, } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2, OperationManifest } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2, OperationManifest } from '@microsoft/logic-apps-shared'; import { ConnectionReferenceKeyFormat, getObjectPropertyValue, @@ -57,7 +57,7 @@ import { clone, equals, parseErrorMessage, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import type { Dispatch } from '@reduxjs/toolkit'; export const toOutputInfo = (output: OutputParameter): OutputInfo => { @@ -360,7 +360,7 @@ export const getUpdatedManifestForSchemaDependency = (manifest: OperationManifes const isRequestApiConnectionTrigger = !!updatedManifest.properties?.inputs?.properties?.schema?.['x-ms-editor-options']?.isRequestApiConnectionTrigger; - let schemaValue: Schema; + let schemaValue: OpenApiSchema; let shouldMerge: boolean; // if schema contains static object returned from RP, merge the current schema value and new schema value if ( diff --git a/libs/designer/src/lib/core/utils/parameters/casting.ts b/libs/designer/src/lib/core/utils/parameters/casting.ts index 06f6a325244..d54001f29c7 100644 --- a/libs/designer/src/lib/core/utils/parameters/casting.ts +++ b/libs/designer/src/lib/core/utils/parameters/casting.ts @@ -2,7 +2,7 @@ import Constants from '../../../common/constants'; import { getInterpolatedExpression } from './helper'; import { isTokenValueSegment } from './segment'; import type { ValueSegment } from '@microsoft/designer-ui'; -import { equals, format } from '@microsoft/utils-logic-apps'; +import { equals, format } from '@microsoft/logic-apps-shared'; /** * @arg {string} fromFormat - A string with the original format of the expression being cast. diff --git a/libs/designer/src/lib/core/utils/parameters/dynamicdata.ts b/libs/designer/src/lib/core/utils/parameters/dynamicdata.ts index fd84c031f87..45258d1145f 100644 --- a/libs/designer/src/lib/core/utils/parameters/dynamicdata.ts +++ b/libs/designer/src/lib/core/utils/parameters/dynamicdata.ts @@ -63,7 +63,7 @@ import { WildIndexSegment, replaceSubsegmentSeparator, } from '@microsoft/logic-apps-shared'; -import type { Connection, Connector, OpenAPIV2, OperationInfo, OperationManifest } from '@microsoft/utils-logic-apps'; +import type { Connection, Connector, OpenAPIV2, OperationInfo, OperationManifest } from '@microsoft/logic-apps-shared'; import { first, getObjectPropertyValue, @@ -84,7 +84,7 @@ import { map, copy, unmap, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; export async function getDynamicValues( dependencyInfo: DependencyInfo, diff --git a/libs/designer/src/lib/core/utils/parameters/helper.ts b/libs/designer/src/lib/core/utils/parameters/helper.ts index 97479a1e08a..dbae1900446 100644 --- a/libs/designer/src/lib/core/utils/parameters/helper.ts +++ b/libs/designer/src/lib/core/utils/parameters/helper.ts @@ -125,7 +125,7 @@ import { Visibility, PropertyName, } from '@microsoft/logic-apps-shared'; -import type { Exception, OpenAPIV2, OperationManifest, RecurrenceSetting } from '@microsoft/utils-logic-apps'; +import type { Exception, OpenAPIV2, OperationManifest, RecurrenceSetting } from '@microsoft/logic-apps-shared'; import { createCopy, deleteObjectProperties, @@ -153,7 +153,7 @@ import { nthLastIndexOf, parseErrorMessage, getRecordEntry, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import type { Dispatch } from '@reduxjs/toolkit'; // import { debounce } from 'lodash'; diff --git a/libs/designer/src/lib/core/utils/parameters/recurrence.ts b/libs/designer/src/lib/core/utils/parameters/recurrence.ts index d36bffe1746..28402775718 100644 --- a/libs/designer/src/lib/core/utils/parameters/recurrence.ts +++ b/libs/designer/src/lib/core/utils/parameters/recurrence.ts @@ -3,8 +3,8 @@ import { getReactQueryClient } from '../../ReactQueryProvider'; import { loadParameterValuesFromDefault, toParameterInfoMap } from './helper'; import type { ParameterInfo } from '@microsoft/designer-ui'; import { OutputMapKey, SchemaProcessor, toInputParameter } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2, RecurrenceSetting } from '@microsoft/utils-logic-apps'; -import { map, RecurrenceType } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2, RecurrenceSetting } from '@microsoft/logic-apps-shared'; +import { map, RecurrenceType } from '@microsoft/logic-apps-shared'; export interface Recurrence { frequency: string | undefined; diff --git a/libs/designer/src/lib/core/utils/parameters/segment.ts b/libs/designer/src/lib/core/utils/parameters/segment.ts index d49c6d60abe..a16b53bca43 100644 --- a/libs/designer/src/lib/core/utils/parameters/segment.ts +++ b/libs/designer/src/lib/core/utils/parameters/segment.ts @@ -13,7 +13,7 @@ import { isStringLiteral, isTemplateExpression, } from '@microsoft/logic-apps-shared'; -import { format, guid, isNullOrUndefined, startsWith, UnsupportedException } from '@microsoft/utils-logic-apps'; +import { format, guid, isNullOrUndefined, startsWith, UnsupportedException } from '@microsoft/logic-apps-shared'; /** * The options for value segment convertor. diff --git a/libs/designer/src/lib/core/utils/parameters/tokensegment.ts b/libs/designer/src/lib/core/utils/parameters/tokensegment.ts index 8302e5c0f14..3eaa43b949f 100644 --- a/libs/designer/src/lib/core/utils/parameters/tokensegment.ts +++ b/libs/designer/src/lib/core/utils/parameters/tokensegment.ts @@ -5,7 +5,7 @@ import { TokenType } from '@microsoft/designer-ui'; import type { ValueSegment } from '@microsoft/designer-ui'; import { encodePropertySegment, ExpressionType, isStringLiteral, OutputKeys, OutputSource } from '@microsoft/logic-apps-shared'; import type { Dereference, Expression, ExpressionFunction, ExpressionLiteral } from '@microsoft/logic-apps-shared'; -import { equals } from '@microsoft/utils-logic-apps'; +import { equals } from '@microsoft/logic-apps-shared'; /** * The token segment convertor. diff --git a/libs/designer/src/lib/core/utils/parameters/uncast.ts b/libs/designer/src/lib/core/utils/parameters/uncast.ts index 3e3510c10eb..3152e507492 100644 --- a/libs/designer/src/lib/core/utils/parameters/uncast.ts +++ b/libs/designer/src/lib/core/utils/parameters/uncast.ts @@ -1,6 +1,6 @@ import type { Expression, ExpressionFunction } from '@microsoft/logic-apps-shared'; import { isFunction, isStringLiteral } from '@microsoft/logic-apps-shared'; -import { equals } from '@microsoft/utils-logic-apps'; +import { equals } from '@microsoft/logic-apps-shared'; export interface UncastResult { expression: Expression; diff --git a/libs/designer/src/lib/core/utils/setting.ts b/libs/designer/src/lib/core/utils/setting.ts index 5acc69ef903..75a129c02fc 100644 --- a/libs/designer/src/lib/core/utils/setting.ts +++ b/libs/designer/src/lib/core/utils/setting.ts @@ -3,7 +3,7 @@ import type { Settings } from '../actions/bjsworkflow/settings'; import type { OperationMetadataState } from '../state/operation/operationMetadataSlice'; import type { WorkflowState } from '../state/workflow/workflowInterfaces'; import { getTriggerNodeId } from './graph'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; export function hasSecureOutputs(nodeType: string, allSettings: Settings | undefined): boolean { const { secureInputs, secureOutputs } = allSettings || {}; diff --git a/libs/designer/src/lib/core/utils/swagger/inputsbuilder.ts b/libs/designer/src/lib/core/utils/swagger/inputsbuilder.ts index d0ab3f60749..8a793fe00a3 100644 --- a/libs/designer/src/lib/core/utils/swagger/inputsbuilder.ts +++ b/libs/designer/src/lib/core/utils/swagger/inputsbuilder.ts @@ -30,7 +30,7 @@ import { replaceTemplatePlaceholders, startsWith, UnsupportedException, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; const operationPathDelimiter = ''; diff --git a/libs/designer/src/lib/core/utils/swagger/operation.ts b/libs/designer/src/lib/core/utils/swagger/operation.ts index feb0263641e..af0e1406962 100644 --- a/libs/designer/src/lib/core/utils/swagger/operation.ts +++ b/libs/designer/src/lib/core/utils/swagger/operation.ts @@ -29,7 +29,7 @@ import { } from '../parameters/helper'; import { loadInputValuesFromDefinition } from './inputsbuilder'; import { LogEntryLevel, LoggerService, StaticResultService } from '@microsoft/designer-client-services-logic-apps'; -import type { Operation, OutputParameter, SwaggerParser } from '@microsoft/logic-apps-shared'; +import type { LAOperation, OutputParameter, SwaggerParser } from '@microsoft/logic-apps-shared'; import { create, isDynamicSchemaExtension, @@ -37,8 +37,8 @@ import { removeConnectionPrefix, isTemplateExpression, } from '@microsoft/logic-apps-shared'; -import type { LogicAppsV2, OperationInfo } from '@microsoft/utils-logic-apps'; -import { copyArray, map, RecurrenceType, equals, parsePathnameAndQueryKeyFromUri, startsWith, unmap } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2, OperationInfo } from '@microsoft/logic-apps-shared'; +import { copyArray, map, RecurrenceType, equals, parsePathnameAndQueryKeyFromUri, startsWith, unmap } from '@microsoft/logic-apps-shared'; import type { Dispatch } from '@reduxjs/toolkit'; interface OperationInputInfo { @@ -333,8 +333,8 @@ export const getOperationIdFromDefinition = (operationInputInfo: OperationInputI return getOperationIdFromSwagger(operationInputInfo.method, path, operations); }; -function getOperationIdFromSwagger(operationMethod: string, operationPath: string, swaggerOperations: Operation[]): string | undefined { - const operations = copyArray(swaggerOperations) as Operation[]; +function getOperationIdFromSwagger(operationMethod: string, operationPath: string, swaggerOperations: LAOperation[]): string | undefined { + const operations = copyArray(swaggerOperations) as LAOperation[]; let operationId: string | undefined; const filteredOperations: any = operations diff --git a/libs/designer/src/lib/core/utils/tokens.ts b/libs/designer/src/lib/core/utils/tokens.ts index 19933254a4a..0130cf12802 100644 --- a/libs/designer/src/lib/core/utils/tokens.ts +++ b/libs/designer/src/lib/core/utils/tokens.ts @@ -39,8 +39,8 @@ import type { FunctionDefinition, OutputToken, Token, ValueSegment } from '@micr import { UIConstants, TemplateFunctions, TokenType, removeUTFExpressions } from '@microsoft/designer-ui'; import { getIntl } from '@microsoft/intl-logic-apps'; import { getKnownTitles, OutputKeys } from '@microsoft/logic-apps-shared'; -import type { BuiltInOutput, OperationManifest } from '@microsoft/utils-logic-apps'; -import { labelCase, unmap, equals, filterRecord, getRecordEntry } from '@microsoft/utils-logic-apps'; +import type { BuiltInOutput, OperationManifest } from '@microsoft/logic-apps-shared'; +import { labelCase, unmap, equals, filterRecord, getRecordEntry } from '@microsoft/logic-apps-shared'; export interface TokenGroup { id: string; diff --git a/libs/designer/src/lib/core/utils/validation.ts b/libs/designer/src/lib/core/utils/validation.ts index 0d88c87f4cf..1cee99b5b85 100644 --- a/libs/designer/src/lib/core/utils/validation.ts +++ b/libs/designer/src/lib/core/utils/validation.ts @@ -17,7 +17,7 @@ import { isStringLiteral, isTemplateExpression, } from '@microsoft/logic-apps-shared'; -import { capitalizeFirstLetter, endsWith, equals, startsWith } from '@microsoft/utils-logic-apps'; +import { capitalizeFirstLetter, endsWith, equals, startsWith } from '@microsoft/logic-apps-shared'; const regex = { datetime: diff --git a/libs/designer/src/lib/core/utils/variables.ts b/libs/designer/src/lib/core/utils/variables.ts index a4d4c7e636e..e2af27427a1 100644 --- a/libs/designer/src/lib/core/utils/variables.ts +++ b/libs/designer/src/lib/core/utils/variables.ts @@ -4,7 +4,7 @@ import type { NodeTokens, VariableDeclaration } from '../state/tokens/tokensSlic import { ParameterGroupKeys } from './parameters/helper'; import type { OutputToken as Token } from '@microsoft/designer-ui'; import { TokenType } from '@microsoft/designer-ui'; -import { aggregate, getRecordEntry } from '@microsoft/utils-logic-apps'; +import { aggregate, getRecordEntry } from '@microsoft/logic-apps-shared'; let variableIcon = ''; let variableBrandColor = ''; diff --git a/libs/designer/src/lib/core/utils/workflow.ts b/libs/designer/src/lib/core/utils/workflow.ts index 89b80b97fdc..f4015fb7450 100644 --- a/libs/designer/src/lib/core/utils/workflow.ts +++ b/libs/designer/src/lib/core/utils/workflow.ts @@ -1,5 +1,5 @@ import { WorkflowKind } from '../state/workflow/workflowInterfaces'; -import { equals } from '@microsoft/utils-logic-apps'; +import { equals } from '@microsoft/logic-apps-shared'; export const parseWorkflowKind = (kind?: string): WorkflowKind => { if (equals(kind, 'stateful')) return WorkflowKind.STATEFUL; diff --git a/libs/designer/src/lib/ui/CustomNodes/GraphContainerNode.tsx b/libs/designer/src/lib/ui/CustomNodes/GraphContainerNode.tsx index 1833d3cc197..158fc2eb343 100644 --- a/libs/designer/src/lib/ui/CustomNodes/GraphContainerNode.tsx +++ b/libs/designer/src/lib/ui/CustomNodes/GraphContainerNode.tsx @@ -4,7 +4,7 @@ import { useActionMetadata, useIsLeafNode, useNodeMetadata } from '../../core/st import { DropZone } from '../connections/dropzone'; import { css } from '@fluentui/react'; import { GraphContainer } from '@microsoft/designer-ui'; -import { SUBGRAPH_TYPES } from '@microsoft/utils-logic-apps'; +import { SUBGRAPH_TYPES } from '@microsoft/logic-apps-shared'; import { memo } from 'react'; import { Handle, Position } from 'reactflow'; import type { NodeProps } from 'reactflow'; diff --git a/libs/designer/src/lib/ui/CustomNodes/OperationCardNode.tsx b/libs/designer/src/lib/ui/CustomNodes/OperationCardNode.tsx index 1c28325ee7a..b6c8197de5d 100644 --- a/libs/designer/src/lib/ui/CustomNodes/OperationCardNode.tsx +++ b/libs/designer/src/lib/ui/CustomNodes/OperationCardNode.tsx @@ -54,7 +54,7 @@ import { MessageBarType } from '@fluentui/react'; import { Tooltip } from '@fluentui/react-components'; import { RunService, WorkflowService } from '@microsoft/designer-client-services-logic-apps'; import { Card } from '@microsoft/designer-ui'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; import { memo, useCallback, useEffect, useMemo, useState } from 'react'; import { useDrag } from 'react-dnd'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/CustomNodes/PlaceholderNode.tsx b/libs/designer/src/lib/ui/CustomNodes/PlaceholderNode.tsx index d2c2206d153..3ee9867e543 100644 --- a/libs/designer/src/lib/ui/CustomNodes/PlaceholderNode.tsx +++ b/libs/designer/src/lib/ui/CustomNodes/PlaceholderNode.tsx @@ -4,7 +4,7 @@ import { useReadOnly } from '../../core/state/designerOptions/designerOptionsSel import { useIsNodeSelected } from '../../core/state/panel/panelSelectors'; import { expandDiscoveryPanel } from '../../core/state/panel/panelSlice'; import { AddActionCard, ADD_CARD_TYPE, NoActionCard } from '@microsoft/designer-ui'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { memo, useCallback } from 'react'; import { useDispatch } from 'react-redux'; import { Handle, Position } from 'reactflow'; diff --git a/libs/designer/src/lib/ui/CustomNodes/ScopeCardNode.tsx b/libs/designer/src/lib/ui/CustomNodes/ScopeCardNode.tsx index a44daab5c4b..70e6f6e9574 100644 --- a/libs/designer/src/lib/ui/CustomNodes/ScopeCardNode.tsx +++ b/libs/designer/src/lib/ui/CustomNodes/ScopeCardNode.tsx @@ -30,8 +30,8 @@ import { ResubmitMenuItem } from '../menuItems/resubmitMenuItem'; import { MessageBarType } from '@fluentui/react'; import { RunService, WorkflowService } from '@microsoft/designer-client-services-logic-apps'; import { ScopeCard } from '@microsoft/designer-ui'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { removeIdTag } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { removeIdTag } from '@microsoft/logic-apps-shared'; import { memo, useCallback, useEffect, useMemo } from 'react'; import { useDrag } from 'react-dnd'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/CustomNodes/SubgraphCardNode.tsx b/libs/designer/src/lib/ui/CustomNodes/SubgraphCardNode.tsx index 561dce2f753..47d11228746 100644 --- a/libs/designer/src/lib/ui/CustomNodes/SubgraphCardNode.tsx +++ b/libs/designer/src/lib/ui/CustomNodes/SubgraphCardNode.tsx @@ -22,7 +22,7 @@ import { LoopsPager } from '../common/LoopsPager/LoopsPager'; import { DropZone } from '../connections/dropzone'; import { DeleteMenuItem } from '../menuItems/deleteMenuItem'; import { SubgraphCard } from '@microsoft/designer-ui'; -import { SUBGRAPH_TYPES, removeIdTag } from '@microsoft/utils-logic-apps'; +import { SUBGRAPH_TYPES, removeIdTag } from '@microsoft/logic-apps-shared'; import { memo, useCallback, useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/Designer.tsx b/libs/designer/src/lib/ui/Designer.tsx index c41f0e6e9f2..dfaed50f7c0 100644 --- a/libs/designer/src/lib/ui/Designer.tsx +++ b/libs/designer/src/lib/ui/Designer.tsx @@ -24,8 +24,8 @@ import { PanelRoot } from './panel/panelRoot'; import { css, setLayerHostSelector } from '@fluentui/react'; import { PanelLocation } from '@microsoft/designer-ui'; import type { CustomPanelLocation } from '@microsoft/designer-ui'; -import type { WorkflowNodeType } from '@microsoft/utils-logic-apps'; -import { useWindowDimensions, WORKFLOW_NODE_TYPES, useThrottledEffect } from '@microsoft/utils-logic-apps'; +import type { WorkflowNodeType } from '@microsoft/logic-apps-shared'; +import { useWindowDimensions, WORKFLOW_NODE_TYPES, useThrottledEffect } from '@microsoft/logic-apps-shared'; import type { CSSProperties } from 'react'; import { useCallback, useEffect, useMemo, useState } from 'react'; import KeyboardBackendFactory, { isKeyboardDragTrigger } from 'react-dnd-accessible-backend'; diff --git a/libs/designer/src/lib/ui/Minimap.tsx b/libs/designer/src/lib/ui/Minimap.tsx index 7c1950f7c14..bf7b0adda97 100644 --- a/libs/designer/src/lib/ui/Minimap.tsx +++ b/libs/designer/src/lib/ui/Minimap.tsx @@ -1,6 +1,6 @@ import { useShowMinimap } from '../core/state/designerView/designerViewSelectors'; import { useTheme } from '@fluentui/react'; -import type { WorkflowNodeType } from '@microsoft/utils-logic-apps'; +import type { WorkflowNodeType } from '@microsoft/logic-apps-shared'; import { useMemo, useCallback } from 'react'; import type { XYPosition } from 'reactflow'; import { MiniMap, useReactFlow } from 'reactflow'; diff --git a/libs/designer/src/lib/ui/ThemeObservable.tsx b/libs/designer/src/lib/ui/ThemeObservable.tsx index 008273a0262..d862fbabfb2 100644 --- a/libs/designer/src/lib/ui/ThemeObservable.tsx +++ b/libs/designer/src/lib/ui/ThemeObservable.tsx @@ -1,4 +1,4 @@ -import { Theme } from '@microsoft/utils-logic-apps'; +import { Theme } from '@microsoft/logic-apps-shared'; import { useEffect } from 'react'; export const getTheme = (element: HTMLElement): Theme => { diff --git a/libs/designer/src/lib/ui/common/DeleteModal/DeleteModal.tsx b/libs/designer/src/lib/ui/common/DeleteModal/DeleteModal.tsx index ebc7353a911..9a4ea48206b 100644 --- a/libs/designer/src/lib/ui/common/DeleteModal/DeleteModal.tsx +++ b/libs/designer/src/lib/ui/common/DeleteModal/DeleteModal.tsx @@ -6,7 +6,7 @@ import { setShowDeleteModal } from '../../../core/state/designerView/designerVie import { useWorkflowNode } from '../../../core/state/workflow/workflowSelectors'; import { deleteSwitchCase } from '../../../core/state/workflow/workflowSlice'; import { DeleteNodeModal } from '@microsoft/designer-ui'; -import { WORKFLOW_NODE_TYPES, removeIdTag } from '@microsoft/utils-logic-apps'; +import { WORKFLOW_NODE_TYPES, removeIdTag } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo } from 'react'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/common/LoopsPager/LoopsPager.tsx b/libs/designer/src/lib/ui/common/LoopsPager/LoopsPager.tsx index 9a16bb08f27..ae67e00bd6b 100644 --- a/libs/designer/src/lib/ui/common/LoopsPager/LoopsPager.tsx +++ b/libs/designer/src/lib/ui/common/LoopsPager/LoopsPager.tsx @@ -6,7 +6,7 @@ import { getForeachItemsCount } from './helper'; import { RunService } from '@microsoft/designer-client-services-logic-apps'; import type { PageChangeEventArgs, PageChangeEventHandler } from '@microsoft/designer-ui'; import { Pager } from '@microsoft/designer-ui'; -import { FindPreviousAndNextPage, isNullOrUndefined, type LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import { FindPreviousAndNextPage, isNullOrUndefined, type LogicAppsV2 } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useState } from 'react'; import { useQuery } from 'react-query'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/common/LoopsPager/helper.ts b/libs/designer/src/lib/ui/common/LoopsPager/helper.ts index c389f66a35f..851cd8a49d4 100644 --- a/libs/designer/src/lib/ui/common/LoopsPager/helper.ts +++ b/libs/designer/src/lib/ui/common/LoopsPager/helper.ts @@ -2,7 +2,7 @@ import constants from '../../../common/constants'; import type { NodeOperation } from '../../../core/state/operation/operationMetadataSlice'; import type { NodesMetadata } from '../../../core/state/workflow/workflowInterfaces'; import { getAllParentsForNode } from '../../../core/utils/graph'; -import { getRecordEntry, type LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import { getRecordEntry, type LogicAppsV2 } from '@microsoft/logic-apps-shared'; /** * Gets number of loops for loop nodes. diff --git a/libs/designer/src/lib/ui/connections/dropzone.tsx b/libs/designer/src/lib/ui/connections/dropzone.tsx index df787c8f9c0..81941637c46 100644 --- a/libs/designer/src/lib/ui/connections/dropzone.tsx +++ b/libs/designer/src/lib/ui/connections/dropzone.tsx @@ -19,7 +19,7 @@ import { // import AddNodeIcon from './edgeContextMenuSvgs/addNodeIcon.svg'; import { css } from '@fluentui/utilities'; import { ActionButtonV2, convertUIElementNameToAutomationId } from '@microsoft/designer-ui'; -import { containsIdTag, guid, normalizeAutomationId, removeIdTag } from '@microsoft/utils-logic-apps'; +import { containsIdTag, guid, normalizeAutomationId, removeIdTag } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo, useState } from 'react'; import { useDrop } from 'react-dnd'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/connections/edge.tsx b/libs/designer/src/lib/ui/connections/edge.tsx index ddaee2454c3..4c60aef3813 100644 --- a/libs/designer/src/lib/ui/connections/edge.tsx +++ b/libs/designer/src/lib/ui/connections/edge.tsx @@ -3,8 +3,8 @@ import { useActionMetadata, useNodeEdgeTargets, useNodeMetadata } from '../../co import { DropZone } from './dropzone'; import { ArrowCap } from './dynamicsvgs/arrowCap'; import { RunAfterIndicator } from './runAfterIndicator'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { containsIdTag, removeIdTag, getEdgeCenter, RUN_AFTER_STATUS } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { containsIdTag, removeIdTag, getEdgeCenter, RUN_AFTER_STATUS } from '@microsoft/logic-apps-shared'; import type { ElkExtendedEdge } from 'elkjs/lib/elk-api'; import React, { memo, useMemo } from 'react'; import { getSmoothStepPath, useReactFlow } from 'reactflow'; diff --git a/libs/designer/src/lib/ui/connections/runAfterIndicator/index.tsx b/libs/designer/src/lib/ui/connections/runAfterIndicator/index.tsx index 09e8897ef41..b7090e1d3c0 100644 --- a/libs/designer/src/lib/ui/connections/runAfterIndicator/index.tsx +++ b/libs/designer/src/lib/ui/connections/runAfterIndicator/index.tsx @@ -1,7 +1,7 @@ import { Text, useTheme } from '@fluentui/react'; import { Tooltip } from '@fluentui/react-components'; import { EmptyTrafficLightDot, Failed, Skipped, Succeeded, TimedOut, TrafficLightDot } from '@microsoft/designer-ui'; -import { idDisplayCase, RUN_AFTER_COLORS, RUN_AFTER_STATUS } from '@microsoft/utils-logic-apps'; +import { idDisplayCase, RUN_AFTER_COLORS, RUN_AFTER_STATUS } from '@microsoft/logic-apps-shared'; import { useCallback } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/menuItems/copyMenuItem.tsx b/libs/designer/src/lib/ui/menuItems/copyMenuItem.tsx index 7e7baf3851a..75cde4e7775 100644 --- a/libs/designer/src/lib/ui/menuItems/copyMenuItem.tsx +++ b/libs/designer/src/lib/ui/menuItems/copyMenuItem.tsx @@ -1,6 +1,6 @@ import { MenuItem } from '@fluentui/react-components'; import { bundleIcon, Clipboard24Filled, Clipboard24Regular } from '@fluentui/react-icons'; -import { isApple } from '@microsoft/utils-logic-apps'; +import { isApple } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; const CopyIcon = bundleIcon(Clipboard24Filled, Clipboard24Regular); diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/allConnections.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/allConnections.tsx index 54d6953dbfd..5622fb7751a 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/allConnections.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/allConnections.tsx @@ -8,7 +8,7 @@ import { import { useConnector } from '../../../../core/state/connection/connectionSelector'; import { ConnectorConnectionsCard } from './connectorConnectionsCard'; import { Accordion, AccordionItem, type AccordionToggleEventHandler } from '@fluentui/react-components'; -import { getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getRecordEntry } from '@microsoft/logic-apps-shared'; import { useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/connectionEntry.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/connectionEntry.tsx index 9193d0be418..d226534535e 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/connectionEntry.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/connectionEntry.tsx @@ -11,7 +11,7 @@ import { PlugDisconnected24Filled, } from '@fluentui/react-icons'; import { HostService } from '@microsoft/designer-client-services-logic-apps'; -import { getConnectionErrors } from '@microsoft/utils-logic-apps'; +import { getConnectionErrors } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/connectorConnectionsCard.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/connectorConnectionsCard.tsx index 941f4d10359..5fc323eb880 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/connectorConnectionsCard.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/allConnections/connectorConnectionsCard.tsx @@ -2,7 +2,7 @@ import { useAllConnectionErrors } from '../../../../core'; import { ConnectionEntry } from './connectionEntry'; import { Text, AccordionHeader, AccordionPanel, Spinner, Badge } from '@fluentui/react-components'; import { getConnectorCategoryString } from '@microsoft/designer-ui'; -import { fallbackConnectorIconUrl, isBuiltInConnector } from '@microsoft/utils-logic-apps'; +import { fallbackConnectorIconUrl, isBuiltInConnector } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; export interface ConnectorConnectionsCardProps { diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/_test__/createConnection.spec.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/_test__/createConnection.spec.tsx index e03e1a02f77..ea21a9c8f51 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/_test__/createConnection.spec.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/_test__/createConnection.spec.tsx @@ -8,7 +8,7 @@ import { InitConnectionService, StandardConnectionService, } from '@microsoft/designer-client-services-logic-apps'; -import type { ConnectionParameter, ConnectionParameterSets } from '@microsoft/utils-logic-apps'; +import type { ConnectionParameter, ConnectionParameterSets } from '@microsoft/logic-apps-shared'; import React, { type ReactElement } from 'react'; import * as ReactShallowRenderer from 'react-test-renderer/shallow'; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnection.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnection.tsx index a114d50da43..aabc1d03069 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnection.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnection.tsx @@ -23,7 +23,7 @@ import type { Gateway, ManagedIdentity, Subscription, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import { Capabilities, ConnectionParameterTypes, @@ -35,7 +35,7 @@ import { getPropertyValue, isServicePrinicipalConnectionParameter, usesLegacyManagedIdentity, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import fromPairs from 'lodash.frompairs'; import type { FormEvent } from 'react'; import { useCallback, useEffect, useMemo, useState } from 'react'; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnectionWrapper.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnectionWrapper.tsx index 2f0889d6fda..a8da35fdcdf 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnectionWrapper.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnectionWrapper.tsx @@ -37,7 +37,7 @@ import { type ConnectionParameterSetValues, type Connector, type ManagedIdentity, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import { useCallback, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/connectionMultiAuth.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/connectionMultiAuth.tsx index d506d04f06e..9a04e8f4e87 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/connectionMultiAuth.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/connectionMultiAuth.tsx @@ -1,5 +1,5 @@ import { Label, Dropdown } from '@fluentui/react'; -import type { ConnectionParameterSets } from '@microsoft/utils-logic-apps'; +import type { ConnectionParameterSets } from '@microsoft/logic-apps-shared'; import type { FormEvent } from 'react'; export interface ConnectionMultiAuthInputProps { diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/gatewayPicker.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/gatewayPicker.tsx index aad7487f837..8b9b5db520d 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/gatewayPicker.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/gatewayPicker.tsx @@ -1,6 +1,6 @@ import type { IDropdownOption } from '@fluentui/react'; import { Dropdown } from '@fluentui/react'; -import type { Gateway, Subscription } from '@microsoft/utils-logic-apps'; +import type { Gateway, Subscription } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/legacyManagedIdentityPicker.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/legacyManagedIdentityPicker.tsx index b814d091ffa..93b3d3ce66e 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/legacyManagedIdentityPicker.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/legacyManagedIdentityPicker.tsx @@ -1,5 +1,5 @@ import { Dropdown, type IDropdownOption } from '@fluentui/react'; -import { getIdentityDropdownOptions, type ManagedIdentity } from '@microsoft/utils-logic-apps'; +import { getIdentityDropdownOptions, type ManagedIdentity } from '@microsoft/logic-apps-shared'; import { useEffect, useMemo } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/universalConnectionParameter.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/universalConnectionParameter.tsx index fe0f5c06ce3..940988012ef 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/universalConnectionParameter.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/formInputs/universalConnectionParameter.tsx @@ -2,8 +2,8 @@ import { ConnectionParameterRow } from '../connectionParameterRow'; import GatewayPicker from './gatewayPicker'; import type { IDropdownOption } from '@fluentui/react'; import { Checkbox, Dropdown, TextField } from '@fluentui/react'; -import type { ConnectionParameter, ConnectionParameterAllowedValue } from '@microsoft/utils-logic-apps'; -import { ConnectionParameterTypes } from '@microsoft/utils-logic-apps'; +import type { ConnectionParameter, ConnectionParameterAllowedValue } from '@microsoft/logic-apps-shared'; +import { ConnectionParameterTypes } from '@microsoft/logic-apps-shared'; export interface ConnectionParameterProps { parameterKey: string; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/selectConnection/connectionTable.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/selectConnection/connectionTable.tsx index 9691035652a..16dddfbb141 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/selectConnection/connectionTable.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/selectConnection/connectionTable.tsx @@ -9,8 +9,8 @@ import { DataGridRow, createTableColumn, } from '@fluentui/react-components'; -import type { Connection } from '@microsoft/utils-logic-apps'; -import { getConnectionErrors, getIdLeaf } from '@microsoft/utils-logic-apps'; +import type { Connection } from '@microsoft/logic-apps-shared'; +import { getConnectionErrors, getIdLeaf } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/panel/connectionsPanel/selectConnection/selectConnection.tsx b/libs/designer/src/lib/ui/panel/connectionsPanel/selectConnection/selectConnection.tsx index fe1d8aa2903..6202304d05e 100644 --- a/libs/designer/src/lib/ui/panel/connectionsPanel/selectConnection/selectConnection.tsx +++ b/libs/designer/src/lib/ui/panel/connectionsPanel/selectConnection/selectConnection.tsx @@ -10,7 +10,7 @@ import { ConnectionTable } from './connectionTable'; import { MessageBar, MessageBarType } from '@fluentui/react'; import { Body1Strong, Button, Divider, Spinner } from '@fluentui/react-components'; import { ConnectionService } from '@microsoft/designer-client-services-logic-apps'; -import { type Connection, type Connector } from '@microsoft/utils-logic-apps'; +import { type Connection, type Connector } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/errorsPanel/tabs/errorsTab.tsx b/libs/designer/src/lib/ui/panel/errorsPanel/tabs/errorsTab.tsx index b588b1f9d0d..74478d36d84 100644 --- a/libs/designer/src/lib/ui/panel/errorsPanel/tabs/errorsTab.tsx +++ b/libs/designer/src/lib/ui/panel/errorsPanel/tabs/errorsTab.tsx @@ -15,7 +15,7 @@ import { import { Text } from '@fluentui/react'; import type { NodeMessage } from '@microsoft/designer-ui'; import { MessageLevel } from '@microsoft/designer-ui'; -import { getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getRecordEntry } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/errorsPanel/tabs/warningsTab.tsx b/libs/designer/src/lib/ui/panel/errorsPanel/tabs/warningsTab.tsx index c85bddac2d9..70cf81ef5e8 100644 --- a/libs/designer/src/lib/ui/panel/errorsPanel/tabs/warningsTab.tsx +++ b/libs/designer/src/lib/ui/panel/errorsPanel/tabs/warningsTab.tsx @@ -3,7 +3,7 @@ import { NodeErrors } from '../nodeErrors'; import { useHostCheckerWarnings, useTotalNumWarnings } from './warningsTab.hooks'; import { Text } from '@fluentui/react'; import { MessageLevel } from '@microsoft/designer-ui'; -import { getRecordEntry } from '@microsoft/utils-logic-apps'; +import { getRecordEntry } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; export const WarningsTab = () => { diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/nodeDetailsPanel.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/nodeDetailsPanel.tsx index 1d66e9ad272..f7ba117cd40 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/nodeDetailsPanel.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/nodeDetailsPanel.tsx @@ -24,7 +24,7 @@ import { usePanelTabs } from './usePanelTabs'; import { WorkflowService } from '@microsoft/designer-client-services-logic-apps'; import type { CommonPanelProps, PageActionTelemetryData } from '@microsoft/designer-ui'; import { PanelContainer, PanelLocation, PanelScope, PanelSize } from '@microsoft/designer-ui'; -import { isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import { isNullOrUndefined } from '@microsoft/logic-apps-shared'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/codeViewTab.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/codeViewTab.tsx index 9966c2b4bee..4fe249f78c6 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/codeViewTab.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/codeViewTab.tsx @@ -5,7 +5,7 @@ import { useActionMetadata } from '../../../../core/state/workflow/workflowSelec import type { RootState } from '../../../../core/store'; import type { PanelTabFn } from '@microsoft/designer-ui'; import { Peek } from '@microsoft/designer-ui'; -import { isNullOrEmpty } from '@microsoft/utils-logic-apps'; +import { isNullOrEmpty } from '@microsoft/logic-apps-shared'; import { useQuery } from 'react-query'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/inputsPanel.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/inputsPanel.tsx index 5a9d529cac1..b888f375227 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/inputsPanel.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/inputsPanel.tsx @@ -1,7 +1,7 @@ import { HostService, ContentType } from '@microsoft/designer-client-services-logic-apps'; import { SecureDataSection, ValuesPanel } from '@microsoft/designer-ui'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { isNullOrUndefined } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/monitoringTab.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/monitoringTab.tsx index f0b4bb24454..b8f5dcf586a 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/monitoringTab.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/monitoringTab.tsx @@ -9,7 +9,7 @@ import { PropertiesPanel } from './propertiesPanel'; import { RunService } from '@microsoft/designer-client-services-logic-apps'; import { ErrorSection } from '@microsoft/designer-ui'; import type { PanelTabFn } from '@microsoft/designer-ui'; -import { isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import { isNullOrUndefined } from '@microsoft/logic-apps-shared'; import { useEffect } from 'react'; import { useQuery } from 'react-query'; diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/outputsPanel.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/outputsPanel.tsx index c09b6bc608d..59888b85cf4 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/outputsPanel.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/outputsPanel.tsx @@ -1,7 +1,7 @@ import { HostService, ContentType } from '@microsoft/designer-client-services-logic-apps'; import { ValuesPanel, SecureDataSection } from '@microsoft/designer-ui'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { isNullOrUndefined } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { isNullOrUndefined } from '@microsoft/logic-apps-shared'; import { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/propertiesPanel.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/propertiesPanel.tsx index 7e36b1935fe..9c5a776f91f 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/propertiesPanel.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/monitoringTab/propertiesPanel.tsx @@ -1,7 +1,7 @@ import constants from '../../../../../common/constants'; import { getStatusString, ValuesPanel } from '@microsoft/designer-ui'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; -import { isNullOrEmpty } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; +import { isNullOrEmpty } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; export interface PropertiesPanelProps { diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/__test__/getEditorAndOptions.spec.ts b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/__test__/getEditorAndOptions.spec.ts index fdc4c350765..01ad6253cf2 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/__test__/getEditorAndOptions.spec.ts +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/__test__/getEditorAndOptions.spec.ts @@ -2,7 +2,7 @@ import { getEditorAndOptions } from '..'; import type { VariableDeclaration } from '../../../../../../core/state/tokens/tokensSlice'; import { InitEditorService } from '@microsoft/designer-client-services-logic-apps'; import type { ParameterInfo } from '@microsoft/designer-ui'; -import type { OperationInfo } from '@microsoft/utils-logic-apps'; +import type { OperationInfo } from '@microsoft/logic-apps-shared'; describe('getEditorAndOptions', () => { const operationInfo: OperationInfo = { diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/identityselector.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/identityselector.tsx index d253caad5a8..e74852ac6df 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/identityselector.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/identityselector.tsx @@ -7,8 +7,8 @@ import { getConnectionReference, isIdentityPresentInLogicApp } from '../../../.. import type { IDropdownOption, IDropdownStyles } from '@fluentui/react'; import { Dropdown, FontSizes, Label } from '@fluentui/react'; import { WorkflowService } from '@microsoft/designer-client-services-logic-apps'; -import type { ManagedIdentity } from '@microsoft/utils-logic-apps'; -import { isIdentityAssociatedWithLogicApp, equals, getIdentityDropdownOptions } from '@microsoft/utils-logic-apps'; +import type { ManagedIdentity } from '@microsoft/logic-apps-shared'; +import { isIdentityAssociatedWithLogicApp, equals, getIdentityDropdownOptions } from '@microsoft/logic-apps-shared'; import type { FormEvent } from 'react'; import { useEffect, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/index.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/index.tsx index 51a0c933ef6..0e14f1f3be3 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/index.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/parametersTab/index.tsx @@ -50,8 +50,8 @@ import { toCustomEditorAndOptions, } from '@microsoft/designer-ui'; import type { ChangeState, ParameterInfo, ValueSegment, OutputToken, TokenPickerMode, PanelTabFn } from '@microsoft/designer-ui'; -import type { OperationInfo } from '@microsoft/utils-logic-apps'; -import { equals, getPropertyValue, getRecordEntry } from '@microsoft/utils-logic-apps'; +import type { OperationInfo } from '@microsoft/logic-apps-shared'; +import { equals, getPropertyValue, getRecordEntry } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/scratchTab.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/scratchTab.tsx index cec6a23b43e..b2c875e2a84 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/scratchTab.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/scratchTab.tsx @@ -34,10 +34,10 @@ import { ConversationMessage, ConversationItemType, // RowDropdownOptions, } from '@microsoft/designer-ui'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; import { useCallback, useState } from 'react'; -//import { guid } from '@microsoft/utils-logic-apps'; +//import { guid } from '@microsoft/logic-apps-shared'; // const testTokenGroup: TokenGroup[] = [ // { id: guid(), label: 'Checks if Blob exists in Azure Storage', tokens: [outputToken, outputToken2] }, diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/testingTab/index.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/testingTab/index.tsx index 13696661cdc..f449947e0cb 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/testingTab/index.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/tabs/testingTab/index.tsx @@ -10,7 +10,7 @@ import { useStaticResultProperties, useStaticResultSchema } from '../../../../.. import { updateStaticResultProperties } from '../../../../../core/state/staticresultschema/staticresultsSlice'; import type { PanelTabFn } from '@microsoft/designer-ui'; import { StaticResultContainer } from '@microsoft/designer-ui'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; import { useCallback } from 'react'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/usePanelTabs.tsx b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/usePanelTabs.tsx index c73a2e696f6..0caeca6de8f 100644 --- a/libs/designer/src/lib/ui/panel/nodeDetailsPanel/usePanelTabs.tsx +++ b/libs/designer/src/lib/ui/panel/nodeDetailsPanel/usePanelTabs.tsx @@ -16,7 +16,7 @@ import { monitorRetryTab } from './tabs/retryTab'; import { scratchTab } from './tabs/scratchTab'; import { settingsTab } from './tabs/settingsTab'; import { testingTab } from './tabs/testingTab'; -import { SUBGRAPH_TYPES } from '@microsoft/utils-logic-apps'; +import { SUBGRAPH_TYPES } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; import { useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/nodeSearchPanel/nodeSearchPanel.tsx b/libs/designer/src/lib/ui/panel/nodeSearchPanel/nodeSearchPanel.tsx index ee5e875e5b2..39197a5c7c3 100644 --- a/libs/designer/src/lib/ui/panel/nodeSearchPanel/nodeSearchPanel.tsx +++ b/libs/designer/src/lib/ui/panel/nodeSearchPanel/nodeSearchPanel.tsx @@ -8,7 +8,7 @@ import { Button } from '@fluentui/react-components'; import { bundleIcon, Dismiss24Filled, Dismiss24Regular } from '@fluentui/react-icons'; import type { CommonPanelProps } from '@microsoft/designer-ui'; import { OperationSearchCard } from '@microsoft/designer-ui'; -import { labelCase } from '@microsoft/utils-logic-apps'; +import { labelCase } from '@microsoft/logic-apps-shared'; import Fuse from 'fuse.js'; import { useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/panel/recommendation/azureResourceSelection.tsx b/libs/designer/src/lib/ui/panel/recommendation/azureResourceSelection.tsx index c7fdb012a46..af04843256d 100644 --- a/libs/designer/src/lib/ui/panel/recommendation/azureResourceSelection.tsx +++ b/libs/designer/src/lib/ui/panel/recommendation/azureResourceSelection.tsx @@ -6,8 +6,8 @@ import { Text } from '@fluentui/react'; import { Button } from '@fluentui/react-components'; import { ApiManagementService, FunctionService, SearchService, AppServiceService } from '@microsoft/designer-client-services-logic-apps'; import { AzureResourcePicker } from '@microsoft/designer-ui'; -import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/utils-logic-apps'; -import { getResourceName, getResourceGroupFromWorkflowId } from '@microsoft/utils-logic-apps'; +import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/logic-apps-shared'; +import { getResourceName, getResourceGroupFromWorkflowId } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/recommendation/browseView.tsx b/libs/designer/src/lib/ui/panel/recommendation/browseView.tsx index ac06bca9574..c9fa25ab77b 100644 --- a/libs/designer/src/lib/ui/panel/recommendation/browseView.tsx +++ b/libs/designer/src/lib/ui/panel/recommendation/browseView.tsx @@ -2,7 +2,7 @@ import { useAllApiIdsWithActions, useAllApiIdsWithTriggers, useAllConnectors } f import { selectOperationGroupId } from '../../../core/state/panel/panelSlice'; import { SearchService } from '@microsoft/designer-client-services-logic-apps'; import { BrowseGrid } from '@microsoft/designer-ui'; -import { isBuiltInConnector, type Connector, isCustomConnector, cleanConnectorId } from '@microsoft/utils-logic-apps'; +import { isBuiltInConnector, type Connector, isCustomConnector, cleanConnectorId } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo } from 'react'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/recommendation/customSwaggerSelection.tsx b/libs/designer/src/lib/ui/panel/recommendation/customSwaggerSelection.tsx index 95e16f5266c..075e56134fc 100644 --- a/libs/designer/src/lib/ui/panel/recommendation/customSwaggerSelection.tsx +++ b/libs/designer/src/lib/ui/panel/recommendation/customSwaggerSelection.tsx @@ -2,7 +2,7 @@ import type { AppDispatch } from '../../../core'; import { addOperation } from '../../../core/actions/bjsworkflow/add'; import { useRelationshipIds, useIsParallelBranch, useIsAddingTrigger } from '../../../core/state/panel/panelSelectors'; import { PrimaryButton, Text, TextField } from '@fluentui/react'; -import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/utils-logic-apps'; +import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/logic-apps-shared'; import { useCallback, useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/recommendation/operationGroupDetailView.tsx b/libs/designer/src/lib/ui/panel/recommendation/operationGroupDetailView.tsx index 2aced8972cb..d87e34319fb 100644 --- a/libs/designer/src/lib/ui/panel/recommendation/operationGroupDetailView.tsx +++ b/libs/designer/src/lib/ui/panel/recommendation/operationGroupDetailView.tsx @@ -1,6 +1,6 @@ import type { OperationActionData } from '@microsoft/designer-ui'; import { OperationActionDataFromOperation, OperationGroupDetailsPage } from '@microsoft/designer-ui'; -import type { Connector, DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/utils-logic-apps'; +import type { Connector, DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/logic-apps-shared'; import { useCallback } from 'react'; type OperationGroupDetailViewProps = { diff --git a/libs/designer/src/lib/ui/panel/recommendation/recommendationPanelContext.tsx b/libs/designer/src/lib/ui/panel/recommendation/recommendationPanelContext.tsx index 7b573054c53..2f124a14d0f 100644 --- a/libs/designer/src/lib/ui/panel/recommendation/recommendationPanelContext.tsx +++ b/libs/designer/src/lib/ui/panel/recommendation/recommendationPanelContext.tsx @@ -20,8 +20,8 @@ import { bundleIcon, Dismiss24Filled, Dismiss24Regular } from '@fluentui/react-i import { SearchService } from '@microsoft/designer-client-services-logic-apps'; import { OperationSearchHeader } from '@microsoft/designer-ui'; import type { CommonPanelProps } from '@microsoft/designer-ui'; -import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/utils-logic-apps'; -import { equals, guid, areApiIdsEqual } from '@microsoft/utils-logic-apps'; +import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/logic-apps-shared'; +import { equals, guid, areApiIdsEqual } from '@microsoft/logic-apps-shared'; import { useCallback, useEffect, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/panel/recommendation/searchView.tsx b/libs/designer/src/lib/ui/panel/recommendation/searchView.tsx index 0e3390a69ba..d88e72927d0 100644 --- a/libs/designer/src/lib/ui/panel/recommendation/searchView.tsx +++ b/libs/designer/src/lib/ui/panel/recommendation/searchView.tsx @@ -2,7 +2,7 @@ import type { AppDispatch } from '../../../core'; import { selectOperationGroupId } from '../../../core/state/panel/panelSlice'; import { SearchService, type ISearchService } from '@microsoft/designer-client-services-logic-apps'; import { SearchResultsGrid } from '@microsoft/designer-ui'; -import { isBuiltInConnector, type DiscoveryOperation, type DiscoveryResultTypes, isCustomConnector } from '@microsoft/utils-logic-apps'; +import { isBuiltInConnector, type DiscoveryOperation, type DiscoveryResultTypes, isCustomConnector } from '@microsoft/logic-apps-shared'; import { useDebouncedEffect } from '@react-hookz/web'; import Fuse from 'fuse.js'; import React, { useEffect, useState } from 'react'; diff --git a/libs/designer/src/lib/ui/settings/index.tsx b/libs/designer/src/lib/ui/settings/index.tsx index 721357ff043..845ab141249 100644 --- a/libs/designer/src/lib/ui/settings/index.tsx +++ b/libs/designer/src/lib/ui/settings/index.tsx @@ -22,7 +22,7 @@ import { Tracking } from './sections/tracking'; import type { ValidationError } from './validation/validation'; import { ValidationErrorKeys, validateNodeSettings } from './validation/validation'; import type { IDropdownOption } from '@fluentui/react'; -import { type LogicAppsV2, equals, getRecordEntry, isObject } from '@microsoft/utils-logic-apps'; +import { type LogicAppsV2, equals, getRecordEntry, isObject } from '@microsoft/logic-apps-shared'; import { useMemo } from 'react'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/settings/sections/runafter.tsx b/libs/designer/src/lib/ui/settings/sections/runafter.tsx index 73c3acfa4b1..cd55728fbab 100644 --- a/libs/designer/src/lib/ui/settings/sections/runafter.tsx +++ b/libs/designer/src/lib/ui/settings/sections/runafter.tsx @@ -9,7 +9,7 @@ import { SettingsSection } from '../settingsection'; import type { ValidationError } from '../validation/validation'; import { ValidationErrorKeys, ValidationErrorType } from '../validation/validation'; import type { RunAfterActionDetailsProps } from './runafterconfiguration'; -import { getRecordEntry, type LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import { getRecordEntry, type LogicAppsV2 } from '@microsoft/logic-apps-shared'; import { useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; diff --git a/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runafterActionSelector.tsx b/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runafterActionSelector.tsx index 75d826dae78..d838af4eba0 100644 --- a/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runafterActionSelector.tsx +++ b/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runafterActionSelector.tsx @@ -5,7 +5,7 @@ import { useSelectedNodeId } from '../../../../core/state/panel/panelSelectors'; import { useNodeDisplayName } from '../../../../core/state/workflow/workflowSelectors'; import { Menu, MenuTrigger, MenuList, MenuPopover, MenuButton, Label, MenuItemCheckbox, Input, Button } from '@fluentui/react-components'; import { bundleIcon, Add20Regular, Add20Filled, Search24Regular, DismissRegular } from '@fluentui/react-icons'; -import { getRecordEntry, type LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import { getRecordEntry, type LogicAppsV2 } from '@microsoft/logic-apps-shared'; import Fuse from 'fuse.js'; import { useState, useMemo } from 'react'; import { useIntl } from 'react-intl'; diff --git a/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runafteractionstatuses.tsx b/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runafteractionstatuses.tsx index ccd715501ee..b2a164fff09 100644 --- a/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runafteractionstatuses.tsx +++ b/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runafteractionstatuses.tsx @@ -1,7 +1,7 @@ import type { onChangeHandler } from './runafteractiondetails'; import { Text, Checkbox } from '@fluentui/react-components'; import { Failed, Skipped, Succeeded, TimedOut } from '@microsoft/designer-ui'; -import { RUN_AFTER_STATUS } from '@microsoft/utils-logic-apps'; +import { RUN_AFTER_STATUS } from '@microsoft/logic-apps-shared'; import { useIntl } from 'react-intl'; export interface RunAfterActionStatusesProps { diff --git a/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runaftertrafficlights.tsx b/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runaftertrafficlights.tsx index 7b0fc997dfd..0932b0a2507 100644 --- a/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runaftertrafficlights.tsx +++ b/libs/designer/src/lib/ui/settings/sections/runafterconfiguration/runaftertrafficlights.tsx @@ -1,6 +1,6 @@ import { useTheme } from '@fluentui/react'; import { EmptyTrafficLightDot, TrafficLightDot } from '@microsoft/designer-ui'; -import { RUN_AFTER_COLORS, RUN_AFTER_STATUS } from '@microsoft/utils-logic-apps'; +import { RUN_AFTER_COLORS, RUN_AFTER_STATUS } from '@microsoft/logic-apps-shared'; import { useCallback } from 'react'; export interface RunAfterTrafficLightsProps { diff --git a/libs/logic-apps-shared/.eslintrc.json b/libs/logic-apps-shared/.eslintrc.json index 9d9c0db55bb..b7eca227e07 100644 --- a/libs/logic-apps-shared/.eslintrc.json +++ b/libs/logic-apps-shared/.eslintrc.json @@ -4,7 +4,9 @@ "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} + "rules": { + "@nrwl/nx/enforce-module-boundaries": ["warn"] + } }, { "files": ["*.ts", "*.tsx"], diff --git a/libs/logic-apps-shared/src/index.ts b/libs/logic-apps-shared/src/index.ts index c57959b70be..7c71de89403 100644 --- a/libs/logic-apps-shared/src/index.ts +++ b/libs/logic-apps-shared/src/index.ts @@ -1 +1,2 @@ export * from './parsers'; +export * from './utils/src'; diff --git a/libs/logic-apps-shared/src/parsers/lib/common/constants.ts b/libs/logic-apps-shared/src/parsers/lib/common/constants.ts index 4ef4df5c263..3ba76730d52 100644 --- a/libs/logic-apps-shared/src/parsers/lib/common/constants.ts +++ b/libs/logic-apps-shared/src/parsers/lib/common/constants.ts @@ -52,7 +52,7 @@ export const Permissions = { ReadWrite: 'read-write', }; -export const Capabilities = { +export const ChunkSizeCapabilities = { ChunkTransfer: 'chunkTransfer', AcceptUploadChunkSize: 'acceptUploadChunkSizeInMB', MinimumUploadChunkSize: 'minimumUploadChunkSizeInMB', diff --git a/libs/logic-apps-shared/src/parsers/lib/common/helpers/expression.ts b/libs/logic-apps-shared/src/parsers/lib/common/helpers/expression.ts index 652eb642532..57a2b1ed113 100644 --- a/libs/logic-apps-shared/src/parsers/lib/common/helpers/expression.ts +++ b/libs/logic-apps-shared/src/parsers/lib/common/helpers/expression.ts @@ -10,7 +10,7 @@ export function isNumber(ch: string) { return /^\d+$/.test(ch); } -export function isBoolean(ch: string) { +export function isStringBoolean(ch: string) { if (ch === 'true' || ch === 'false') { return true; } diff --git a/libs/logic-apps-shared/src/parsers/lib/common/outputprocessor.ts b/libs/logic-apps-shared/src/parsers/lib/common/outputprocessor.ts index 23c45722ccb..b038d5d9ee5 100644 --- a/libs/logic-apps-shared/src/parsers/lib/common/outputprocessor.ts +++ b/libs/logic-apps-shared/src/parsers/lib/common/outputprocessor.ts @@ -2,7 +2,7 @@ import type { OutputMetadata, OutputParameter, SchemaProperty } from '../models/ import { OutputSource, ParameterLocations, ResponseCodes } from './constants'; import * as ParameterKeyUtility from './helpers/keysutility'; import { getArrayOutputMetadata } from './helpers/utils'; -import type { SchemaProcessorOptions, Schema } from './schemaprocessor'; +import type { SchemaProcessorOptions, OpenApiSchema } from './schemaprocessor'; import { SchemaProcessor } from './schemaprocessor'; import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; import { equals, startsWith } from '@microsoft/utils-logic-apps'; @@ -18,7 +18,7 @@ export class OutputsProcessor { this._responses = responses; } - getOutputSchema(): Schema { + getOutputSchema(): OpenApiSchema { const response = this._getResponse(); return response.schema; } diff --git a/libs/logic-apps-shared/src/parsers/lib/common/schemaprocessor.ts b/libs/logic-apps-shared/src/parsers/lib/common/schemaprocessor.ts index 888edb4f1f1..4c6a64fab10 100644 --- a/libs/logic-apps-shared/src/parsers/lib/common/schemaprocessor.ts +++ b/libs/logic-apps-shared/src/parsers/lib/common/schemaprocessor.ts @@ -15,7 +15,8 @@ import { getIntl } from '@microsoft/intl-logic-apps'; import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; import { aggregate, clone, equals, hasProperty, isNullOrUndefined } from '@microsoft/utils-logic-apps'; -export type Schema = OpenAPIV2.Schema; +export type OpenApiSchema = OpenAPIV2.Schema; + type SchemaObject = OpenAPIV2.SchemaObject; export interface ParentPropertyInfo { @@ -83,7 +84,7 @@ export class SchemaProcessor { }; } - getSchemaProperties(schema: Schema): SchemaProperty[] { + getSchemaProperties(schema: OpenApiSchema): SchemaProperty[] { schema = this._dereferenceRefSchema(schema) as SchemaObject; let properties: SchemaProperty[]; @@ -128,7 +129,7 @@ export class SchemaProcessor { // TODO: Might have to redo for handling primitive arrays private _getArrayProperties(schema: SchemaObject, skipParent = false): SchemaProperty[] { - const itemsSchema = (this._dereferenceRefSchema(schema.items as Schema) || {}) as SchemaObject; + const itemsSchema = (this._dereferenceRefSchema(schema.items as OpenApiSchema) || {}) as SchemaObject; const itemsType = itemsSchema.type; const arrayOutputs = skipParent ? [] : this._getScalarProperties(schema); const isReadOnlyInputParameter = this.options.isInputSchema && this._isReadOnlyParameter(schema); @@ -247,7 +248,7 @@ export class SchemaProcessor { titlePrefix: string | undefined, summaryPrefix: string | undefined ): SchemaProperty[] { - const properties: Record = schema.properties || {}; + const properties: Record = schema.properties || {}; const requiredProperties = schema.required || []; const keys = Object.keys(properties); const permission = schema[SwaggerConstants.ExtensionProperties.Permission] || this.options.permission; @@ -351,7 +352,7 @@ export class SchemaProcessor { return this._sortProperties(schemaProperties); } - private _getScalarProperties(schema: Schema, $schema?: Schema): SchemaProperty[] { + private _getScalarProperties(schema: OpenApiSchema, $schema?: OpenApiSchema): SchemaProperty[] { const schemaProperty = this._getPropertyDetails(schema, $schema); if (this.options.expandOneOf && schemaProperty) { return this._expandOneOfProperty(schemaProperty); @@ -411,7 +412,7 @@ export class SchemaProcessor { return schemas[0]; } - private _dereferenceRefSchema(schema: Schema | undefined): SchemaObject | undefined { + private _dereferenceRefSchema(schema: OpenApiSchema | undefined): SchemaObject | undefined { if (isNullOrUndefined(schema)) { return schema; } @@ -479,7 +480,7 @@ export class SchemaProcessor { const encode = schema[SwaggerConstants.ExtensionProperties.Encode]; const $enum = getEnum(schema, $required); const format = schema.format; - const itemSchema = this._dereferenceRefSchema(schema.items as Schema); + const itemSchema = this._dereferenceRefSchema(schema.items as OpenApiSchema); const isInsideArray = parentProperty && parentProperty.isArray; const isNested = this.options.isNested; const isNotificationUrl = schema[SwaggerConstants.ExtensionProperties.NotificationUrl]; diff --git a/libs/logic-apps-shared/src/parsers/lib/models/operation.ts b/libs/logic-apps-shared/src/parsers/lib/models/operation.ts index df2d4e6d456..26d00be3fec 100644 --- a/libs/logic-apps-shared/src/parsers/lib/models/operation.ts +++ b/libs/logic-apps-shared/src/parsers/lib/models/operation.ts @@ -24,7 +24,7 @@ export interface Annotation { status: string | undefined; } -export interface Operation { +export interface LAOperation { operationId: string; description: string | undefined; method: string; @@ -229,7 +229,7 @@ export interface InputDependencies { parameters: DependentParameterInfo[]; } -export interface ParameterBase { +interface ParameterBase { key: string; name: string; type: string; @@ -291,7 +291,7 @@ export interface InputParameters { byName: Record; } -export type Operations = Record; +export type Operations = Record; export const OperationInputType = { NOTSPECIFIED: 'NOTSPECIFIED', diff --git a/libs/logic-apps-shared/src/parsers/lib/swagger/parser.ts b/libs/logic-apps-shared/src/parsers/lib/swagger/parser.ts index 534a7471be8..3a9ae07b806 100644 --- a/libs/logic-apps-shared/src/parsers/lib/swagger/parser.ts +++ b/libs/logic-apps-shared/src/parsers/lib/swagger/parser.ts @@ -1,13 +1,13 @@ /* eslint-disable no-param-reassign */ -import { Capabilities, ExtensionProperties, PropertyName, Visibility } from '../common/constants'; +import { ChunkSizeCapabilities, ExtensionProperties, PropertyName, Visibility } from '../common/constants'; import { create } from '../common/helpers/keysutility'; import { OutputsProcessor } from '../common/outputprocessor'; -import type { Schema, SchemaProcessorOptions } from '../common/schemaprocessor'; +import type { OpenApiSchema, SchemaProcessorOptions } from '../common/schemaprocessor'; import type { Annotation, InputParameter, InputParameters, - Operation, + LAOperation, Operations, OutputMetadata, OutputParameters, @@ -269,7 +269,7 @@ export class SwaggerParser { getOperations(options?: GetOperationsOptions): Operations { options = { ...{ excludeInternalOperations: true }, ...options }; - const operations: Operation[] = this._getOperations(options).map((operation) => ({ + const operations: LAOperation[] = this._getOperations(options).map((operation) => ({ operationId: operation.operationId as string, description: operation.description, method: operation[ExtensionProperties.Method], @@ -289,12 +289,12 @@ export class SwaggerParser { return map(operations, 'operationId'); } - getOperationByOperationId(operationId: string): Operation | undefined { + getOperationByOperationId(operationId: string): LAOperation | undefined { const operations = this.getOperations({ unsorted: true, excludeInternalOperations: false }); return getPropertyValue(operations, operationId); } - getOperationByPathAndMethod(path: string, method: string): Operation | undefined { + getOperationByPathAndMethod(path: string, method: string): LAOperation | undefined { const operations = this.getOperations({ unsorted: true, excludeInternalOperations: false }); return Object.values(operations).find((operation) => operation.path === path && operation.method === method); } @@ -312,10 +312,10 @@ export class SwaggerParser { * Gets the output schema by operation Id. * @arg {string} operationId * - The ID of the operation whose output schema is desired. - * @return {Schema} + * @return {OpenApiSchema} * - The output schema. */ - getOutputSchema(operationId: string): Schema { + getOutputSchema(operationId: string): OpenApiSchema { const processor = this._getResponsesProcessor(operationId); return processor.getOutputSchema(); } @@ -384,18 +384,18 @@ export class SwaggerParser { private _getUploadChunkMetadata(capabilities: Record): UploadChunkMetadata { return { - chunkTransferSupported: !!capabilities && !!capabilities[Capabilities.ChunkTransfer], - acceptUploadSize: !!capabilities && !!capabilities[Capabilities.AcceptUploadChunkSize], - minimumSize: capabilities ? capabilities[Capabilities.MinimumUploadChunkSize] : undefined, - maximumSize: capabilities ? capabilities[Capabilities.MaximumUploadChunkSize] : undefined, + chunkTransferSupported: !!capabilities && !!capabilities[ChunkSizeCapabilities.ChunkTransfer], + acceptUploadSize: !!capabilities && !!capabilities[ChunkSizeCapabilities.AcceptUploadChunkSize], + minimumSize: capabilities ? capabilities[ChunkSizeCapabilities.MinimumUploadChunkSize] : undefined, + maximumSize: capabilities ? capabilities[ChunkSizeCapabilities.MaximumUploadChunkSize] : undefined, }; } private _getDownloadChunkMetadata(capabilities: Record): DownloadChunkMetadata { return { - acceptDownloadSize: !!capabilities && !!capabilities[Capabilities.AcceptDownloadChunkSize], - minimumSize: capabilities ? capabilities[Capabilities.MinimumDownloadChunkSize] : undefined, - maximumSize: capabilities ? capabilities[Capabilities.MaximumDownloadChunkSize] : undefined, + acceptDownloadSize: !!capabilities && !!capabilities[ChunkSizeCapabilities.AcceptDownloadChunkSize], + minimumSize: capabilities ? capabilities[ChunkSizeCapabilities.MinimumDownloadChunkSize] : undefined, + maximumSize: capabilities ? capabilities[ChunkSizeCapabilities.MaximumDownloadChunkSize] : undefined, }; } diff --git a/libs/utils/src/index.ts b/libs/logic-apps-shared/src/utils/src/index.ts similarity index 100% rename from libs/utils/src/index.ts rename to libs/logic-apps-shared/src/utils/src/index.ts diff --git a/libs/utils/src/lib/exception/argument.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/argument.ts similarity index 100% rename from libs/utils/src/lib/exception/argument.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/argument.ts diff --git a/libs/utils/src/lib/exception/assertion.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/assertion.ts similarity index 100% rename from libs/utils/src/lib/exception/assertion.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/assertion.ts diff --git a/libs/utils/src/lib/exception/baseexception.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/baseexception.ts similarity index 100% rename from libs/utils/src/lib/exception/baseexception.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/baseexception.ts diff --git a/libs/utils/src/lib/exception/connector.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/connector.ts similarity index 100% rename from libs/utils/src/lib/exception/connector.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/connector.ts diff --git a/libs/utils/src/lib/exception/exception.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/exception.ts similarity index 100% rename from libs/utils/src/lib/exception/exception.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/exception.ts diff --git a/libs/utils/src/lib/exception/index.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/index.ts similarity index 100% rename from libs/utils/src/lib/exception/index.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/index.ts diff --git a/libs/utils/src/lib/exception/invalidFormat.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/invalidFormat.ts similarity index 100% rename from libs/utils/src/lib/exception/invalidFormat.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/invalidFormat.ts diff --git a/libs/utils/src/lib/exception/serialization.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/serialization.ts similarity index 100% rename from libs/utils/src/lib/exception/serialization.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/serialization.ts diff --git a/libs/utils/src/lib/exception/unsupported.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/unsupported.ts similarity index 100% rename from libs/utils/src/lib/exception/unsupported.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/unsupported.ts diff --git a/libs/utils/src/lib/exception/user.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/user.ts similarity index 100% rename from libs/utils/src/lib/exception/user.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/user.ts diff --git a/libs/utils/src/lib/exception/validation.ts b/libs/logic-apps-shared/src/utils/src/lib/exception/validation.ts similarity index 100% rename from libs/utils/src/lib/exception/validation.ts rename to libs/logic-apps-shared/src/utils/src/lib/exception/validation.ts diff --git a/libs/utils/src/lib/helpers/__test__/color.spec.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/color.spec.ts similarity index 100% rename from libs/utils/src/lib/helpers/__test__/color.spec.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/color.spec.ts diff --git a/libs/utils/src/lib/helpers/__test__/functions.spec.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/functions.spec.ts similarity index 100% rename from libs/utils/src/lib/helpers/__test__/functions.spec.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/functions.spec.ts diff --git a/libs/utils/src/lib/helpers/__test__/guid.spec.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/guid.spec.ts similarity index 100% rename from libs/utils/src/lib/helpers/__test__/guid.spec.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/guid.spec.ts diff --git a/libs/utils/src/lib/helpers/__test__/run.spec.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/run.spec.ts similarity index 100% rename from libs/utils/src/lib/helpers/__test__/run.spec.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/run.spec.ts diff --git a/libs/utils/src/lib/helpers/__test__/stringFunctions.spec.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/stringFunctions.spec.ts similarity index 100% rename from libs/utils/src/lib/helpers/__test__/stringFunctions.spec.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/__test__/stringFunctions.spec.ts diff --git a/libs/utils/src/lib/helpers/color.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/color.ts similarity index 100% rename from libs/utils/src/lib/helpers/color.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/color.ts diff --git a/libs/utils/src/lib/helpers/connections.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/connections.ts similarity index 100% rename from libs/utils/src/lib/helpers/connections.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/connections.ts diff --git a/libs/utils/src/lib/helpers/flow-utils.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/flow-utils.ts similarity index 100% rename from libs/utils/src/lib/helpers/flow-utils.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/flow-utils.ts diff --git a/libs/utils/src/lib/helpers/functions.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/functions.ts similarity index 100% rename from libs/utils/src/lib/helpers/functions.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/functions.ts diff --git a/libs/utils/src/lib/helpers/guid.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/guid.ts similarity index 100% rename from libs/utils/src/lib/helpers/guid.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/guid.ts diff --git a/libs/utils/src/lib/helpers/hooks.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/hooks.ts similarity index 100% rename from libs/utils/src/lib/helpers/hooks.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/hooks.ts diff --git a/libs/utils/src/lib/helpers/http.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/http.ts similarity index 100% rename from libs/utils/src/lib/helpers/http.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/http.ts diff --git a/libs/utils/src/lib/helpers/index.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/index.ts similarity index 100% rename from libs/utils/src/lib/helpers/index.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/index.ts diff --git a/libs/utils/src/lib/helpers/logicapps.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/logicapps.ts similarity index 100% rename from libs/utils/src/lib/helpers/logicapps.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/logicapps.ts diff --git a/libs/utils/src/lib/helpers/navigator.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/navigator.ts similarity index 100% rename from libs/utils/src/lib/helpers/navigator.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/navigator.ts diff --git a/libs/utils/src/lib/helpers/operations.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/operations.ts similarity index 100% rename from libs/utils/src/lib/helpers/operations.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/operations.ts diff --git a/libs/utils/src/lib/helpers/recurrence.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/recurrence.ts similarity index 100% rename from libs/utils/src/lib/helpers/recurrence.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/recurrence.ts diff --git a/libs/utils/src/lib/helpers/run.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/run.ts similarity index 100% rename from libs/utils/src/lib/helpers/run.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/run.ts diff --git a/libs/utils/src/lib/helpers/stringFunctions.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/stringFunctions.ts similarity index 100% rename from libs/utils/src/lib/helpers/stringFunctions.ts rename to libs/logic-apps-shared/src/utils/src/lib/helpers/stringFunctions.ts diff --git a/libs/utils/src/lib/mocks/connections.ts b/libs/logic-apps-shared/src/utils/src/lib/mocks/connections.ts similarity index 100% rename from libs/utils/src/lib/mocks/connections.ts rename to libs/logic-apps-shared/src/utils/src/lib/mocks/connections.ts diff --git a/libs/utils/src/lib/mocks/connectors.ts b/libs/logic-apps-shared/src/utils/src/lib/mocks/connectors.ts similarity index 100% rename from libs/utils/src/lib/mocks/connectors.ts rename to libs/logic-apps-shared/src/utils/src/lib/mocks/connectors.ts diff --git a/libs/utils/src/lib/mocks/connectorsSearchResultsMock.ts b/libs/logic-apps-shared/src/utils/src/lib/mocks/connectorsSearchResultsMock.ts similarity index 100% rename from libs/utils/src/lib/mocks/connectorsSearchResultsMock.ts rename to libs/logic-apps-shared/src/utils/src/lib/mocks/connectorsSearchResultsMock.ts diff --git a/libs/utils/src/lib/mocks/index.ts b/libs/logic-apps-shared/src/utils/src/lib/mocks/index.ts similarity index 100% rename from libs/utils/src/lib/mocks/index.ts rename to libs/logic-apps-shared/src/utils/src/lib/mocks/index.ts diff --git a/libs/utils/src/lib/mocks/operations.ts b/libs/logic-apps-shared/src/utils/src/lib/mocks/operations.ts similarity index 100% rename from libs/utils/src/lib/mocks/operations.ts rename to libs/logic-apps-shared/src/utils/src/lib/mocks/operations.ts diff --git a/libs/utils/src/lib/models/armresource.ts b/libs/logic-apps-shared/src/utils/src/lib/models/armresource.ts similarity index 100% rename from libs/utils/src/lib/models/armresource.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/armresource.ts diff --git a/libs/utils/src/lib/models/connection.ts b/libs/logic-apps-shared/src/utils/src/lib/models/connection.ts similarity index 100% rename from libs/utils/src/lib/models/connection.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/connection.ts diff --git a/libs/utils/src/lib/models/connector.ts b/libs/logic-apps-shared/src/utils/src/lib/models/connector.ts similarity index 100% rename from libs/utils/src/lib/models/connector.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/connector.ts diff --git a/libs/utils/src/lib/models/dataMap.ts b/libs/logic-apps-shared/src/utils/src/lib/models/dataMap.ts similarity index 100% rename from libs/utils/src/lib/models/dataMap.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/dataMap.ts diff --git a/libs/utils/src/lib/models/dataMapSchema.ts b/libs/logic-apps-shared/src/utils/src/lib/models/dataMapSchema.ts similarity index 96% rename from libs/utils/src/lib/models/dataMapSchema.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/dataMapSchema.ts index 2280c043ec0..a7b8988fec2 100644 --- a/libs/utils/src/lib/models/dataMapSchema.ts +++ b/libs/logic-apps-shared/src/utils/src/lib/models/dataMapSchema.ts @@ -1,4 +1,4 @@ -export interface Schema { +export interface DataMapSchema { name: string; type: SchemaFileFormat; targetNamespace: string; @@ -62,7 +62,7 @@ export const InputFormat = { } as const; export type InputFormat = (typeof InputFormat)[keyof typeof InputFormat]; -export interface SchemaExtended extends Schema { +export interface SchemaExtended extends DataMapSchema { schemaTreeRoot: SchemaNodeExtended; } diff --git a/libs/utils/src/lib/models/gateway.ts b/libs/logic-apps-shared/src/utils/src/lib/models/gateway.ts similarity index 100% rename from libs/utils/src/lib/models/gateway.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/gateway.ts diff --git a/libs/utils/src/lib/models/index.ts b/libs/logic-apps-shared/src/utils/src/lib/models/index.ts similarity index 100% rename from libs/utils/src/lib/models/index.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/index.ts diff --git a/libs/utils/src/lib/models/logicApps.ts b/libs/logic-apps-shared/src/utils/src/lib/models/logicApps.ts similarity index 100% rename from libs/utils/src/lib/models/logicApps.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/logicApps.ts diff --git a/libs/utils/src/lib/models/logicAppsIntegration.ts b/libs/logic-apps-shared/src/utils/src/lib/models/logicAppsIntegration.ts similarity index 100% rename from libs/utils/src/lib/models/logicAppsIntegration.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/logicAppsIntegration.ts diff --git a/libs/utils/src/lib/models/logicAppsV2.ts b/libs/logic-apps-shared/src/utils/src/lib/models/logicAppsV2.ts similarity index 99% rename from libs/utils/src/lib/models/logicAppsV2.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/logicAppsV2.ts index b8fc7a9f7e1..31efb085734 100644 --- a/libs/utils/src/lib/models/logicAppsV2.ts +++ b/libs/logic-apps-shared/src/utils/src/lib/models/logicAppsV2.ts @@ -419,8 +419,8 @@ export interface ManualTriggerInputs { parameters?: Record; path?: string; relativePath?: string; - schema?: Swagger.Schema; - headersSchema?: Record; + schema?: Swagger.SwaggerSchema; + headersSchema?: Record; } /* Geofence trigger types */ diff --git a/libs/utils/src/lib/models/logicAppsV2Expression.ts b/libs/logic-apps-shared/src/utils/src/lib/models/logicAppsV2Expression.ts similarity index 100% rename from libs/utils/src/lib/models/logicAppsV2Expression.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/logicAppsV2Expression.ts diff --git a/libs/utils/src/lib/models/logicAppsV2Integration.ts b/libs/logic-apps-shared/src/utils/src/lib/models/logicAppsV2Integration.ts similarity index 100% rename from libs/utils/src/lib/models/logicAppsV2Integration.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/logicAppsV2Integration.ts diff --git a/libs/utils/src/lib/models/managedidentity.ts b/libs/logic-apps-shared/src/utils/src/lib/models/managedidentity.ts similarity index 100% rename from libs/utils/src/lib/models/managedidentity.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/managedidentity.ts diff --git a/libs/utils/src/lib/models/openApiV2.ts b/libs/logic-apps-shared/src/utils/src/lib/models/openApiV2.ts similarity index 100% rename from libs/utils/src/lib/models/openApiV2.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/openApiV2.ts diff --git a/libs/utils/src/lib/models/operation.ts b/libs/logic-apps-shared/src/utils/src/lib/models/operation.ts similarity index 100% rename from libs/utils/src/lib/models/operation.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/operation.ts diff --git a/libs/utils/src/lib/models/operationDiscoveryResults.ts b/libs/logic-apps-shared/src/utils/src/lib/models/operationDiscoveryResults.ts similarity index 100% rename from libs/utils/src/lib/models/operationDiscoveryResults.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/operationDiscoveryResults.ts diff --git a/libs/utils/src/lib/models/operationmanifest.ts b/libs/logic-apps-shared/src/utils/src/lib/models/operationmanifest.ts similarity index 100% rename from libs/utils/src/lib/models/operationmanifest.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/operationmanifest.ts diff --git a/libs/utils/src/lib/models/run.ts b/libs/logic-apps-shared/src/utils/src/lib/models/run.ts similarity index 100% rename from libs/utils/src/lib/models/run.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/run.ts diff --git a/libs/utils/src/lib/models/subscription.ts b/libs/logic-apps-shared/src/utils/src/lib/models/subscription.ts similarity index 100% rename from libs/utils/src/lib/models/subscription.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/subscription.ts diff --git a/libs/utils/src/lib/models/swagger.ts b/libs/logic-apps-shared/src/utils/src/lib/models/swagger.ts similarity index 95% rename from libs/utils/src/lib/models/swagger.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/swagger.ts index 1c23c241342..1cf07e3de90 100644 --- a/libs/utils/src/lib/models/swagger.ts +++ b/libs/logic-apps-shared/src/utils/src/lib/models/swagger.ts @@ -92,7 +92,7 @@ export interface ParameterBase { } export interface BodyParameter extends ParameterBase { - schema: Schema; + schema: SwaggerSchema; } export interface NonBodyParameter extends ParameterBase { @@ -146,7 +146,7 @@ export type ResponseOrReference = Response | Reference; export interface Response { description: string; - schema?: Schema; + schema?: SwaggerSchema; headers?: Headers; examples?: Example; [xdash: string]: any; @@ -193,7 +193,7 @@ export interface Reference { $ref: string; } -export interface Schema { +export interface SwaggerSchema { $ref?: string; format?: string; title?: string; @@ -215,10 +215,10 @@ export interface Schema { required?: string[]; enum?: any[]; type?: string; // Note: We might need to add support for string[] here later. - items?: Schema; - allOf?: Schema[]; - properties?: Record; - additionalProperties?: boolean | Schema; + items?: SwaggerSchema; + allOf?: SwaggerSchema[]; + properties?: Record; + additionalProperties?: boolean | SwaggerSchema; discriminator?: string; readOnly?: boolean; xml?: Xml; @@ -237,7 +237,7 @@ export interface Xml { } export interface Definitions { - [name: string]: Schema; + [name: string]: SwaggerSchema; } export interface ParametersDefinitions { diff --git a/libs/utils/src/lib/models/theme.ts b/libs/logic-apps-shared/src/utils/src/lib/models/theme.ts similarity index 100% rename from libs/utils/src/lib/models/theme.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/theme.ts diff --git a/libs/utils/src/lib/models/workflowNode.ts b/libs/logic-apps-shared/src/utils/src/lib/models/workflowNode.ts similarity index 100% rename from libs/utils/src/lib/models/workflowNode.ts rename to libs/logic-apps-shared/src/utils/src/lib/models/workflowNode.ts diff --git a/libs/logic-apps-shared/tsconfig.json b/libs/logic-apps-shared/tsconfig.json index 65b2daec7c7..38355afd08e 100644 --- a/libs/logic-apps-shared/tsconfig.json +++ b/libs/logic-apps-shared/tsconfig.json @@ -8,7 +8,8 @@ "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, - "jsx": "react" + "jsx": "react", + "esModuleInterop": true }, "files": [], "include": [], diff --git a/libs/services/designer-client-services/src/lib/__test__/__mocks__/azureOperationResponse.ts b/libs/services/designer-client-services/src/lib/__test__/__mocks__/azureOperationResponse.ts index b6ab0717aeb..98b254c5c61 100644 --- a/libs/services/designer-client-services/src/lib/__test__/__mocks__/azureOperationResponse.ts +++ b/libs/services/designer-client-services/src/lib/__test__/__mocks__/azureOperationResponse.ts @@ -1,4 +1,4 @@ -import type { DiscoveryOperation, SomeKindOfAzureOperationDiscovery } from '@microsoft/utils-logic-apps'; +import type { DiscoveryOperation, SomeKindOfAzureOperationDiscovery } from '@microsoft/logic-apps-shared'; export const azureOperationsResponse: DiscoveryOperation[] = [ { diff --git a/libs/services/designer-client-services/src/lib/__test__/__mocks__/builtInOperationResponse.ts b/libs/services/designer-client-services/src/lib/__test__/__mocks__/builtInOperationResponse.ts index 5e216406f92..6829622d416 100644 --- a/libs/services/designer-client-services/src/lib/__test__/__mocks__/builtInOperationResponse.ts +++ b/libs/services/designer-client-services/src/lib/__test__/__mocks__/builtInOperationResponse.ts @@ -1,4 +1,4 @@ -import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/utils-logic-apps'; +import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/logic-apps-shared'; export const almostAllBuiltInOperations: DiscoveryOperation[] = [ // result from this url https://management.azure.com/subscriptions/4201f397-837b-48ea-8943-980767f294ac/resourceGroups/LogicApps/providers/Microsoft.Web/sites/standarddacogbur/hostruntime/runtime/webhooks/workflow/api/management/operations?api-version=2018-11-01&workflowKind=Stateful&%24filter= diff --git a/libs/services/designer-client-services/src/lib/apimanagement.ts b/libs/services/designer-client-services/src/lib/apimanagement.ts index 5fb713ce099..690564504a8 100644 --- a/libs/services/designer-client-services/src/lib/apimanagement.ts +++ b/libs/services/designer-client-services/src/lib/apimanagement.ts @@ -1,6 +1,6 @@ import type { ListDynamicValue } from './connector'; import type { SwaggerParser } from '@microsoft/logic-apps-shared'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export interface IApiManagementService { fetchApiManagementInstances(): Promise; diff --git a/libs/services/designer-client-services/src/lib/appService.ts b/libs/services/designer-client-services/src/lib/appService.ts index a0f1ca5be77..5f875bd38a9 100644 --- a/libs/services/designer-client-services/src/lib/appService.ts +++ b/libs/services/designer-client-services/src/lib/appService.ts @@ -1,4 +1,4 @@ -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export interface IAppServiceService { fetchAppServices(): Promise; diff --git a/libs/services/designer-client-services/src/lib/base/apimanagement.ts b/libs/services/designer-client-services/src/lib/base/apimanagement.ts index 7efbb269902..852e9671bc1 100644 --- a/libs/services/designer-client-services/src/lib/base/apimanagement.ts +++ b/libs/services/designer-client-services/src/lib/base/apimanagement.ts @@ -3,7 +3,7 @@ import { getAzureResourceRecursive } from '../common/azure'; import type { ListDynamicValue } from '../connector'; import type { IHttpClient } from '../httpClient'; import { ResponseCodes, SwaggerParser } from '@microsoft/logic-apps-shared'; -import { ArgumentException, equals, unmap } from '@microsoft/utils-logic-apps'; +import { ArgumentException, equals, unmap } from '@microsoft/logic-apps-shared'; import type { QueryClient } from 'react-query'; export interface ApiManagementServiceOptions { diff --git a/libs/services/designer-client-services/src/lib/base/appService.ts b/libs/services/designer-client-services/src/lib/base/appService.ts index 4d219838ae2..194c7e6fb71 100644 --- a/libs/services/designer-client-services/src/lib/base/appService.ts +++ b/libs/services/designer-client-services/src/lib/base/appService.ts @@ -4,7 +4,7 @@ import type { ListDynamicValue } from '../connector'; import { isFunctionContainer } from '../helpers'; import type { IHttpClient } from '../httpClient'; import { ResponseCodes, SwaggerParser } from '@microsoft/logic-apps-shared'; -import { ArgumentException, unmap } from '@microsoft/utils-logic-apps'; +import { ArgumentException, unmap } from '@microsoft/logic-apps-shared'; export interface BaseAppServiceServiceOptions { baseUrl: string; diff --git a/libs/services/designer-client-services/src/lib/base/chatbot.ts b/libs/services/designer-client-services/src/lib/base/chatbot.ts index 5e254d81093..9cd02e96a68 100644 --- a/libs/services/designer-client-services/src/lib/base/chatbot.ts +++ b/libs/services/designer-client-services/src/lib/base/chatbot.ts @@ -1,5 +1,5 @@ import type { IChatbotService } from '../chatbot'; -import { ArgumentException } from '@microsoft/utils-logic-apps'; +import { ArgumentException } from '@microsoft/logic-apps-shared'; import type { AxiosResponse } from 'axios'; import axios from 'axios'; diff --git a/libs/services/designer-client-services/src/lib/base/connection.ts b/libs/services/designer-client-services/src/lib/base/connection.ts index adaa85ee53a..aadd9f2c2a5 100644 --- a/libs/services/designer-client-services/src/lib/base/connection.ts +++ b/libs/services/designer-client-services/src/lib/base/connection.ts @@ -9,7 +9,7 @@ import type { } from '../connection'; import type { HttpRequestOptions, IHttpClient, QueryParameters } from '../httpClient'; import { SwaggerParser } from '@microsoft/logic-apps-shared'; -import type { Connection, Connector, OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { Connection, Connector, OpenAPIV2 } from '@microsoft/logic-apps-shared'; import { isCustomConnector, getUniqueName, @@ -19,7 +19,7 @@ import { isArmResourceId, ArgumentException, equals, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; export interface ApiHubServiceDetails { apiVersion: string; diff --git a/libs/services/designer-client-services/src/lib/base/connector.ts b/libs/services/designer-client-services/src/lib/base/connector.ts index 87db9db886b..53eb3ea17c6 100644 --- a/libs/services/designer-client-services/src/lib/base/connector.ts +++ b/libs/services/designer-client-services/src/lib/base/connector.ts @@ -8,7 +8,7 @@ import type { import { getClientRequestIdFromHeaders, pathCombine } from '../helpers'; import type { IHttpClient } from '../httpClient'; import { getIntl } from '@microsoft/intl-logic-apps'; -import type { OpenAPIV2, OperationInfo } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2, OperationInfo } from '@microsoft/logic-apps-shared'; import { UnsupportedException, ArgumentException, @@ -16,7 +16,7 @@ import { ConnectorServiceException, equals, isArmResourceId, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; import type { IntlShape } from 'react-intl'; type GetSchemaFunction = (args: Record) => Promise; diff --git a/libs/services/designer-client-services/src/lib/base/function.ts b/libs/services/designer-client-services/src/lib/base/function.ts index 4da8baf8adf..d78bb49a929 100644 --- a/libs/services/designer-client-services/src/lib/base/function.ts +++ b/libs/services/designer-client-services/src/lib/base/function.ts @@ -4,7 +4,7 @@ import type { IFunctionService } from '../function'; import { isFunctionContainer } from '../helpers'; import type { IHttpClient } from '../httpClient'; import { ResponseCodes, SwaggerParser } from '@microsoft/logic-apps-shared'; -import { ArgumentException, unmap } from '@microsoft/utils-logic-apps'; +import { ArgumentException, unmap } from '@microsoft/logic-apps-shared'; export interface BaseFunctionServiceOptions { baseUrl: string; diff --git a/libs/services/designer-client-services/src/lib/base/gateway.ts b/libs/services/designer-client-services/src/lib/base/gateway.ts index f7b5ac5d255..40d2fa68b9b 100644 --- a/libs/services/designer-client-services/src/lib/base/gateway.ts +++ b/libs/services/designer-client-services/src/lib/base/gateway.ts @@ -1,8 +1,8 @@ import { getAzureResourceRecursive } from '../common/azure'; import type { IGatewayService } from '../gateway'; import type { IHttpClient } from '../httpClient'; -import type { Gateway, Subscription } from '@microsoft/utils-logic-apps'; -import { ArgumentException } from '@microsoft/utils-logic-apps'; +import type { Gateway, Subscription } from '@microsoft/logic-apps-shared'; +import { ArgumentException } from '@microsoft/logic-apps-shared'; export interface BaseGatewayServiceOptions { baseUrl: string; diff --git a/libs/services/designer-client-services/src/lib/base/manifests/condition.ts b/libs/services/designer-client-services/src/lib/base/manifests/condition.ts index d156b26bff6..db020ac732d 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/condition.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/condition.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/csvtable.ts b/libs/services/designer-client-services/src/lib/base/manifests/csvtable.ts index 62256aa8617..aa2719cc6d7 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/csvtable.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/csvtable.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/datetime.ts b/libs/services/designer-client-services/src/lib/base/manifests/datetime.ts index 2dac8e4a6fe..6e85173d779 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/datetime.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/datetime.ts @@ -1,6 +1,6 @@ import { frequencyValues } from './schedule'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; const timeZones = [ { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/foreach.ts b/libs/services/designer-client-services/src/lib/base/manifests/foreach.ts index 041fb511436..6a538faf505 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/foreach.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/foreach.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/htmltable.ts b/libs/services/designer-client-services/src/lib/base/manifests/htmltable.ts index 9c31dbac5f1..ef134fec9e5 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/htmltable.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/htmltable.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/http.ts b/libs/services/designer-client-services/src/lib/base/manifests/http.ts index 9d88f0e2319..60be465d666 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/http.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/http.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { OperationOptions, RecurrenceType, SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { OperationOptions, RecurrenceType, SettingScope } from '@microsoft/logic-apps-shared'; const methodOptions = [ { value: 'GET', displayName: 'GET' }, diff --git a/libs/services/designer-client-services/src/lib/base/manifests/join.ts b/libs/services/designer-client-services/src/lib/base/manifests/join.ts index 657e895d1ed..8f8702e92f4 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/join.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/join.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/parsejson.ts b/libs/services/designer-client-services/src/lib/base/manifests/parsejson.ts index 353d3cc15a9..aa835ed18cb 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/parsejson.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/parsejson.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { OutputSecureDataMode, SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { OutputSecureDataMode, SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/query.ts b/libs/services/designer-client-services/src/lib/base/manifests/query.ts index 885ae74f9dc..165ce87c3fb 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/query.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/query.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/request.ts b/libs/services/designer-client-services/src/lib/base/manifests/request.ts index b0e95a6e86d..8b2c9bce6cb 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/request.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/request.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { OperationOptions, SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { OperationOptions, SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/response.ts b/libs/services/designer-client-services/src/lib/base/manifests/response.ts index ff45b8156fc..269c797d8ca 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/response.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/response.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { OperationOptions, OutputSecureDataMode, SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { OperationOptions, OutputSecureDataMode, SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/schedule.ts b/libs/services/designer-client-services/src/lib/base/manifests/schedule.ts index aa2d4973b07..cb658c9e1f0 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/schedule.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/schedule.ts @@ -1,7 +1,7 @@ import { coreBadge } from '../../badges'; import { getIntl } from '@microsoft/intl-logic-apps'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { getFrequencyValues, RecurrenceType, SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { getFrequencyValues, RecurrenceType, SettingScope } from '@microsoft/logic-apps-shared'; export const frequencyValues = getFrequencyValues(getIntl()); diff --git a/libs/services/designer-client-services/src/lib/base/manifests/scope.ts b/libs/services/designer-client-services/src/lib/base/manifests/scope.ts index 5f6d1371bb4..986cb24c7ee 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/scope.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/scope.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/select.ts b/libs/services/designer-client-services/src/lib/base/manifests/select.ts index 8d0ad6b3ece..649c9c8b43e 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/select.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/select.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/switch.ts b/libs/services/designer-client-services/src/lib/base/manifests/switch.ts index a94b06f9ce4..ba798c3931d 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/switch.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/switch.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/terminate.ts b/libs/services/designer-client-services/src/lib/base/manifests/terminate.ts index 7e3f36345ad..b44197372db 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/terminate.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/terminate.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/until.ts b/libs/services/designer-client-services/src/lib/base/manifests/until.ts index 5af4f073901..69ac0e4e4ce 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/until.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/until.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export default { properties: { diff --git a/libs/services/designer-client-services/src/lib/base/manifests/variables.ts b/libs/services/designer-client-services/src/lib/base/manifests/variables.ts index 459e2cd569b..8d40d79cc78 100644 --- a/libs/services/designer-client-services/src/lib/base/manifests/variables.ts +++ b/libs/services/designer-client-services/src/lib/base/manifests/variables.ts @@ -1,5 +1,5 @@ -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; const brandColor = '#770BD6'; const iconUri = diff --git a/libs/services/designer-client-services/src/lib/base/oAuth.ts b/libs/services/designer-client-services/src/lib/base/oAuth.ts index c90e1276f51..a237159e3bd 100644 --- a/libs/services/designer-client-services/src/lib/base/oAuth.ts +++ b/libs/services/designer-client-services/src/lib/base/oAuth.ts @@ -1,5 +1,5 @@ import type { IOAuthPopup, LoginResult, IOAuthService, IOAuthServiceOptions, OAuthPopupOptions } from '../oAuth'; -import { ArgumentException } from '@microsoft/utils-logic-apps'; +import { ArgumentException } from '@microsoft/logic-apps-shared'; export class OAuthPopup implements IOAuthPopup { public loginPromise: Promise; diff --git a/libs/services/designer-client-services/src/lib/base/operationmanifest.ts b/libs/services/designer-client-services/src/lib/base/operationmanifest.ts index 608e9521dd7..4cab6321d13 100644 --- a/libs/services/designer-client-services/src/lib/base/operationmanifest.ts +++ b/libs/services/designer-client-services/src/lib/base/operationmanifest.ts @@ -39,8 +39,8 @@ import { initializeManifest, setManifest, } from './manifests/variables'; -import type { OperationInfo, OperationManifest } from '@microsoft/utils-logic-apps'; -import { ArgumentException, equals, UnsupportedException } from '@microsoft/utils-logic-apps'; +import type { OperationInfo, OperationManifest } from '@microsoft/logic-apps-shared'; +import { ArgumentException, equals, UnsupportedException } from '@microsoft/logic-apps-shared'; const apimanagement = 'apimanagement'; const apimanagementtrigger = 'apimanagementtrigger'; diff --git a/libs/services/designer-client-services/src/lib/base/search.ts b/libs/services/designer-client-services/src/lib/base/search.ts index 626fcd00ff2..17420a2afe5 100644 --- a/libs/services/designer-client-services/src/lib/base/search.ts +++ b/libs/services/designer-client-services/src/lib/base/search.ts @@ -15,8 +15,8 @@ import type { DiscoveryWorkflow, DiscoveryWorkflowTrigger, SomeKindOfAzureOperationDiscovery, -} from '@microsoft/utils-logic-apps'; -import { equals, ArgumentException } from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; +import { equals, ArgumentException } from '@microsoft/logic-apps-shared'; export type AzureOperationsFetchResponse = ContinuationTokenResponse[]>; export type DiscoveryOpArray = DiscoveryOperation[]; diff --git a/libs/services/designer-client-services/src/lib/chatbot.ts b/libs/services/designer-client-services/src/lib/chatbot.ts index 96107f199fc..3ce00cffabd 100644 --- a/libs/services/designer-client-services/src/lib/chatbot.ts +++ b/libs/services/designer-client-services/src/lib/chatbot.ts @@ -1,4 +1,4 @@ -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; import type { AxiosResponse } from 'axios'; export interface IChatbotService { diff --git a/libs/services/designer-client-services/src/lib/common/exceptions/connection.ts b/libs/services/designer-client-services/src/lib/common/exceptions/connection.ts index 4e9fbf17cee..ddaf4cde632 100644 --- a/libs/services/designer-client-services/src/lib/common/exceptions/connection.ts +++ b/libs/services/designer-client-services/src/lib/common/exceptions/connection.ts @@ -1,5 +1,5 @@ -import type { Exception } from '@microsoft/utils-logic-apps'; -import { BaseException } from '@microsoft/utils-logic-apps'; +import type { Exception } from '@microsoft/logic-apps-shared'; +import { BaseException } from '@microsoft/logic-apps-shared'; export const ConnectorConnectionExceptionName = 'Core.ConnectorConnectionException'; diff --git a/libs/services/designer-client-services/src/lib/common/exceptions/service.ts b/libs/services/designer-client-services/src/lib/common/exceptions/service.ts index e7b40366596..faa12b7bece 100644 --- a/libs/services/designer-client-services/src/lib/common/exceptions/service.ts +++ b/libs/services/designer-client-services/src/lib/common/exceptions/service.ts @@ -1,4 +1,4 @@ -import { BaseException } from '@microsoft/utils-logic-apps'; +import { BaseException } from '@microsoft/logic-apps-shared'; export const ServiceExceptionName = 'Host.ServiceException'; diff --git a/libs/services/designer-client-services/src/lib/connection.ts b/libs/services/designer-client-services/src/lib/connection.ts index 037cb0ae698..6c0a237b79b 100644 --- a/libs/services/designer-client-services/src/lib/connection.ts +++ b/libs/services/designer-client-services/src/lib/connection.ts @@ -1,4 +1,4 @@ -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; import type { Connector, Connection, @@ -7,7 +7,7 @@ import type { ConnectionParameterSetValues, ConnectionMetadata, OpenAPIV2, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; export interface ConnectorWithSwagger { connector: Connector; diff --git a/libs/services/designer-client-services/src/lib/connectionParameterEditor.ts b/libs/services/designer-client-services/src/lib/connectionParameterEditor.ts index 20a41112ce4..b1e8e0f8981 100644 --- a/libs/services/designer-client-services/src/lib/connectionParameterEditor.ts +++ b/libs/services/designer-client-services/src/lib/connectionParameterEditor.ts @@ -1,4 +1,4 @@ -import type { ConnectionParameter, ConnectionParameterSetParameter } from '@microsoft/utils-logic-apps'; +import type { ConnectionParameter, ConnectionParameterSetParameter } from '@microsoft/logic-apps-shared'; export interface IConnectionParameterInfo { connectorId: string; diff --git a/libs/services/designer-client-services/src/lib/connector.ts b/libs/services/designer-client-services/src/lib/connector.ts index bfee3354687..b3cacb63c95 100644 --- a/libs/services/designer-client-services/src/lib/connector.ts +++ b/libs/services/designer-client-services/src/lib/connector.ts @@ -1,6 +1,6 @@ import type { DynamicTreeExtension } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export interface ListDynamicValue { value: any; diff --git a/libs/services/designer-client-services/src/lib/consumption/connection.ts b/libs/services/designer-client-services/src/lib/consumption/connection.ts index b296d61382a..468986886b0 100644 --- a/libs/services/designer-client-services/src/lib/consumption/connection.ts +++ b/libs/services/designer-client-services/src/lib/consumption/connection.ts @@ -5,7 +5,7 @@ import { LoggerService } from '../logger'; import { LogEntryLevel, Status } from '../logging/logEntry'; import type { IOAuthPopup } from '../oAuth'; import { OAuthService } from '../oAuth'; -import type { Connector, Connection } from '@microsoft/utils-logic-apps'; +import type { Connector, Connection } from '@microsoft/logic-apps-shared'; export class ConsumptionConnectionService extends BaseConnectionService { constructor(options: BaseConnectionServiceOptions) { diff --git a/libs/services/designer-client-services/src/lib/consumption/connector.ts b/libs/services/designer-client-services/src/lib/consumption/connector.ts index 251a93e1119..5cb859bd3e6 100644 --- a/libs/services/designer-client-services/src/lib/consumption/connector.ts +++ b/libs/services/designer-client-services/src/lib/consumption/connector.ts @@ -1,8 +1,8 @@ import type { BaseConnectorServiceOptions } from '../base'; import { BaseConnectorService } from '../base'; import type { ListDynamicValue, ManagedIdentityRequestProperties, TreeDynamicExtension, TreeDynamicValue } from '../connector'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { ArgumentException, UnsupportedException, equals, getResourceName, optional } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { ArgumentException, UnsupportedException, equals, getResourceName, optional } from '@microsoft/logic-apps-shared'; interface ConsumptionConnectorServiceOptions extends BaseConnectorServiceOptions { workflowReferenceId: string; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/apiManagement.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/apiManagement.ts index ad25c2c4321..6db2a384b2c 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/apiManagement.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/apiManagement.ts @@ -1,5 +1,5 @@ import { coreBadge } from '../../badges'; -import { SettingScope, type OperationManifest, RecurrenceType } from '@microsoft/utils-logic-apps'; +import { SettingScope, type OperationManifest, RecurrenceType } from '@microsoft/logic-apps-shared'; const iconUri = 'https://logicappsv2resources.blob.core.windows.net/icons/apimanagement.svg'; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/appServices.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/appServices.ts index 3a35d70f4c4..9f8ac0bd8b0 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/appServices.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/appServices.ts @@ -1,5 +1,5 @@ import { coreBadge } from '../../badges'; -import { RecurrenceType, SettingScope, type OperationManifest } from '@microsoft/utils-logic-apps'; +import { RecurrenceType, SettingScope, type OperationManifest } from '@microsoft/logic-apps-shared'; const iconUri = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzJweCIgaGVpZ2h0PSIzMnB4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgMzIgMzIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+DQogPHJlY3Qgd2lkdGg9IjMyIiBoZWlnaHQ9IjMyIiBmaWxsPSIjNTliMmQ5Ii8+DQogPHBhdGggZD0ibTI0LjYyOCA4aC0xNy44NDN2MTZoMTguNDI5di0xNnptLTAuNjcwMTYgNy4zNzE3aC0zLjc2OTZjLTAuMzM1MDgtMi4wOTQyLTIuMDk0Mi0zLjY4NTktNC4yNzIzLTMuNjg1OS0xLjE3MjggMC0yLjI2MTggMC41MDI2Mi0zLjA5OTUgMS4yNTY1bDAuODM3NyAwLjgzNzdjMC41ODYzOS0wLjU4NjM5IDEuMzQwMy0wLjkyMTQ3IDIuMTc4LTAuOTIxNDcgMS42NzU0IDAgMy4wOTk1IDEuMzQwMyAzLjA5OTUgMy4wOTk1cy0xLjI1NjUgMy4wOTk1LTIuOTMxOSAzLjA5OTVjLTAuODM3NyAwLTEuNTkxNi0wLjMzNTA4LTIuMTc4LTAuOTIxNDdsLTAuODM3NyAwLjgzNzdjMC44Mzc3IDAuODM3NyAxLjkyNjcgMS4yNTY1IDMuMDk5NSAxLjI1NjUgMi4xNzggMCAzLjkzNzItMS41OTE2IDQuMjcyMy0zLjY4NTloMy43Njk2djYuMTE1MmgtMTYuMDg0di02LjExNTJoNi45NTI5YzAuMjUxMzEgMC4zMzUwOCAwLjU4NjM5IDAuNTg2MzkgMS4wODkgMC41ODYzOSAwLjY3MDE2IDAgMS4yNTY1LTAuNTg2MzkgMS4yNTY1LTEuMjU2NSAwLTAuNjcwMTYtMC41ODYzOS0xLjI1NjUtMS4yNTY1LTEuMjU2NS0wLjQxODg1IDAtMC44Mzc3IDAuMjUxMzEtMS4wODkgMC41ODYzOWgtNi45NTI5di02LjAzMTRoMTZ2Ni4xOTl6IiBmaWxsPSIjZmZmIiBzdHJva2Utd2lkdGg9Ii44Mzc3Ii8+DQo8L3N2Zz4NCg=='; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/as2.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/as2.ts index bdc23aad288..7e70951ed33 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/as2.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/as2.ts @@ -1,5 +1,5 @@ import { coreBadge, previewBadge } from '../../badges'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; const iconUri = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHdpZHRoPSIxMTVweCIgaGVpZ2h0PSIxMTVweCIgdmlld0JveD0iMCAwIDExNSAxMTUiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDExNSAxMTUiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHJlY3QgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGZpbGw9IiMwMDcyYzYiIHdpZHRoPSIxMTUiIGhlaWdodD0iMTE1Ii8+DQo8cG9seWdvbiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSI0OSwyNy4wMDkgNDMuMDIsMjEgNDIsMjEgNDIsMjggNDksMjggIi8+DQo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbD0iI0ZGRkZGRiIgZD0iTTgyLDI5di04SDY2djE1SDQ5di02aC04bC0xLTF2LThIMjR2MjloMTF2MTVIMjR2MjloMjVWODNoMTd2MTENCgloMjVWNzRoLThsLTEtMXYtOGgtMlY1MGgxMVYzMGgtOEw4MiwyOXogTTc3LDY1SDY2djE1SDQ5di02aC04bC0xLTF2LThoLTJWNTBoMTFWMzloMTd2MTFoMTFWNjV6Ii8+DQo8cG9seWdvbiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSI4NS4wMiwyMSA4NCwyMSA4NCwyOCA5MSwyOCA5MSwyNy4wMDkgIi8+DQo8cG9seWdvbiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSI4NCw2NSA4NCw3MiA5MSw3MiA5MSw3MS4wMDkgODUuMDIsNjUgIi8+DQo8cG9seWdvbiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSI0Miw2NSA0Miw3MiA0OSw3MiA0OSw3MS4wMDkgNDMuMDIsNjUgIi8+DQo8L3N2Zz4NCg=='; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/batchWorkflow.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/batchWorkflow.ts index 41a5304d002..26b436fb55e 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/batchWorkflow.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/batchWorkflow.ts @@ -1,5 +1,5 @@ import { coreBadge } from '../../badges'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; const iconUri = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDUwIDUwIiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCAzMiAzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCiA8cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSIjMjI4MGNjIi8+DQogPGcgdHJhbnNmb3JtPSJtYXRyaXgoLjQxMDI2IDAgMCAuNDEwMjYgNS41Mzg1IDEzLjEyOCkiIGZpbGw9IiNmZmYiPg0KICA8cGF0aCBkPSJtMzYgMTh2NmgtMTZ2LThoLTV2OWMwIDEuNjU3IDEuMzQzIDMgMyAzaDE5YzEuNjU3IDAgMy0xLjM0MyAzLTN2LTEwaC00eiIvPg0KICA8cG9seWdvbiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLC0xOCkiIHBvaW50cz0iMzMuNSAzMyA0Mi41IDMzIDM4IDI3Ii8+DQogIDxyZWN0IHg9IjYiIHk9Ii0xNCIgd2lkdGg9IjIyIiBoZWlnaHQ9IjIiLz4NCiAgPHJlY3QgeD0iNiIgeT0iMTIiIHdpZHRoPSIyMiIgaGVpZ2h0PSIyIi8+DQogIDxyZWN0IHg9IjYiIHk9Ii0xNCIgd2lkdGg9IjIiIGhlaWdodD0iMjgiLz4NCiAgPHJlY3QgeD0iMjYiIHk9Ii0xNCIgd2lkdGg9IjIiIGhlaWdodD0iMjgiLz4NCiAgPHJlY3QgeD0iMTAiIHk9Ii04IiB3aWR0aD0iMTQiIGhlaWdodD0iMiIvPg0KICA8cmVjdCB4PSIxMCIgeT0iLTIiIHdpZHRoPSIxNCIgaGVpZ2h0PSIyIi8+DQogIDxyZWN0IHg9IjEwIiB5PSI0IiB3aWR0aD0iMTQiIGhlaWdodD0iMiIvPg0KICA8cmVjdCB4PSIzMSIgeT0iNCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjIiLz4NCiAgPHJlY3QgeD0iMzEiIHk9Ii0yIiB3aWR0aD0iMTQiIGhlaWdodD0iMiIvPg0KICA8cmVjdCB4PSIzMSIgeT0iLTgiIHdpZHRoPSIxNCIgaGVpZ2h0PSIyIi8+DQogPC9nPg0KPC9zdmc+DQo='; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/compose.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/compose.ts index 5d0fc260daf..59acc73eed7 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/compose.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/compose.ts @@ -1,6 +1,6 @@ import { coreBadge } from '../../badges'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { OutputSecureDataMode, SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { OutputSecureDataMode, SettingScope } from '@microsoft/logic-apps-shared'; export const composeManifest = { properties: { diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/flatfile.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/flatfile.ts index bbe700dd4ab..1ad814a1ae7 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/flatfile.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/flatfile.ts @@ -1,7 +1,7 @@ import { flatFileGroup } from '../operations'; import { flatFileDecodingOperations, flatFileEncodingOperations } from '../operations/flatfile'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export const flatFileDecodingManifest = { properties: { diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/functions.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/functions.ts index 948be78aefb..37460edfb00 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/functions.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/functions.ts @@ -1,5 +1,5 @@ import { coreBadge } from '../../badges'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; const iconUri = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDY0IDY0IiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCAzMiAzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCiA8cmVjdCB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGZpbGw9IiMzOTk5YzYiIHN0cm9rZS13aWR0aD0iLjUiLz4NCiA8ZyB0cmFuc2Zvcm09Im1hdHJpeCguMzEwMDggMCAwIC4zMTAwOCA2LjA3NzUgNi4wNzc1KSIgZmlsbD0iI2ZmZiI+DQogIDxwYXRoIGQ9Im02MS42IDMyLjRjMC42LTAuNiAwLjQtMS41IDAtMmwtMi43LTIuNy0xMi4xLTExLjhjLTAuNi0wLjYtMS4zLTAuNi0xLjkgMHMtMC43IDEuNSAwIDJsMTIuNyAxMi40YzAuNiAwLjYgMC42IDEuNSAwIDJsLTEyLjkgMTIuOWMtMC42IDAuNi0wLjYgMS41IDAgMiAwLjYgMC42IDEuNSAwLjQgMS45IDBsMTItMTEuOSAwLjEtMC4xeiIvPg0KICA8cGF0aCBkPSJtMi40IDMyLjRjLTAuNi0wLjYtMC40LTEuNSAwLTJsMi43LTIuNyAxMi4xLTExLjhjMC42LTAuNiAxLjMtMC42IDEuOSAwczAuNyAxLjUgMCAybC0xMi41IDEyLjVjLTAuNiAwLjYtMC42IDEuNSAwIDJsMTIuNyAxMi45YzAuNiAwLjYgMC42IDEuNSAwIDItMC42IDAuNi0xLjUgMC40LTEuOSAwbC0xMi4yLTExLjgtMC4xLTAuMXoiLz4NCiAgPHBvbHlnb24gcG9pbnRzPSI0NS43IDYuMiAyOC42IDYuMiAxOS40IDMyLjEgMzAuNiAzMi4yIDIxLjggNTcuOCA0NiAyMy42IDM0LjIgMjMuNiIvPg0KIDwvZz4NCjwvc3ZnPg0K'; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/inlinecode.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/inlinecode.ts index 27c766b5de6..50bd1dca4ed 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/inlinecode.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/inlinecode.ts @@ -1,6 +1,6 @@ import { coreBadge } from '../../badges'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export const inlineCodeManifest = { properties: { diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/integrationaccountartifactlookup.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/integrationaccountartifactlookup.ts index 09b900f794b..395a8c49835 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/integrationaccountartifactlookup.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/integrationaccountartifactlookup.ts @@ -1,6 +1,6 @@ import { integrationAccountGroup } from '../operations/operationgroups'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; export const integrationAccountArtifactLookupManifest = { properties: { diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/invokeWorkflow.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/invokeWorkflow.ts index 5436012a4fb..261c6dd4fd6 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/invokeWorkflow.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/invokeWorkflow.ts @@ -1,6 +1,6 @@ import { coreBadge } from '../../badges'; import { invokeWorkflowGroup } from '../operations'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; export const invokeWorkflowManifest = { properties: { diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/liquid.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/liquid.ts index ae252b3a6e3..85849a6ebf7 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/liquid.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/liquid.ts @@ -1,6 +1,6 @@ import { liquidGroup } from '../operations'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; const iconUri = liquidGroup.properties.iconUri; const brandColor = liquidGroup.properties.brandColor; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/rosettanet.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/rosettanet.ts index 6833aeeb153..6659e3366e7 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/rosettanet.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/rosettanet.ts @@ -1,5 +1,5 @@ import { coreBadge, previewBadge } from '../../badges'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; const iconUri = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiIHZpZXdCb3g9IjAgMCA0OCA0OCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNDggNDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHJlY3QgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGZpbGw9IiM4MDQ5OTgiIHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIvPg0KPHBvbHlnb24gZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGZpbGw9IiNGRkZGRkYiIHBvaW50cz0iMjAsMTAuNjk0IDE3LjM2OSw4IDE3LDggMTcsMTEgMjAsMTEgIi8+DQo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbD0iI0ZGRkZGRiIgZD0iTTM1LDExLjYwOVY4aC03djZoLTh2LTJoLTMuNjc0TDE2LDExLjYwOVY4SDl2MTNoNHY2SDl2MTNoMTF2LTVoOA0KCXY1aDExdi05aC0zLjY3NEwzNSwzMC43MzlWMjdoLTF2LTZoNXYtOWgtMy42NzRMMzUsMTEuNjA5eiBNMzIsMjdoLTR2NmgtOHYtMmgtMy42NzRMMTYsMzAuNzM5VjI3aC0xdi02aDV2LTVoOHY1aDRWMjd6Ii8+DQo8cG9seWdvbiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSIzNi4zNjksOCAzNiw4IDM2LDExIDM5LDExIDM5LDEwLjY5NCAiLz4NCjxwb2x5Z29uIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBmaWxsPSIjRkZGRkZGIiBwb2ludHM9IjM2LDI3IDM2LDMwIDM5LDMwIDM5LDI5LjY5NCAzNi4zNjksMjcgIi8+DQo8cG9seWdvbiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSIxNywyNyAxNywzMCAyMCwzMCAyMCwyOS42OTQgMTcuMzY5LDI3ICIvPg0KPC9zdmc+DQo='; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/swaggerFunctions.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/swaggerFunctions.ts index e9f315b3e73..d77dc92ccb9 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/swaggerFunctions.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/swaggerFunctions.ts @@ -1,5 +1,5 @@ import { coreBadge } from '../../badges'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; const iconUri = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDY0IDY0IiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCAzMiAzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCiA8cmVjdCB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGZpbGw9IiMzOTk5YzYiIHN0cm9rZS13aWR0aD0iLjUiLz4NCiA8ZyB0cmFuc2Zvcm09Im1hdHJpeCguMzEwMDggMCAwIC4zMTAwOCA2LjA3NzUgNi4wNzc1KSIgZmlsbD0iI2ZmZiI+DQogIDxwYXRoIGQ9Im02MS42IDMyLjRjMC42LTAuNiAwLjQtMS41IDAtMmwtMi43LTIuNy0xMi4xLTExLjhjLTAuNi0wLjYtMS4zLTAuNi0xLjkgMHMtMC43IDEuNSAwIDJsMTIuNyAxMi40YzAuNiAwLjYgMC42IDEuNSAwIDJsLTEyLjkgMTIuOWMtMC42IDAuNi0wLjYgMS41IDAgMiAwLjYgMC42IDEuNSAwLjQgMS45IDBsMTItMTEuOSAwLjEtMC4xeiIvPg0KICA8cGF0aCBkPSJtMi40IDMyLjRjLTAuNi0wLjYtMC40LTEuNSAwLTJsMi43LTIuNyAxMi4xLTExLjhjMC42LTAuNiAxLjMtMC42IDEuOSAwczAuNyAxLjUgMCAybC0xMi41IDEyLjVjLTAuNiAwLjYtMC42IDEuNSAwIDJsMTIuNyAxMi45YzAuNiAwLjYgMC42IDEuNSAwIDItMC42IDAuNi0xLjUgMC40LTEuOSAwbC0xMi4yLTExLjgtMC4xLTAuMXoiLz4NCiAgPHBvbHlnb24gcG9pbnRzPSI0NS43IDYuMiAyOC42IDYuMiAxOS40IDMyLjEgMzAuNiAzMi4yIDIxLjggNTcuOCA0NiAyMy42IDM0LjIgMjMuNiIvPg0KIDwvZz4NCjwvc3ZnPg0K'; diff --git a/libs/services/designer-client-services/src/lib/consumption/manifests/xml.ts b/libs/services/designer-client-services/src/lib/consumption/manifests/xml.ts index a75da0bf9b5..f07995db345 100644 --- a/libs/services/designer-client-services/src/lib/consumption/manifests/xml.ts +++ b/libs/services/designer-client-services/src/lib/consumption/manifests/xml.ts @@ -1,6 +1,6 @@ import { xmlGroup, xmlValidationOperation } from '../operations'; -import type { OperationManifest } from '@microsoft/utils-logic-apps'; -import { SettingScope } from '@microsoft/utils-logic-apps'; +import type { OperationManifest } from '@microsoft/logic-apps-shared'; +import { SettingScope } from '@microsoft/logic-apps-shared'; const settings: any = { secureData: {}, diff --git a/libs/services/designer-client-services/src/lib/consumption/operationmanifest.ts b/libs/services/designer-client-services/src/lib/consumption/operationmanifest.ts index 432264af52a..1d95fa0e89a 100644 --- a/libs/services/designer-client-services/src/lib/consumption/operationmanifest.ts +++ b/libs/services/designer-client-services/src/lib/consumption/operationmanifest.ts @@ -21,8 +21,8 @@ import { rosettaNetEncodeManifest, rosettaNetDecodeManifest, rosettaNetWaitForRe import { selectSwaggerFunctionManifest } from './manifests/swaggerFunctions'; import { xmlTransformManifest, xmlValidationManifest } from './manifests/xml'; import { functionGroup, functionOperation, invokeWorkflowGroup, invokeWorkflowOperation, swaggerFunctionOperation } from './operations'; -import type { OperationInfo, OperationManifest } from '@microsoft/utils-logic-apps'; -import { ArgumentException, UnsupportedException, startsWith } from '@microsoft/utils-logic-apps'; +import type { OperationInfo, OperationManifest } from '@microsoft/logic-apps-shared'; +import { ArgumentException, UnsupportedException, startsWith } from '@microsoft/logic-apps-shared'; interface ConsumptionOperationManifestServiceOptions extends BaseOperationManifestServiceOptions { subscriptionId: string; diff --git a/libs/services/designer-client-services/src/lib/consumption/run.ts b/libs/services/designer-client-services/src/lib/consumption/run.ts index 721dac82976..4e8532adb60 100644 --- a/libs/services/designer-client-services/src/lib/consumption/run.ts +++ b/libs/services/designer-client-services/src/lib/consumption/run.ts @@ -3,7 +3,7 @@ import type { HttpRequestOptions, IHttpClient } from '../httpClient'; import type { IRunService } from '../run'; import type { CallbackInfo } from '../workflow'; import { isNumber } from '@microsoft/logic-apps-shared'; -import type { ArmResources, BoundParameters, ContentLink, LogicAppsV2, Run, Runs } from '@microsoft/utils-logic-apps'; +import type { ArmResources, BoundParameters, ContentLink, LogicAppsV2, Run, Runs } from '@microsoft/logic-apps-shared'; import { isCallbackInfoWithRelativePath, ArgumentException, @@ -14,7 +14,7 @@ import { isNullOrUndefined, isBoolean, getRecordEntry, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; export interface ConsumptionRunServiceOptions { apiVersion: string; diff --git a/libs/services/designer-client-services/src/lib/consumption/search.ts b/libs/services/designer-client-services/src/lib/consumption/search.ts index c069999746a..c2310d16d90 100644 --- a/libs/services/designer-client-services/src/lib/consumption/search.ts +++ b/libs/services/designer-client-services/src/lib/consumption/search.ts @@ -4,7 +4,7 @@ import type { BaseSearchServiceOptions, DiscoveryOpArray } from '../base/search' import type { ContinuationTokenResponse } from '../common/azure'; import type { QueryParameters } from '../httpClient'; import * as OperationsData from './operations'; -import type { Connector, DiscoveryOperation, DiscoveryResultTypes, SomeKindOfAzureOperationDiscovery } from '@microsoft/utils-logic-apps'; +import type { Connector, DiscoveryOperation, DiscoveryResultTypes, SomeKindOfAzureOperationDiscovery } from '@microsoft/logic-apps-shared'; const ISE_RESOURCE_ID = 'properties/integrationServiceEnvironmentResourceId'; diff --git a/libs/services/designer-client-services/src/lib/editor.ts b/libs/services/designer-client-services/src/lib/editor.ts index 89601a74870..97ff36e740f 100644 --- a/libs/services/designer-client-services/src/lib/editor.ts +++ b/libs/services/designer-client-services/src/lib/editor.ts @@ -1,4 +1,4 @@ -import type { OperationInfo } from '@microsoft/utils-logic-apps'; +import type { OperationInfo } from '@microsoft/logic-apps-shared'; /** * Compatible with `ValueSegment` from @microsoft/designer-ui but without circular dependencies. diff --git a/libs/services/designer-client-services/src/lib/function.ts b/libs/services/designer-client-services/src/lib/function.ts index 72a1af90c2a..2ae1af1f086 100644 --- a/libs/services/designer-client-services/src/lib/function.ts +++ b/libs/services/designer-client-services/src/lib/function.ts @@ -1,5 +1,5 @@ import type { SwaggerParser } from '@microsoft/logic-apps-shared'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export interface IFunctionService { fetchFunctionApps(): Promise; diff --git a/libs/services/designer-client-services/src/lib/gateway.ts b/libs/services/designer-client-services/src/lib/gateway.ts index 118a653c665..8a7300ee48e 100644 --- a/libs/services/designer-client-services/src/lib/gateway.ts +++ b/libs/services/designer-client-services/src/lib/gateway.ts @@ -1,5 +1,5 @@ -import type { Gateway, Subscription } from '@microsoft/utils-logic-apps'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import type { Gateway, Subscription } from '@microsoft/logic-apps-shared'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export interface IGatewayService { /** diff --git a/libs/services/designer-client-services/src/lib/helpers.ts b/libs/services/designer-client-services/src/lib/helpers.ts index 8a233b820f8..91a395d12f6 100644 --- a/libs/services/designer-client-services/src/lib/helpers.ts +++ b/libs/services/designer-client-services/src/lib/helpers.ts @@ -1,4 +1,4 @@ -import { equals } from '@microsoft/utils-logic-apps'; +import { equals } from '@microsoft/logic-apps-shared'; export function pathCombine(url: string, path: string): string { let pathUrl: string; diff --git a/libs/services/designer-client-services/src/lib/host.ts b/libs/services/designer-client-services/src/lib/host.ts index 66911ba1fd2..abb947b0e78 100644 --- a/libs/services/designer-client-services/src/lib/host.ts +++ b/libs/services/designer-client-services/src/lib/host.ts @@ -1,4 +1,4 @@ -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export const ContentType = { Inputs: 'inputs', diff --git a/libs/services/designer-client-services/src/lib/logger.ts b/libs/services/designer-client-services/src/lib/logger.ts index dc58d5a7246..86baf252c4d 100644 --- a/libs/services/designer-client-services/src/lib/logger.ts +++ b/libs/services/designer-client-services/src/lib/logger.ts @@ -1,5 +1,5 @@ import type { LogEntry, TelemetryEvent } from './logging/logEntry'; -import { AssertionErrorCode, AssertionException, guid } from '@microsoft/utils-logic-apps'; +import { AssertionErrorCode, AssertionException, guid } from '@microsoft/logic-apps-shared'; export interface ILoggerService { log: (entry: Omit) => void; diff --git a/libs/services/designer-client-services/src/lib/logging/devLogger.ts b/libs/services/designer-client-services/src/lib/logging/devLogger.ts index a32e76e9756..7c86ac8fb6b 100644 --- a/libs/services/designer-client-services/src/lib/logging/devLogger.ts +++ b/libs/services/designer-client-services/src/lib/logging/devLogger.ts @@ -2,7 +2,7 @@ import type { ILoggerService } from '../logger'; import { BrowserReporter } from './browserLogger'; import type { LogEntry, TelemetryEvent } from './logEntry'; import { LogEntryLevel } from './logEntry'; -import { guid } from '@microsoft/utils-logic-apps'; +import { guid } from '@microsoft/logic-apps-shared'; export class DevLogger implements ILoggerService { private traceIds = new Map; startTime: number }>(); diff --git a/libs/services/designer-client-services/src/lib/oAuth.ts b/libs/services/designer-client-services/src/lib/oAuth.ts index 600db8c2052..426b0274657 100644 --- a/libs/services/designer-client-services/src/lib/oAuth.ts +++ b/libs/services/designer-client-services/src/lib/oAuth.ts @@ -1,5 +1,5 @@ import type { IHttpClient } from './httpClient'; -import { AssertionException, AssertionErrorCode } from '@microsoft/utils-logic-apps'; +import { AssertionException, AssertionErrorCode } from '@microsoft/logic-apps-shared'; export interface LoginResult { [x: string]: any; diff --git a/libs/services/designer-client-services/src/lib/operationmanifest.ts b/libs/services/designer-client-services/src/lib/operationmanifest.ts index d9884b97884..fa003419660 100644 --- a/libs/services/designer-client-services/src/lib/operationmanifest.ts +++ b/libs/services/designer-client-services/src/lib/operationmanifest.ts @@ -1,5 +1,5 @@ -import type { OperationInfo, OperationManifest } from '@microsoft/utils-logic-apps'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import type { OperationInfo, OperationManifest } from '@microsoft/logic-apps-shared'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; /** * The operation manifest service. diff --git a/libs/services/designer-client-services/src/lib/run.ts b/libs/services/designer-client-services/src/lib/run.ts index ae01126c054..bdd4365d5d9 100644 --- a/libs/services/designer-client-services/src/lib/run.ts +++ b/libs/services/designer-client-services/src/lib/run.ts @@ -1,6 +1,6 @@ import type { CallbackInfo } from './workflow'; -import type { ContentLink, LogicAppsV2, Run, RunError, Runs } from '@microsoft/utils-logic-apps'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import type { ContentLink, LogicAppsV2, Run, RunError, Runs } from '@microsoft/logic-apps-shared'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export interface IRunService { getContent(contentLink: ContentLink): Promise; diff --git a/libs/services/designer-client-services/src/lib/search.ts b/libs/services/designer-client-services/src/lib/search.ts index 5933a4c2915..dee9ff2423e 100644 --- a/libs/services/designer-client-services/src/lib/search.ts +++ b/libs/services/designer-client-services/src/lib/search.ts @@ -5,8 +5,8 @@ import type { DiscoveryResultTypes, DiscoveryWorkflow, DiscoveryWorkflowTrigger, -} from '@microsoft/utils-logic-apps'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export type OperationRuntimeCategory = { key: string; diff --git a/libs/services/designer-client-services/src/lib/standard/connection.ts b/libs/services/designer-client-services/src/lib/standard/connection.ts index b1f8b3e2d3b..97c68f266bb 100644 --- a/libs/services/designer-client-services/src/lib/standard/connection.ts +++ b/libs/services/designer-client-services/src/lib/standard/connection.ts @@ -9,7 +9,7 @@ import { LogEntryLevel, Status } from '../logging/logEntry'; import type { IOAuthPopup } from '../oAuth'; import { OAuthService } from '../oAuth'; import { getIntl } from '@microsoft/intl-logic-apps'; -import type { Connection, ConnectionParameter, Connector, ManagedIdentity } from '@microsoft/utils-logic-apps'; +import type { Connection, ConnectionParameter, Connector, ManagedIdentity } from '@microsoft/logic-apps-shared'; import { ArgumentException, AssertionErrorCode, @@ -23,7 +23,7 @@ import { isIdentityAssociatedWithLogicApp, safeSetObjectPropertyValue, createCopy, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; interface ConnectionAcl { id: string; diff --git a/libs/services/designer-client-services/src/lib/standard/connector.ts b/libs/services/designer-client-services/src/lib/standard/connector.ts index 37088cb5d90..2abc567be58 100644 --- a/libs/services/designer-client-services/src/lib/standard/connector.ts +++ b/libs/services/designer-client-services/src/lib/standard/connector.ts @@ -1,8 +1,8 @@ import type { BaseConnectorServiceOptions } from '../base'; import { BaseConnectorService } from '../base'; import type { ListDynamicValue, ManagedIdentityRequestProperties, TreeDynamicExtension, TreeDynamicValue } from '../connector'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { ArgumentException, UnsupportedException } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { ArgumentException, UnsupportedException } from '@microsoft/logic-apps-shared'; type GetConfigurationFunction = (connectionId: string) => Promise>; diff --git a/libs/services/designer-client-services/src/lib/standard/operationmanifest.ts b/libs/services/designer-client-services/src/lib/standard/operationmanifest.ts index 9fc6bee3243..b604017338d 100644 --- a/libs/services/designer-client-services/src/lib/standard/operationmanifest.ts +++ b/libs/services/designer-client-services/src/lib/standard/operationmanifest.ts @@ -1,7 +1,7 @@ import { BaseOperationManifestService } from '../base'; import { getBuiltInOperationInfo, isBuiltInOperation, supportedBaseManifestObjects } from '../base/operationmanifest'; -import type { OperationInfo, OperationManifest } from '@microsoft/utils-logic-apps'; -import { equals, ConnectionType } from '@microsoft/utils-logic-apps'; +import type { OperationInfo, OperationManifest } from '@microsoft/logic-apps-shared'; +import { equals, ConnectionType } from '@microsoft/logic-apps-shared'; export class StandardOperationManifestService extends BaseOperationManifestService { override async getOperationInfo(definition: any, isTrigger: boolean): Promise { diff --git a/libs/services/designer-client-services/src/lib/standard/run.ts b/libs/services/designer-client-services/src/lib/standard/run.ts index 68a9c08b088..ebf97bd22bc 100644 --- a/libs/services/designer-client-services/src/lib/standard/run.ts +++ b/libs/services/designer-client-services/src/lib/standard/run.ts @@ -3,7 +3,7 @@ import type { HttpRequestOptions, IHttpClient } from '../httpClient'; import type { IRunService } from '../run'; import type { CallbackInfo } from '../workflow'; import { isNumber } from '@microsoft/logic-apps-shared'; -import type { ArmResources, BoundParameters, ContentLink, LogicAppsV2, Run, Runs } from '@microsoft/utils-logic-apps'; +import type { ArmResources, BoundParameters, ContentLink, LogicAppsV2, Run, Runs } from '@microsoft/logic-apps-shared'; import { isCallbackInfoWithRelativePath, ArgumentException, @@ -14,7 +14,7 @@ import { isNullOrUndefined, isBoolean, getRecordEntry, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; export interface RunServiceOptions { apiVersion: string; diff --git a/libs/services/designer-client-services/src/lib/standard/search.ts b/libs/services/designer-client-services/src/lib/standard/search.ts index 6f0f9cea0f9..5c8b0c2d8c7 100644 --- a/libs/services/designer-client-services/src/lib/standard/search.ts +++ b/libs/services/designer-client-services/src/lib/standard/search.ts @@ -4,8 +4,8 @@ import type { AzureOperationsFetchResponse, BaseSearchServiceOptions, DiscoveryO import { getClientBuiltInOperations, getClientBuiltInConnectors } from '../base/search'; import type { ContinuationTokenResponse } from '../common/azure'; import type { QueryParameters } from '../httpClient'; -import type { BuiltInOperation, Connector, DiscoveryOperation, SomeKindOfAzureOperationDiscovery } from '@microsoft/utils-logic-apps'; -import { ArgumentException, connectorsSearchResultsMock } from '@microsoft/utils-logic-apps'; +import type { BuiltInOperation, Connector, DiscoveryOperation, SomeKindOfAzureOperationDiscovery } from '@microsoft/logic-apps-shared'; +import { ArgumentException, connectorsSearchResultsMock } from '@microsoft/logic-apps-shared'; const ISE_RESOURCE_ID = 'properties/integrationServiceEnvironmentResourceId'; diff --git a/libs/services/designer-client-services/src/lib/staticresult.ts b/libs/services/designer-client-services/src/lib/staticresult.ts index d6ca650841a..31dc05bb5ac 100644 --- a/libs/services/designer-client-services/src/lib/staticresult.ts +++ b/libs/services/designer-client-services/src/lib/staticresult.ts @@ -1,5 +1,5 @@ import { StaticResultSchemaService } from './staticresultschema'; -import type { ManifestParser, Schema, SwaggerParser } from '@microsoft/logic-apps-shared'; +import type { ManifestParser, OpenApiSchema, SwaggerParser } from '@microsoft/logic-apps-shared'; /** * The operation result schema service. @@ -10,9 +10,13 @@ export interface IStaticResultSchemaService { * @arg {string} connectorId - The connector id. * @arg {string} operationId - The operation id. * @arg {SwaggerParser | ManifestParser} [parser] - The supported parser for the node type. - * @return {Promise} + * @return {Promise} */ - getOperationResultSchema(connectorId: string, operationId: string, parser?: SwaggerParser | ManifestParser): Promise; + getOperationResultSchema( + connectorId: string, + operationId: string, + parser?: SwaggerParser | ManifestParser + ): Promise; } let service: IStaticResultSchemaService; diff --git a/libs/services/designer-client-services/src/lib/staticresultschema/index.ts b/libs/services/designer-client-services/src/lib/staticresultschema/index.ts index d3c9267dffe..c735f5c2555 100644 --- a/libs/services/designer-client-services/src/lib/staticresultschema/index.ts +++ b/libs/services/designer-client-services/src/lib/staticresultschema/index.ts @@ -26,7 +26,7 @@ import { isManagedConnector, isSharedManagedConnectorFromPApps, isSharedManagedConnector, -} from '@microsoft/utils-logic-apps'; +} from '@microsoft/logic-apps-shared'; /** * Factory method to provide the static result root schema for an operation diff --git a/libs/services/designer-client-services/src/lib/staticresultschema/schemas/apiConnector.ts b/libs/services/designer-client-services/src/lib/staticresultschema/schemas/apiConnector.ts index 11bcfdef3c2..b4f3ffbff53 100644 --- a/libs/services/designer-client-services/src/lib/staticresultschema/schemas/apiConnector.ts +++ b/libs/services/designer-client-services/src/lib/staticresultschema/schemas/apiConnector.ts @@ -1,9 +1,9 @@ import type { StaticResultRootSchemaType } from './baseactionresult'; import { HttpStaticResultSchema } from './httpresult'; -import type { ManifestParser, Schema, SwaggerParser } from '@microsoft/logic-apps-shared'; +import type { ManifestParser, OpenApiSchema, SwaggerParser } from '@microsoft/logic-apps-shared'; import { ExtensionProperties } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { clone } from '@microsoft/utils-logic-apps'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { clone } from '@microsoft/logic-apps-shared'; /** * Returns the root schema for a connector operation. @@ -20,10 +20,10 @@ export const getStaticResultSchemaForAPIConnector = ( /** * Wraps the static output schema to the operation schema. - * @arg {Schema} outputSchema - the operation output schema. + * @arg {OpenApiSchema} outputSchema - the operation output schema. * @return {StaticResultRootSchemaType} - The root schema for connector operation. */ -const wrapOutputsSchemaToOperationSchema = (outputSchema: Schema): Promise => { +const wrapOutputsSchemaToOperationSchema = (outputSchema: OpenApiSchema): Promise => { const schema = clone(HttpStaticResultSchema); if (outputSchema) { const newSchema = cleanDynamicSchemaParameters(clone(outputSchema)); @@ -37,8 +37,8 @@ const wrapOutputsSchemaToOperationSchema = (outputSchema: Schema): Promise { if (!schema) { diff --git a/libs/services/designer-client-services/src/lib/staticresultschema/schemas/baseactionresult.ts b/libs/services/designer-client-services/src/lib/staticresultschema/schemas/baseactionresult.ts index 21964627335..362acab5753 100644 --- a/libs/services/designer-client-services/src/lib/staticresultschema/schemas/baseactionresult.ts +++ b/libs/services/designer-client-services/src/lib/staticresultschema/schemas/baseactionresult.ts @@ -1,13 +1,13 @@ import { getIntl } from '@microsoft/intl-logic-apps'; -import type { Schema } from '@microsoft/logic-apps-shared'; -import type { OpenAPIV2 } from '@microsoft/utils-logic-apps'; +import type { OpenApiSchema } from '@microsoft/logic-apps-shared'; +import type { OpenAPIV2 } from '@microsoft/logic-apps-shared'; export type StaticResultRootSchemaType = OpenAPIV2.SchemaObject & { properties: { - status: Schema; - code: Schema; - error: Schema; - outputs?: Schema; + status: OpenApiSchema; + code: OpenApiSchema; + error: OpenApiSchema; + outputs?: OpenApiSchema; }; }; diff --git a/libs/services/designer-client-services/src/lib/staticresultschema/schemas/httpresult.ts b/libs/services/designer-client-services/src/lib/staticresultschema/schemas/httpresult.ts index c99e976f9d1..a82e6df39c8 100644 --- a/libs/services/designer-client-services/src/lib/staticresultschema/schemas/httpresult.ts +++ b/libs/services/designer-client-services/src/lib/staticresultschema/schemas/httpresult.ts @@ -1,6 +1,6 @@ import { StaticResultRootSchema } from './baseactionresult'; import { getIntl } from '@microsoft/intl-logic-apps'; -import type { Schema } from '@microsoft/logic-apps-shared'; +import type { OpenApiSchema } from '@microsoft/logic-apps-shared'; const intl = getIntl(); @@ -42,11 +42,11 @@ export const HttpStaticResultSchema = { type: 'string', }, title: STATIC_RESULT_HTTP_HEADERS_TITLE, - } as Schema, + } as OpenApiSchema, body: { type: 'string', title: STATIC_RESULT_HTTP_BODY_TITLE, - } as Schema, + } as OpenApiSchema, }, type: 'object', title: STATIC_RESULT_OPERATION_OUTPUT_TITLE, diff --git a/libs/services/designer-client-services/src/lib/staticresultschema/schemas/parseJson.ts b/libs/services/designer-client-services/src/lib/staticresultschema/schemas/parseJson.ts index a71ec15806b..2efe150f956 100644 --- a/libs/services/designer-client-services/src/lib/staticresultschema/schemas/parseJson.ts +++ b/libs/services/designer-client-services/src/lib/staticresultschema/schemas/parseJson.ts @@ -1,7 +1,7 @@ import { StaticResultRootSchema } from './baseactionresult'; import { getIntl } from '@microsoft/intl-logic-apps'; -import type { Schema } from '@microsoft/logic-apps-shared'; -import { clone } from '@microsoft/utils-logic-apps'; +import type { OpenApiSchema } from '@microsoft/logic-apps-shared'; +import { clone } from '@microsoft/logic-apps-shared'; const intl = getIntl(); @@ -102,8 +102,8 @@ const STATIC_RESULT_PARSE_JSON_CHILD_ERRORS_TITLE = intl.formatMessage({ description: 'The title of the child errors field in the static result parseJson action', }); -function getValidationErrorSchema(): Schema { - const validationErrorSchema: Schema = { +function getValidationErrorSchema(): OpenApiSchema { + const validationErrorSchema: OpenApiSchema = { type: 'object', title: STATIC_RESULT_VALIDATION_ERROR_TITLE, properties: { diff --git a/libs/services/designer-client-services/src/lib/workflow.ts b/libs/services/designer-client-services/src/lib/workflow.ts index bcbbc1315d9..4d9ad78f3ad 100644 --- a/libs/services/designer-client-services/src/lib/workflow.ts +++ b/libs/services/designer-client-services/src/lib/workflow.ts @@ -1,5 +1,5 @@ -import type { LogicAppsV2, ManagedIdentity, OpenAPIV2 } from '@microsoft/utils-logic-apps'; -import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2, ManagedIdentity, OpenAPIV2 } from '@microsoft/logic-apps-shared'; +import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared'; export interface CallbackInfo { method?: string; diff --git a/libs/services/designer-client-services/tsconfig.json b/libs/services/designer-client-services/tsconfig.json index 3b508d2cd8a..348eebc9dc1 100644 --- a/libs/services/designer-client-services/tsconfig.json +++ b/libs/services/designer-client-services/tsconfig.json @@ -7,7 +7,8 @@ "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, - "jsx": "react" + "jsx": "react", + "esModuleInterop": true }, "files": [], "include": [], diff --git a/libs/utils/.babelrc b/libs/utils/.babelrc deleted file mode 100644 index 61641ec8ac3..00000000000 --- a/libs/utils/.babelrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "presets": [ - [ - "@nrwl/react/babel", - { - "runtime": "automatic" - } - ] - ], - "plugins": [] -} diff --git a/libs/utils/.eslintrc.json b/libs/utils/.eslintrc.json deleted file mode 100644 index 9d9c0db55bb..00000000000 --- a/libs/utils/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/libs/utils/README.md b/libs/utils/README.md deleted file mode 100644 index cafd71d079c..00000000000 --- a/libs/utils/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# utils - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test utils` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/utils/jest.config.ts b/libs/utils/jest.config.ts deleted file mode 100644 index 9fdf202f2ab..00000000000 --- a/libs/utils/jest.config.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* eslint-disable */ -export default { - displayName: 'utils', - preset: '../../jest.preset.js', - globals: { - 'ts-jest': { - tsconfig: '/tsconfig.spec.json', - }, - }, - transform: { - '^.+\\.[tj]s$': 'ts-jest', - '^.+\\.[tj]sx?$': [ - 'babel-jest', - { - presets: ['@nrwl/react/babel'], - plugins: [ - [ - 'formatjs', - { - idInterpolationPattern: '[sha512:contenthash:base64:6]', - ast: true, - }, - ], - ], - }, - ], - '^.+\\.svg$': '../../__mocks__/svgTransform.js', - }, - moduleNameMapper: { - '@fluentui/react/lib/(.*)$': '@fluentui/react/lib-commonjs/$1', - }, - moduleFileExtensions: ['ts', 'js', 'html'], - coverageDirectory: '../../coverage/libs/utils', -}; diff --git a/libs/utils/package.json b/libs/utils/package.json deleted file mode 100644 index 20a648fec85..00000000000 --- a/libs/utils/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "@microsoft/utils-logic-apps", - "version": "2.119.0", - "scripts": { - "yalcpush": "yalc push ../../dist/libs/utils" - } -} diff --git a/libs/utils/project.json b/libs/utils/project.json deleted file mode 100644 index eec333365eb..00000000000 --- a/libs/utils/project.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "name": "utils", - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/utils/src", - "projectType": "library", - "targets": { - "build": { - "executor": "@nrwl/rollup:rollup", - "outputs": ["{options.outputPath}"], - "options": { - "outputPath": "dist/libs/utils", - "main": "libs/utils/src/index.ts", - "tsConfig": "libs/utils/tsconfig.lib.json", - "project": "libs/utils/package.json", - "buildableProjectDepsInPackageJsonType": "dependencies", - "entryFile": "libs/utils/src/index.ts", - "rollupConfig": "@nrwl/react/plugins/bundle-rollup", - "format": ["cjs", "esm"], - "assets": [ - { - "glob": "libs/utils/README.md", - "input": ".", - "output": "." - } - ] - } - }, - "yalcpush": { - "executor": "nx:run-script", - "outputs": ["{options.outputPath}"], - "dependsOn": [ - { - "target": "build", - "projects": "self" - } - ], - "options": { - "script": "yalcpush" - } - }, - "lint": { - "executor": "@nrwl/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/utils/**/*.ts"] - } - }, - "test": { - "executor": "@nrwl/jest:jest", - "outputs": ["{workspaceRoot}/coverage/libs/utils"], - "options": { - "jestConfig": "libs/utils/jest.config.ts", - "passWithNoTests": true - } - } - }, - "tags": [] -} diff --git a/libs/utils/tsconfig.json b/libs/utils/tsconfig.json deleted file mode 100644 index 32b6198e33b..00000000000 --- a/libs/utils/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "forceConsistentCasingInFileNames": true, - "strict": true, - "noImplicitOverride": true, - "noPropertyAccessFromIndexSignature": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "esModuleInterop": true - }, - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - }, - { - "path": "./tsconfig.spec.json" - } - ] -} diff --git a/libs/utils/tsconfig.lib.json b/libs/utils/tsconfig.lib.json deleted file mode 100644 index a87bd6b7875..00000000000 --- a/libs/utils/tsconfig.lib.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "declaration": true, - "types": [] - }, - "include": ["**/*.ts"], - "exclude": ["**/*.spec.ts", "jest.config.ts"] -} diff --git a/libs/utils/tsconfig.spec.json b/libs/utils/tsconfig.spec.json deleted file mode 100644 index f95b08f8f79..00000000000 --- a/libs/utils/tsconfig.spec.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts", "jest.config.ts"] -} diff --git a/libs/vscode-extension/project.json b/libs/vscode-extension/project.json index 7ac2dc7d470..958378616b7 100644 --- a/libs/vscode-extension/project.json +++ b/libs/vscode-extension/project.json @@ -10,7 +10,7 @@ "options": { "outputPath": "dist/libs/vscode-extension", "main": "libs/vscode-extension/src/index.ts", - "tsConfig": "libs/vscode-extension/tsconfig.lib.json", + "tsConfig": "libs/vscode-extension/tsconfig.json", "assets": ["libs/vscode-extension/*.md"] } }, diff --git a/libs/vscode-extension/src/lib/models/dataMapper.ts b/libs/vscode-extension/src/lib/models/dataMapper.ts index d53ee6f2f2c..ed69a55d386 100644 --- a/libs/vscode-extension/src/lib/models/dataMapper.ts +++ b/libs/vscode-extension/src/lib/models/dataMapper.ts @@ -1,5 +1,5 @@ import type { ExtensionCommand } from './extensioncommand'; -import type { MapDefinitionEntry, MapMetadata, SchemaType } from '@microsoft/utils-logic-apps'; +import type { MapDefinitionEntry, MapMetadata, SchemaType } from '@microsoft/logic-apps-shared'; type InitializeData = { project: string }; type FetchSchemaData = { fileName: string; type: SchemaType }; diff --git a/libs/vscode-extension/src/lib/models/workflow.ts b/libs/vscode-extension/src/lib/models/workflow.ts index 743ef37e36a..c1c2d33842a 100644 --- a/libs/vscode-extension/src/lib/models/workflow.ts +++ b/libs/vscode-extension/src/lib/models/workflow.ts @@ -1,6 +1,6 @@ import type { Artifacts, FileDetails } from './artifact'; import type { Parameter } from './parameter'; -import type { LogicAppsV2 } from '@microsoft/utils-logic-apps'; +import type { LogicAppsV2 } from '@microsoft/logic-apps-shared'; export interface ILocalSettingsJson { IsEncrypted?: boolean; diff --git a/libs/vscode-extension/src/lib/services/httpClient.ts b/libs/vscode-extension/src/lib/services/httpClient.ts index 097eeebb830..25b4f002cbc 100644 --- a/libs/vscode-extension/src/lib/services/httpClient.ts +++ b/libs/vscode-extension/src/lib/services/httpClient.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-empty-function */ import type { HttpRequestOptions, IHttpClient } from '@microsoft/designer-client-services-logic-apps'; -import { HTTP_METHODS } from '@microsoft/utils-logic-apps'; +import { HTTP_METHODS } from '@microsoft/logic-apps-shared'; import axios from 'axios'; export interface HttpOptions { diff --git a/tsconfig.base.json b/tsconfig.base.json index 21f69360f49..09faf042f4b 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -26,7 +26,7 @@ "@microsoft/logic-apps-designer": ["libs/designer/src/index.ts"], "@microsoft/logic-apps-shared": ["libs/logic-apps-shared/src/index.ts"], "@microsoft/nx-playwright": ["libs/plugins/playwright/src/index.ts"], - "@microsoft/utils-logic-apps": ["libs/utils/src/index.ts"], + "@microsoft/utils-logic-apps": ["libs/logic-apps-shared/src/utils/src/index.ts"], "@microsoft/vscode-extension": ["libs/vscode-extension/src/index.ts"] } }, diff --git a/workspace.json b/workspace.json index 6f869b87c31..e663e34913d 100644 --- a/workspace.json +++ b/workspace.json @@ -13,7 +13,6 @@ "plugins-playwright": "libs/plugins/playwright", "services-designer-client-services": "libs/services/designer-client-services", "services-intl": "libs/services/intl", - "utils": "libs/utils", "vs-code-designer": "apps/vs-code-designer", "vs-code-react": "apps/vs-code-react", "vscode-extension": "libs/vscode-extension"