@amp-labs/react 1.3.0 → 1.4.0

package/build/generated-sources/api/src/models/index.d.ts

@@ -1,3 +1,6 @@
+export * from './ApiKey';
+export * from './ApiKeyRequest';
+export * from './AuthType';
 export * from './BaseConfigContent';
 export * from './BaseProxyConfig';
 export * from './BaseReadConfig';
@@ -11,6 +14,8 @@ export * from './ConfigContentAllOf';
 export * from './Connection';
 export * from './Consumer';
 export * from './CreateConsumerRequest';
+export * from './CreateDestinationRequest';
+export * from './CreateDestinationRequestMetadata';
 export * from './CreateGroupRequest';
 export * from './CreateInstallationRequest';
 export * from './CreateInstallationRequestConfig';
@@ -19,7 +24,6 @@ export * from './CreateIntegrationRequestLatestRevision';
 export * from './CreateProjectRequest';
 export * from './CreateProviderAppRequest';
 export * from './Destination';
-export * from './DestinationMetadata';
 export * from './Group';
 export * from './HydratedIntegration';
 export * from './HydratedIntegrationField';
@@ -44,15 +48,24 @@ export * from './IntegrationProxy';
 export * from './IntegrationRead';
 export * from './IntegrationWrite';
 export * from './IntegrationWriteObject';
+export * from './Log';
 export * from './OauthConnectRequest';
+export * from './OauthOpts';
 export * from './Operation';
-export * from './OperationLog';
+export * from './OperationEvent';
 export * from './OptionalFieldsAutoOption';
+export * from './PatchApiKeyRequest';
+export * from './PatchApiKeyRequestApiKey';
 export * from './Project';
 export * from './ProjectMembership';
 export * from './ProviderApp';
+export * from './ProviderInfo';
 export * from './Revision';
 export * from './SignedUrl';
+export * from './Support';
+export * from './TokenMetadataFields';
+export * from './UpdateDestinationRequest';
+export * from './UpdateDestinationRequestDestination';
 export * from './UpdateInstallationConfigContent';
 export * from './UpdateInstallationRequest';
 export * from './UpdateInstallationRequestInstallation';

package/build/generated-sources/api/src/models/index.js

@@ -16,6 +16,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /* tslint:disable */
 /* eslint-disable */
+__exportStar(require("./ApiKey"), exports);
+__exportStar(require("./ApiKeyRequest"), exports);
+__exportStar(require("./AuthType"), exports);
 __exportStar(require("./BaseConfigContent"), exports);
 __exportStar(require("./BaseProxyConfig"), exports);
 __exportStar(require("./BaseReadConfig"), exports);
@@ -29,6 +32,8 @@ __exportStar(require("./ConfigContentAllOf"), exports);
 __exportStar(require("./Connection"), exports);
 __exportStar(require("./Consumer"), exports);
 __exportStar(require("./CreateConsumerRequest"), exports);
+__exportStar(require("./CreateDestinationRequest"), exports);
+__exportStar(require("./CreateDestinationRequestMetadata"), exports);
 __exportStar(require("./CreateGroupRequest"), exports);
 __exportStar(require("./CreateInstallationRequest"), exports);
 __exportStar(require("./CreateInstallationRequestConfig"), exports);
@@ -37,7 +42,6 @@ __exportStar(require("./CreateIntegrationRequestLatestRevision"), exports);
 __exportStar(require("./CreateProjectRequest"), exports);
 __exportStar(require("./CreateProviderAppRequest"), exports);
 __exportStar(require("./Destination"), exports);
-__exportStar(require("./DestinationMetadata"), exports);
 __exportStar(require("./Group"), exports);
 __exportStar(require("./HydratedIntegration"), exports);
 __exportStar(require("./HydratedIntegrationField"), exports);
@@ -62,15 +66,24 @@ __exportStar(require("./IntegrationProxy"), exports);
 __exportStar(require("./IntegrationRead"), exports);
 __exportStar(require("./IntegrationWrite"), exports);
 __exportStar(require("./IntegrationWriteObject"), exports);
+__exportStar(require("./Log"), exports);
 __exportStar(require("./OauthConnectRequest"), exports);
+__exportStar(require("./OauthOpts"), exports);
 __exportStar(require("./Operation"), exports);
-__exportStar(require("./OperationLog"), exports);
+__exportStar(require("./OperationEvent"), exports);
 __exportStar(require("./OptionalFieldsAutoOption"), exports);
+__exportStar(require("./PatchApiKeyRequest"), exports);
+__exportStar(require("./PatchApiKeyRequestApiKey"), exports);
 __exportStar(require("./Project"), exports);
 __exportStar(require("./ProjectMembership"), exports);
 __exportStar(require("./ProviderApp"), exports);
+__exportStar(require("./ProviderInfo"), exports);
 __exportStar(require("./Revision"), exports);
 __exportStar(require("./SignedUrl"), exports);
+__exportStar(require("./Support"), exports);
+__exportStar(require("./TokenMetadataFields"), exports);
+__exportStar(require("./UpdateDestinationRequest"), exports);
+__exportStar(require("./UpdateDestinationRequestDestination"), exports);
 __exportStar(require("./UpdateInstallationConfigContent"), exports);
 __exportStar(require("./UpdateInstallationRequest"), exports);
 __exportStar(require("./UpdateInstallationRequestInstallation"), exports);

package/build/src/components/Configure/actions/{createInstallationReducer.d.ts → mutateAndSetState/createInstallationAndSetState.d.ts}

@@ -1,4 +1,4 @@
-import { Config, CreateInstallationRequestConfig, Installation } from '../../../services/api';
+import { Config, CreateInstallationRequestConfig, Installation } from '../../../../services/api';
 export type CreateInstallationSharedProps = {
     projectId: string;
     integrationId: string;
@@ -8,8 +8,8 @@ export type CreateInstallationSharedProps = {
     setInstallation: (installationObj: Installation) => void;
     onInstallSuccess?: (installationId: string, config: Config) => void;
 };
-type CreateInstallationReducer = CreateInstallationSharedProps & {
+type CreateInstallationAndSetStateProps = CreateInstallationSharedProps & {
     createConfig: CreateInstallationRequestConfig;
 };
-export declare function createInstallationReducer({ createConfig, projectId, integrationId, groupRef, connectionId, apiKey, setInstallation, onInstallSuccess, }: CreateInstallationReducer): Promise<void>;
+export declare function createInstallationAndSetState({ createConfig, projectId, integrationId, groupRef, connectionId, apiKey, setInstallation, onInstallSuccess, }: CreateInstallationAndSetStateProps): Promise<void>;
 export {};

package/build/src/components/Configure/actions/{createInstallationReducer.js → mutateAndSetState/createInstallationAndSetState.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createInstallationReducer = void 0;
-const api_1 = require("../../../services/api");
-function createInstallationReducer({ createConfig, projectId, integrationId, groupRef, connectionId, apiKey, setInstallation, onInstallSuccess, }) {
+exports.createInstallationAndSetState = void 0;
+const api_1 = require("../../../../services/api");
+function createInstallationAndSetState({ createConfig, projectId, integrationId, groupRef, connectionId, apiKey, setInstallation, onInstallSuccess, }) {
     const createInstallationRequest = {
         projectId,
         integrationId,
@@ -27,4 +27,4 @@ function createInstallationReducer({ createConfig, projectId, integrationId, gro
         console.error('ERROR: ', err);
     });
 }
-exports.createInstallationReducer = createInstallationReducer;
+exports.createInstallationAndSetState = createInstallationAndSetState;

package/build/src/components/Configure/actions/mutateAndSetState/updateInstallationAndSetState.d.ts

@@ -0,0 +1,15 @@
+import { Config, Installation, UpdateInstallationRequestInstallationConfig } from '../../../../services/api';
+type UpdateInstallationSharedProps = {
+    projectId: string;
+    integrationId: string;
+    installationId: string;
+    apiKey: string;
+    selectedObjectName: string;
+    setInstallation: (installationObj: Installation) => void;
+    onUpdateSuccess?: (installationId: string, config: Config) => void;
+};
+type UpdateInstallationAndSetStateProps = UpdateInstallationSharedProps & {
+    updateConfig: UpdateInstallationRequestInstallationConfig;
+};
+export declare function updateInstallationAndSetState({ updateConfig, projectId, integrationId, installationId, apiKey, selectedObjectName, setInstallation, onUpdateSuccess, }: UpdateInstallationAndSetStateProps): Promise<void>;
+export {};

package/build/src/components/Configure/actions/mutateAndSetState/updateInstallationAndSetState.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateInstallationAndSetState = void 0;
+const api_1 = require("../../../../services/api");
+function updateInstallationAndSetState({ updateConfig, projectId, integrationId, installationId, apiKey, selectedObjectName, setInstallation, onUpdateSuccess, }) {
+    const updateInstallationRequest = {
+        projectId,
+        installationId,
+        integrationId,
+        installationUpdate: {
+            // update mask will recurse to the object path and replace the object at the object path
+            // this example will replace the object at the object (i.e. accounts)
+            updateMask: [`config.content.read.standardObjects.${selectedObjectName}`],
+            installation: {
+                config: updateConfig,
+            },
+        },
+    };
+    // call api.updateInstallation
+    return (0, api_1.api)().installationApi.updateInstallation(updateInstallationRequest, {
+        headers: {
+            'X-Api-Key': apiKey,
+            'Content-Type': 'application/json',
+        },
+    }).then((installation) => {
+        // update local installation state
+        setInstallation(installation);
+        onUpdateSuccess === null || onUpdateSuccess === void 0 ? void 0 : onUpdateSuccess(installation.id, installation.config);
+    }).catch((err) => {
+        console.error('ERROR: ', err);
+    });
+}
+exports.updateInstallationAndSetState = updateInstallationAndSetState;

package/build/src/components/Configure/actions/proxy/isProxyEnabled.d.ts

@@ -0,0 +1,2 @@
+import { HydratedRevision } from '../../../../services/api';
+export declare function getIsProxyEnabled(hydratedRevision: HydratedRevision): boolean | undefined;

package/build/src/components/Configure/actions/proxy/isProxyEnabled.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIsProxyEnabled = void 0;
+function getIsProxyEnabled(hydratedRevision) {
+    var _a;
+    return (_a = hydratedRevision.content.proxy) === null || _a === void 0 ? void 0 : _a.enabled;
+}
+exports.getIsProxyEnabled = getIsProxyEnabled;

package/build/src/components/Configure/actions/proxy/onCreateInstallationProxyOnly.d.ts

@@ -0,0 +1,8 @@
+import { HydratedRevision } from '../../../../services/api';
+import { CreateInstallationSharedProps } from '../mutateAndSetState/createInstallationAndSetState';
+type CreateInstallationProxyOnlyProps = CreateInstallationSharedProps & {
+    hydratedRevision: HydratedRevision;
+    consumerRef: string;
+};
+export declare function onCreateInstallationProxyOnly({ projectId, integrationId, groupRef, consumerRef, connectionId, apiKey, hydratedRevision, setInstallation, onInstallSuccess, }: CreateInstallationProxyOnlyProps): Promise<void> | Promise<null>;
+export {};

package/build/src/components/Configure/actions/proxy/{createInstallationProxyOnly.js → onCreateInstallationProxyOnly.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createInstallationProxyOnly = void 0;
-const createInstallationReducer_1 = require("../createInstallationReducer");
+exports.onCreateInstallationProxyOnly = void 0;
+const createInstallationAndSetState_1 = require("../mutateAndSetState/createInstallationAndSetState");
 /**
  * given a hydratedRevision and consumerRef,
  * generate the config object that is need for create installation request with proxy only.
@@ -24,13 +24,13 @@ const generateProxyOnlyConfig = (hydratedRevision, consumerRef) => {
     };
     return createConfigObj;
 };
-function createInstallationProxyOnly({ projectId, integrationId, groupRef, consumerRef, connectionId, apiKey, hydratedRevision, setInstallation, onInstallSuccess, }) {
+function onCreateInstallationProxyOnly({ projectId, integrationId, groupRef, consumerRef, connectionId, apiKey, hydratedRevision, setInstallation, onInstallSuccess, }) {
     const createConfig = generateProxyOnlyConfig(hydratedRevision, consumerRef);
     if (!createConfig) {
         console.error('Error when generating createConfig from configureState');
         return Promise.resolve(null);
     }
-    return (0, createInstallationReducer_1.createInstallationReducer)({
+    return (0, createInstallationAndSetState_1.createInstallationAndSetState)({
         createConfig,
         projectId,
         integrationId,
@@ -41,4 +41,4 @@ function createInstallationProxyOnly({ projectId, integrationId, groupRef, consu
         onInstallSuccess,
     });
 }
-exports.createInstallationProxyOnly = createInstallationProxyOnly;
+exports.onCreateInstallationProxyOnly = onCreateInstallationProxyOnly;

package/build/src/components/Configure/actions/{onSaveReadCreateInstallation.d.ts → read/onSaveReadCreateInstallation.d.ts}

@@ -1,3 +1,3 @@
-import { Config, HydratedRevision, Installation } from '../../../services/api';
-import { ConfigureState } from '../types';
+import { Config, HydratedRevision, Installation } from '../../../../services/api';
+import { ConfigureState } from '../../types';
 export declare const onSaveReadCreateInstallation: (projectId: string, integrationId: string, groupRef: string, consumerRef: string, connectionId: string, objectName: string, apiKey: string, hydratedRevision: HydratedRevision, configureState: ConfigureState, setInstallation: (installationObj: Installation) => void, onInstallSuccess?: ((installationId: string, config: Config) => void) | undefined) => Promise<void | null>;

package/build/src/components/Configure/actions/{onSaveReadCreateInstallation.js → read/onSaveReadCreateInstallation.js}

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onSaveReadCreateInstallation = void 0;
-const utils_1 = require("../state/utils");
-const createInstallationReducer_1 = require("./createInstallationReducer");
+const utils_1 = require("../../state/utils");
+const createInstallationAndSetState_1 = require("../mutateAndSetState/createInstallationAndSetState");
+const isProxyEnabled_1 = require("../proxy/isProxyEnabled");
 /**
  * gets matching object from hydratedRevision
  * @param hydratedRevision
@@ -56,6 +57,11 @@ const generateCreateReadConfigFromConfigureState = (configureState, objectName,
             },
         },
     };
+    // insert proxy into config if it is enabled
+    const isProxyEnabled = (0, isProxyEnabled_1.getIsProxyEnabled)(hydratedRevision);
+    if (isProxyEnabled) {
+        createConfigObj.content.proxy = { enabled: true };
+    }
     return createConfigObj;
 };
 const onSaveReadCreateInstallation = (projectId, integrationId, groupRef, consumerRef, connectionId, objectName, apiKey, hydratedRevision, configureState, setInstallation, onInstallSuccess) => {
@@ -64,7 +70,7 @@ const onSaveReadCreateInstallation = (projectId, integrationId, groupRef, consum
         console.error('Error when generating createConfig from configureState');
         return Promise.resolve(null);
     }
-    return (0, createInstallationReducer_1.createInstallationReducer)({
+    return (0, createInstallationAndSetState_1.createInstallationAndSetState)({
         createConfig,
         projectId,
         integrationId,

package/build/src/components/Configure/actions/read/onSaveReadUpdateInstallation.d.ts

@@ -0,0 +1,3 @@
+import { Config, HydratedIntegrationObject, HydratedRevision, Installation } from '../../../../services/api';
+import { ConfigureState } from '../../types';
+export declare const onSaveReadUpdateInstallation: (projectId: string, integrationId: string, installationId: string, selectedObjectName: string, apiKey: string, configureState: ConfigureState, setInstallation: (installationObj: Installation) => void, hydratedObject: HydratedIntegrationObject, hydratedRevision: HydratedRevision, onUpdateSuccess?: ((installationId: string, config: Config) => void) | undefined) => Promise<void | null>;

package/build/src/components/Configure/actions/{onSaveReadUpdateInstallation.js → read/onSaveReadUpdateInstallation.js}

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onSaveReadUpdateInstallation = void 0;
-const api_1 = require("../../../services/api");
-const utils_1 = require("../state/utils");
+const utils_1 = require("../../state/utils");
+const updateInstallationAndSetState_1 = require("../mutateAndSetState/updateInstallationAndSetState");
+const isProxyEnabled_1 = require("../proxy/isProxyEnabled");
 /**
  * given a configureState, config, and objectName, generate the config object that is need for
  * update installation request.
@@ -19,7 +20,7 @@ const utils_1 = require("../state/utils");
  * @param schedule
  * @returns
  */
-const generateUpdateReadConfigFromConfigureState = (configureState, objectName, hydratedObject, schedule) => {
+const generateUpdateReadConfigFromConfigureState = (configureState, objectName, hydratedObject, schedule, hydratedRevision) => {
     const selectedFields = (0, utils_1.generateSelectedFieldsFromConfigureState)(configureState);
     const selectedFieldMappings = (0, utils_1.generateSelectedFieldMappingsFromConfigureState)(configureState);
     // config request object type needs to be fixed
@@ -39,41 +40,32 @@ const generateUpdateReadConfigFromConfigureState = (configureState, objectName,
             },
         },
     };
+    // insert proxy into config if it is enabled
+    const isProxyEnabled = (0, isProxyEnabled_1.getIsProxyEnabled)(hydratedRevision);
+    if (isProxyEnabled) {
+        if (!updateConfigObject.content)
+            updateConfigObject.content = {};
+        updateConfigObject.content.proxy = { enabled: true };
+    }
     return updateConfigObject;
 };
-const onSaveReadUpdateInstallation = (projectId, integrationId, installationId, selectedObjectName, apiKey, configureState, setInstallation, hydratedObject, onUpdateSuccess) => {
+const onSaveReadUpdateInstallation = (projectId, integrationId, installationId, selectedObjectName, apiKey, configureState, setInstallation, hydratedObject, hydratedRevision, onUpdateSuccess) => {
     // get configuration state
     // transform configuration state to update shape
-    const updateConfig = generateUpdateReadConfigFromConfigureState(configureState, selectedObjectName || '', hydratedObject, hydratedObject.schedule);
+    const updateConfig = generateUpdateReadConfigFromConfigureState(configureState, selectedObjectName || '', hydratedObject, hydratedObject.schedule, hydratedRevision);
     if (!updateConfig) {
         console.error('Error when generating updateConfig from configureState');
         return Promise.resolve(null);
     }
-    const updateInstallationRequest = {
+    return (0, updateInstallationAndSetState_1.updateInstallationAndSetState)({
+        updateConfig,
         projectId,
-        installationId,
         integrationId,
-        installationUpdate: {
-            // update mask will recurse to the object path and replace the object at the object path
-            // this example will replace the object at the object (i.e. accounts)
-            updateMask: [`config.content.read.standardObjects.${selectedObjectName}`],
-            installation: {
-                config: updateConfig,
-            },
-        },
-    };
-    // call api.updateInstallation
-    return (0, api_1.api)().installationApi.updateInstallation(updateInstallationRequest, {
-        headers: {
-            'X-Api-Key': apiKey,
-            'Content-Type': 'application/json',
-        },
-    }).then((installation) => {
-        // update local installation state
-        setInstallation(installation);
-        onUpdateSuccess === null || onUpdateSuccess === void 0 ? void 0 : onUpdateSuccess(installation.id, installation.config);
-    }).catch((err) => {
-        console.error('ERROR: ', err);
+        installationId,
+        apiKey,
+        selectedObjectName,
+        setInstallation,
+        onUpdateSuccess,
     });
 };
 exports.onSaveReadUpdateInstallation = onSaveReadUpdateInstallation;

package/build/src/components/Configure/actions/write/onSaveWriteCreateInstallation.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onSaveWriteCreateInstallation = void 0;
-const createInstallationReducer_1 = require("../createInstallationReducer");
+const createInstallationAndSetState_1 = require("../mutateAndSetState/createInstallationAndSetState");
+const isProxyEnabled_1 = require("../proxy/isProxyEnabled");
 const generateConfigWriteObjects_1 = require("./generateConfigWriteObjects");
 /**
    * gets write objects from hydratedRevision
@@ -41,7 +42,8 @@ const generateCreateWriteConfigFromConfigureState = (configureState, hydratedRev
         createdBy: `consumer:${consumerRef}`,
         content: {
             provider: hydratedRevision.content.provider,
-            // need empty read.standardObjects for update read
+            // hack: need empty read.standardObjects to be initialized for update read
+            // https://linear.app/ampersand/issue/ENG-780/bug-write-createupdate-installation-without-read
             read: {
                 standardObjects: {},
             },
@@ -50,6 +52,11 @@ const generateCreateWriteConfigFromConfigureState = (configureState, hydratedRev
             },
         },
     };
+    // insert proxy into config if it is enabled
+    const isProxyEnabled = (0, isProxyEnabled_1.getIsProxyEnabled)(hydratedRevision);
+    if (isProxyEnabled) {
+        createConfigObj.content.proxy = { enabled: true };
+    }
     return createConfigObj;
 };
 const onSaveWriteCreateInstallation = (projectId, integrationId, groupRef, consumerRef, connectionId, apiKey, hydratedRevision, configureState, setInstallation, onInstallSuccess) => {
@@ -58,7 +65,7 @@ const onSaveWriteCreateInstallation = (projectId, integrationId, groupRef, consu
         console.error('Error when generating createConfig from configureState');
         return Promise.resolve(null);
     }
-    return (0, createInstallationReducer_1.createInstallationReducer)({
+    return (0, createInstallationAndSetState_1.createInstallationAndSetState)({
         createConfig,
         projectId,
         integrationId,

package/build/src/components/Configure/actions/write/onSaveWriteUpdateInstallation.d.ts

@@ -1,3 +1,3 @@
-import { Config, Installation } from '../../../../services/api';
+import { Config, HydratedRevision, Installation } from '../../../../services/api';
 import { ConfigureState } from '../../types';
-export declare const onSaveWriteUpdateInstallation: (projectId: string, integrationId: string, installationId: string, apiKey: string, configureState: ConfigureState, setInstallation: (installationObj: Installation) => void, onUpdateSuccess?: ((installationId: string, config: Config) => void) | undefined) => Promise<void | null>;
+export declare const onSaveWriteUpdateInstallation: (projectId: string, integrationId: string, installationId: string, apiKey: string, configureState: ConfigureState, hydratedRevision: HydratedRevision, setInstallation: (installationObj: Installation) => void, onUpdateSuccess?: ((installationId: string, config: Config) => void) | undefined) => Promise<void | null>;

package/build/src/components/Configure/actions/write/onSaveWriteUpdateInstallation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onSaveWriteUpdateInstallation = void 0;
 const api_1 = require("../../../../services/api");
+const isProxyEnabled_1 = require("../proxy/isProxyEnabled");
 const generateConfigWriteObjects_1 = require("./generateConfigWriteObjects");
 /**
    * given a configureState generate the config object that is need for
@@ -10,7 +11,7 @@ const generateConfigWriteObjects_1 = require("./generateConfigWriteObjects");
    * @param configureState
    * @returns
    */
-const generateUpdateWriteConfigFromConfigureState = (configureState) => {
+const generateUpdateWriteConfigFromConfigureState = (configureState, hydratedRevision) => {
     const configWriteObjects = (0, generateConfigWriteObjects_1.generateConfigWriteObjects)(configureState);
     // config request object type needs to be fixed
     const updateConfigObject = {
@@ -20,12 +21,19 @@ const generateUpdateWriteConfigFromConfigureState = (configureState) => {
             },
         },
     };
+    // insert proxy into config if it is enabled
+    const isProxyEnabled = (0, isProxyEnabled_1.getIsProxyEnabled)(hydratedRevision);
+    if (isProxyEnabled) {
+        if (!updateConfigObject.content)
+            updateConfigObject.content = {};
+        updateConfigObject.content.proxy = { enabled: true };
+    }
     return updateConfigObject;
 };
-const onSaveWriteUpdateInstallation = (projectId, integrationId, installationId, apiKey, configureState, setInstallation, onUpdateSuccess) => {
+const onSaveWriteUpdateInstallation = (projectId, integrationId, installationId, apiKey, configureState, hydratedRevision, setInstallation, onUpdateSuccess) => {
     // get configuration state
     // transform configuration state to update shape
-    const updateConfig = generateUpdateWriteConfigFromConfigureState(configureState);
+    const updateConfig = generateUpdateWriteConfigFromConfigureState(configureState, hydratedRevision);
     if (!updateConfig) {
         console.error('Error when generating write updateConfig from configureState');
         return Promise.resolve(null);

package/build/src/components/Configure/content/CreateInstallation.js

@@ -7,7 +7,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
  */
 const react_1 = require("react");
 const ErrorContextProvider_1 = require("../../../context/ErrorContextProvider");
-const onSaveReadCreateInstallation_1 = require("../actions/onSaveReadCreateInstallation");
+const onSaveReadCreateInstallation_1 = require("../actions/read/onSaveReadCreateInstallation");
 const onSaveWriteCreateInstallation_1 = require("../actions/write/onSaveWriteCreateInstallation");
 const constant_1 = require("../nav/ObjectManagementNav/constant");
 const utils_1 = require("../state/utils");

package/build/src/components/Configure/content/UpdateInstallation.js

@@ -4,7 +4,7 @@ exports.UpdateInstallation = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const ErrorContextProvider_1 = require("../../../context/ErrorContextProvider");
-const onSaveReadUpdateInstallation_1 = require("../actions/onSaveReadUpdateInstallation");
+const onSaveReadUpdateInstallation_1 = require("../actions/read/onSaveReadUpdateInstallation");
 const onSaveWriteUpdateInstallation_1 = require("../actions/write/onSaveWriteUpdateInstallation");
 const constant_1 = require("../nav/ObjectManagementNav/constant");
 const utils_1 = require("../state/utils");
@@ -51,9 +51,9 @@ function UpdateInstallation({ installation, integrationObj }) {
         if (errorList.length > 0) {
             return;
         }
-        if (installation && selectedObjectName && apiKey && projectId && hydratedObject) {
+        if (hydratedRevision && installation && selectedObjectName && apiKey && projectId && hydratedObject) {
             setLoadingState(true);
-            const res = (0, onSaveReadUpdateInstallation_1.onSaveReadUpdateInstallation)(projectId, integrationObj.id, installation.id, selectedObjectName, apiKey, configureState, setInstallation, hydratedObject, onUpdateSuccess);
+            const res = (0, onSaveReadUpdateInstallation_1.onSaveReadUpdateInstallation)(projectId, integrationObj.id, installation.id, selectedObjectName, apiKey, configureState, setInstallation, hydratedObject, hydratedRevision, onUpdateSuccess);
             res.finally(() => {
                 setLoadingState(false);
                 resetPendingConfigurationState(selectedObjectName);
@@ -64,9 +64,9 @@ function UpdateInstallation({ installation, integrationObj }) {
         }
     };
     const onSaveWrite = () => {
-        if (installation && selectedObjectName && apiKey && projectId) {
+        if (installation && selectedObjectName && apiKey && projectId && hydratedRevision) {
             setLoadingState(true);
-            const res = (0, onSaveWriteUpdateInstallation_1.onSaveWriteUpdateInstallation)(projectId, integrationObj.id, installation.id, apiKey, configureState, setInstallation, onUpdateSuccess);
+            const res = (0, onSaveWriteUpdateInstallation_1.onSaveWriteUpdateInstallation)(projectId, integrationObj.id, installation.id, apiKey, configureState, hydratedRevision, setInstallation, onUpdateSuccess);
             res.finally(() => {
                 setLoadingState(false);
                 resetPendingConfigurationState(selectedObjectName);

package/build/src/components/Configure/layout/ConditionalProxyLayout/ConditionalProxyLayout.js

@@ -9,7 +9,7 @@ const ConnectionsContextProvider_1 = require("../../../../context/ConnectionsCon
 const InstallIntegrationContextProvider_1 = require("../../../../context/InstallIntegrationContextProvider");
 const ProjectContextProvider_1 = require("../../../../context/ProjectContextProvider");
 const ErrorTextBox_1 = require("../../../ErrorTextBox");
-const createInstallationProxyOnly_1 = require("../../actions/proxy/createInstallationProxyOnly");
+const onCreateInstallationProxyOnly_1 = require("../../actions/proxy/onCreateInstallationProxyOnly");
 const HydratedRevisionContext_1 = require("../../state/HydratedRevisionContext");
 const InstalledSuccessBox_1 = require("./InstalledSuccessBox");
 // explicity check other actions (i.e. read, write) to determine if it's proxy only
@@ -38,7 +38,7 @@ function ConditionalProxyLayout({ children }) {
     (0, react_1.useEffect)(() => {
         if (hydratedRevision && isProxyOnly && !installation && selectedConnection && apiKey && (integrationObj === null || integrationObj === void 0 ? void 0 : integrationObj.id)) {
             setCreateInstallLoading(true);
-            (0, createInstallationProxyOnly_1.createInstallationProxyOnly)({
+            (0, onCreateInstallationProxyOnly_1.onCreateInstallationProxyOnly)({
                 apiKey,
                 projectId,
                 integrationId: integrationObj === null || integrationObj === void 0 ? void 0 : integrationObj.id,

package/build/src/components/Configure/layout/ProtectedConnectionLayout.js

@@ -3,12 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProtectedConnectionLayout = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
-const constants_1 = require("../../../constants");
 const ConnectionsContextProvider_1 = require("../../../context/ConnectionsContextProvider");
 const InstallIntegrationContextProvider_1 = require("../../../context/InstallIntegrationContextProvider");
 const useConnectionHandler_1 = require("../../Connect/useConnectionHandler");
-const NoSubdomainOauthFlow_1 = require("../../Oauth/NoSubdomainEntry/NoSubdomainOauthFlow");
-const SalesforceOauthFlow_1 = require("../../Oauth/Salesforce/SalesforceOauthFlow");
+const OauthFlow_1 = require("../../Oauth/OauthFlow/OauthFlow");
 function ProtectedConnectionLayout({ provider, consumerRef, consumerName, groupRef, groupName, children, onSuccess, }) {
     const { provider: providerFromProps } = (0, InstallIntegrationContextProvider_1.useInstallIntegrationProps)();
     const { selectedConnection, setSelectedConnection, connections } = (0, ConnectionsContextProvider_1.useConnections)();
@@ -26,9 +24,6 @@ function ProtectedConnectionLayout({ provider, consumerRef, consumerName, groupR
     if (selectedConnection)
         return children;
     const selectedProvider = provider || providerFromProps;
-    if (selectedProvider === constants_1.PROVIDER_SALESFORCE) {
-        return ((0, jsx_runtime_1.jsx)(SalesforceOauthFlow_1.SalesforceOauthFlow, { consumerRef: consumerRef, consumerName: consumerName, groupRef: groupRef, groupName: groupName }));
-    }
-    return ((0, jsx_runtime_1.jsx)(NoSubdomainOauthFlow_1.NoSubdomainOauthFlow, { provider: selectedProvider, consumerRef: consumerRef, consumerName: consumerName, groupRef: groupRef, groupName: groupName }));
+    return ((0, jsx_runtime_1.jsx)(OauthFlow_1.OauthFlow, { provider: selectedProvider, consumerRef: consumerRef, consumerName: consumerName, groupRef: groupRef, groupName: groupName }));
 }
 exports.ProtectedConnectionLayout = ProtectedConnectionLayout;

package/build/src/components/Configure/state/utils.js

@@ -29,17 +29,17 @@ const generateConfigurationStateRead = (readAction, objectName, config) => {
     const optionalFieldsSaved = Object.assign({}, readSelectedFields);
     const requiredMapFieldsSaved = Object.assign({}, selectedFieldMappings);
     return {
-        allFields,
-        requiredFields,
-        optionalFields,
-        requiredMapFields,
+        allFields, // from hydrated revision
+        requiredFields, // from hydrated revision
+        optionalFields, // from hydrated revision
+        requiredMapFields, // from hydrated revision
         // selected state
         selectedOptionalFields: readSelectedFields,
         selectedFieldMappings,
         isOptionalFieldsModified: false,
         isRequiredMapFieldsModified: false,
         savedConfig: {
-            optionalFields: optionalFieldsSaved,
+            optionalFields: optionalFieldsSaved, // from config
             requiredMapFields: requiredMapFieldsSaved, // from config
         },
     };

package/build/src/components/Oauth/NoWorkspaceEntry/LandingContent.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LandingContent = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("@chakra-ui/react");
+const utils_1 = require("../../../utils");
+const OauthCardLayout_1 = require("../OauthCardLayout");
+const OAuthErrorAlert_1 = require("../OAuthErrorAlert");
+function LandingContent({ provider, handleSubmit, error, isButtonDisabled, }) {
+    return ((0, jsx_runtime_1.jsx)(OauthCardLayout_1.OauthCardLayout, { children: (0, jsx_runtime_1.jsxs)(react_1.FormControl, { children: [(0, jsx_runtime_1.jsx)(react_1.FormLabel, { marginTop: "16", marginBottom: "0", children: (0, jsx_runtime_1.jsx)(react_1.Heading, { as: "h4", size: "md", children: `Set up ${(0, utils_1.capitalize)(provider)} integration` }) }), (0, jsx_runtime_1.jsx)(OAuthErrorAlert_1.OAuthErrorAlert, { error: error }), (0, jsx_runtime_1.jsx)("br", {}), (0, jsx_runtime_1.jsx)(react_1.Button, { isDisabled: isButtonDisabled, width: "100%", type: "submit", onClick: handleSubmit, children: "Next" })] }) }));
+}
+exports.LandingContent = LandingContent;

package/build/src/components/Oauth/{NoSubdomainEntry/NoSubdomainOauthFlow.d.ts → NoWorkspaceEntry/NoWorkspaceOauthFlow.d.ts}

@@ -1,7 +1,7 @@
 /**
- * OAuth flow for any providers that do not require the consumer to enter a subdomain first.
+ * OAuth flow for any providers that do not require the consumer to enter a workspace first.
  */
-interface NoSubdomainOauthFlowProps {
+interface NoWorkspaceOauthFlowProps {
     provider: string;
     consumerRef: string;
     consumerName?: string;
@@ -9,8 +9,8 @@ interface NoSubdomainOauthFlowProps {
     groupName?: string;
 }
 /**
- * NoSubdomainOauthFlow first prompts user with a next button,
+ * NoWorkspaceOauthFlow first prompts user with a next button,
  * then launches a popup with the OAuth flow.
  */
-export declare function NoSubdomainOauthFlow({ provider, consumerRef, consumerName, groupRef, groupName, }: NoSubdomainOauthFlowProps): import("react/jsx-runtime").JSX.Element;
+export declare function NoWorkspaceOauthFlow({ provider, consumerRef, consumerName, groupRef, groupName, }: NoWorkspaceOauthFlowProps): import("react/jsx-runtime").JSX.Element;
 export {};