Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(all): Fix designer client service imports from logic-app-shared #4442

Merged
merged 1 commit into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintcache

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { DiscoveryOperation, SomeKindOfAzureOperationDiscovery } from '@microsoft/logic-apps-shared';
import type { DiscoveryOperation, SomeKindOfAzureOperationDiscovery } from '../../../../utils/src';

export const azureOperationsResponse: DiscoveryOperation<SomeKindOfAzureOperationDiscovery>[] = [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { DiscoveryOperation, DiscoveryResultTypes } from '@microsoft/logic-apps-shared';
import type { DiscoveryOperation, DiscoveryResultTypes } from '../../../../utils/src';

export const almostAllBuiltInOperations: DiscoveryOperation<DiscoveryResultTypes>[] = [
// 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=
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { SwaggerParser } from '../../parsers';
import { AssertionErrorCode, AssertionException } from '../../utils/src';
import type { ListDynamicValue } from './connector';
import type { SwaggerParser } from '@microsoft/logic-apps-shared';
import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared';

export interface IApiManagementService {
fetchApiManagementInstances(): Promise<any>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared';
import { AssertionErrorCode, AssertionException } from '../../utils/src';

export interface IAppServiceService {
fetchAppServices(): Promise<any>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { ResponseCodes, SwaggerParser } from '../../../parsers';
import { ArgumentException, equals, unmap } from '../../../utils/src';
import type { IApiManagementService } from '../apimanagement';
import { getAzureResourceRecursive } from '../common/azure';
import type { ListDynamicValue } from '../connector';
import type { IHttpClient } from '../httpClient';
import { ResponseCodes, SwaggerParser, ArgumentException, equals, unmap } from '@microsoft/logic-apps-shared';

import type { QueryClient } from 'react-query';

export interface ApiManagementServiceOptions {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { ResponseCodes, SwaggerParser } from '../../../parsers';
import { ArgumentException, unmap } from '../../../utils/src';
import type { IAppServiceService } from '../appService';
import { getAzureResourceRecursive } from '../common/azure';
import type { ListDynamicValue } from '../connector';
import { isFunctionContainer } from '../helpers';
import type { IHttpClient } from '../httpClient';
import { ResponseCodes, SwaggerParser, ArgumentException, unmap } from '@microsoft/logic-apps-shared';

export interface BaseAppServiceServiceOptions {
baseUrl: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IChatbotService } from '../chatbot';
import { ArgumentException } from '@microsoft/logic-apps-shared';
import type { AxiosResponse } from 'axios';
import axios from 'axios';
import { ArgumentException } from '../../../utils/src';

export interface ChatbotServiceOptions {
baseUrl: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
/* eslint-disable no-param-reassign */
import { SwaggerParser } from '../../../parsers';
import type { Connection, OpenAPIV2, Connector } from '../../../utils/src';
import {
ArgumentException,
isArmResourceId,
HTTP_METHODS,
equals,
UserException,
UserErrorCode,
isCustomConnectorId,
getUniqueName,
} from '../../../utils/src';
import type { HttpResponse } from '../common/exceptions/service';
import type {
ConnectionCreationInfo,
Expand All @@ -8,18 +20,6 @@ import type {
IConnectionService,
} from '../connection';
import type { HttpRequestOptions, IHttpClient, QueryParameters } from '../httpClient';
import type { Connection, Connector, OpenAPIV2 } from '@microsoft/logic-apps-shared';
import {
ArgumentException,
HTTP_METHODS,
SwaggerParser,
UserErrorCode,
UserException,
equals,
getUniqueName,
isArmResourceId,
isCustomConnectorId,
} from '@microsoft/logic-apps-shared';

export interface ApiHubServiceDetails {
apiVersion: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
import { getIntl } from '../../../intl/src';
import type { OpenAPIV2, OperationInfo } from '../../../utils/src';
import {
ArgumentException,
equals,
ConnectorServiceException,
ConnectorServiceErrorCode,
isArmResourceId,
UnsupportedException,
} from '../../../utils/src';
import type {
IConnectorService,
ListDynamicValue,
Expand All @@ -7,16 +17,7 @@ import type {
} from '../connector';
import { getClientRequestIdFromHeaders, pathCombine } from '../helpers';
import type { IHttpClient } from '../httpClient';
import {
getIntl,
UnsupportedException,
ArgumentException,
ConnectorServiceErrorCode,
ConnectorServiceException,
equals,
isArmResourceId,
} from '@microsoft/logic-apps-shared';
import type { OpenAPIV2, OperationInfo } from '@microsoft/logic-apps-shared';

import type { IntlShape } from 'react-intl';

type GetSchemaFunction = (args: Record<string, any>) => Promise<OpenAPIV2.SchemaObject>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { ResponseCodes, SwaggerParser } from '../../../parsers';
import { ArgumentException, unmap } from '../../../utils/src';
import { getAzureResourceRecursive } from '../common/azure';
import type { ListDynamicValue } from '../connector';
import type { IFunctionService } from '../function';
import { isFunctionContainer } from '../helpers';
import type { IHttpClient } from '../httpClient';
import { ResponseCodes, SwaggerParser, ArgumentException, unmap } from '@microsoft/logic-apps-shared';

export interface BaseFunctionServiceOptions {
baseUrl: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { Gateway, Subscription } from '../../../utils/src';
import { ArgumentException } from '../../../utils/src';
import { getAzureResourceRecursive } from '../common/azure';
import type { IGatewayService } from '../gateway';
import type { IHttpClient } from '../httpClient';
import type { Gateway, Subscription } from '@microsoft/logic-apps-shared';
import { ArgumentException } from '@microsoft/logic-apps-shared';

export interface BaseGatewayServiceOptions {
baseUrl: string;
Expand All @@ -29,7 +29,7 @@ export class BaseGatewayService implements IGatewayService {
}

public async getGateways(subscriptionId: string | undefined, connectorName: string): Promise<Gateway[]> {
const config = await (this as IGatewayService).getConfig?.();
const config = await (this as any).getConfig?.();
const isSubscriptionRequired = !config?.disableSubscriptionLookup;
if ((isSubscriptionRequired && !subscriptionId) || !connectorName) {
return [];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';
import { frequencyValues } from './schedule';
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';

const timeZones = [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { OperationOptions, RecurrenceType, SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope, OperationOptions, RecurrenceType } from '../../../../utils/src';

const methodOptions = [
{ value: 'GET', displayName: 'GET' },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { OutputSecureDataMode, SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { OutputSecureDataMode, SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { OperationOptions, SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope, OperationOptions } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { OperationOptions, OutputSecureDataMode, SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { OutputSecureDataMode, SettingScope, OperationOptions } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { getIntl } from '../../../../intl/src';
import type { OperationManifest } from '../../../../utils/src';
import { getFrequencyValues, RecurrenceType, SettingScope } from '../../../../utils/src';
import { coreBadge } from '../../badges';
import { getIntl, getFrequencyValues, RecurrenceType, SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '@microsoft/logic-apps-shared';

export const frequencyValues = getFrequencyValues(getIntl());

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

export default {
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { OperationManifest } from '@microsoft/logic-apps-shared';
import { SettingScope } from '@microsoft/logic-apps-shared';
import type { OperationManifest } from '../../../../utils/src';
import { SettingScope } from '../../../../utils/src';

const brandColor = '#770BD6';
const iconUri =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ArgumentException } from '../../../utils/src';
import type { IOAuthPopup, LoginResult, IOAuthService, IOAuthServiceOptions, OAuthPopupOptions } from '../oAuth';
import { ArgumentException } from '@microsoft/logic-apps-shared';

export class OAuthPopup implements IOAuthPopup {
public loginPromise: Promise<LoginResult>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type { OperationInfo, OperationManifest } from '../../../utils/src';
import { ArgumentException, UnsupportedException, equals } from '../../../utils/src';
import type { IHttpClient } from '../httpClient';
import type { IOperationManifestService } from '../operationmanifest';
import conditionManifest from './manifests/condition';
Expand All @@ -20,6 +22,14 @@ import {
httpWebhookManifest,
httpWebhookTriggerManifest,
} from './manifests/http';
import {
appendArrayManifest,
appendStringManifest,
decrementManifest,
incrementManifest,
initializeManifest,
setManifest,
} from './manifests/variables';
import joinManifest from './manifests/join';
import parsejsonManifest from './manifests/parsejson';
import queryManifest from './manifests/query';
Expand All @@ -31,16 +41,6 @@ import selectManifest from './manifests/select';
import switchManifest from './manifests/switch';
import terminateManifest from './manifests/terminate';
import untilManifest from './manifests/until';
import {
appendArrayManifest,
appendStringManifest,
decrementManifest,
incrementManifest,
initializeManifest,
setManifest,
} from './manifests/variables';
import type { OperationInfo, OperationManifest } from '@microsoft/logic-apps-shared';
import { ArgumentException, equals, UnsupportedException } from '@microsoft/logic-apps-shared';

const apimanagement = 'apimanagement';
const apimanagementtrigger = 'apimanagementtrigger';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
import type {
DiscoveryOperation,
SomeKindOfAzureOperationDiscovery,
DiscoveryOpArray,
Connector,
ArmResource,
DiscoveryWorkflow,
DiscoveryWorkflowTrigger,
BuiltInOperation,
} from '../../../utils/src';
import { ArgumentException, equals } from '../../../utils/src';
import { AzureConnectorMock } from '../__test__/__mocks__/azureConnectorResponse';
import { azureOperationsResponse } from '../__test__/__mocks__/azureOperationResponse';
import type { ContinuationTokenResponse } from '../common/azure';
Expand All @@ -6,17 +17,6 @@ import { LoggerService } from '../logger';
import { Status } from '../logging/logEntry';
import type { ISearchService } from '../search';
import * as ClientOperationsData from './operations';
import type {
ArmResource,
BuiltInOperation,
Connector,
DiscoveryOperation,
DiscoveryOpArray,
DiscoveryWorkflow,
DiscoveryWorkflowTrigger,
SomeKindOfAzureOperationDiscovery,
} from '@microsoft/logic-apps-shared';
import { equals, ArgumentException } from '@microsoft/logic-apps-shared';

export type AzureOperationsFetchResponse = ContinuationTokenResponse<DiscoveryOperation<SomeKindOfAzureOperationDiscovery>[]>;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AssertionErrorCode, AssertionException } from '@microsoft/logic-apps-shared';
import type { AxiosResponse } from 'axios';
import { AssertionErrorCode, AssertionException } from '../../utils/src';

export interface IChatbotService {
getCopilotResponse: (query: string, workflow: any, signal: AbortSignal, armToken: string) => Promise<AxiosResponse<any>>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Exception } from '@microsoft/logic-apps-shared';
import { BaseException } from '@microsoft/logic-apps-shared';
import type { Exception } from '../../../../utils/src';
import { BaseException } from '../../../../utils/src';

export const ConnectorConnectionExceptionName = 'Core.ConnectorConnectionException';

Expand Down
Loading
Loading