feat: Loris configuration(M2-6644) #1927

ramirlm · 2024-09-23T23:30:41Z

Tests for the changes have been added
Delivered the fix or feature branches into develop or release branches via Squash and Merge (to keep clean history)

📝 Description

📸 Screenshots

Before (Optional)	After

# Conflicts: # src/svgSprite.ts

# Conflicts: # src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.utils.tsx # src/resources/app-en.json # src/resources/app-fr.json # src/shared/consts.tsx # src/shared/state/Applet/Applet.schema.ts

# Conflicts: # src/shared/features/AppletSettings/LiveResponseStreamingSetting/LiveResponseStreamingSetting.test.tsx

# Conflicts: # src/modules/Builder/api/api.ts

# Conflicts: # src/shared/consts.tsx

# Conflicts: # src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.tsx # src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.types.ts # src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.utils.tsx # src/modules/Builder/pages/BuilderApplet/BuilderApplet.utils.tsx

… into feature/M2-6644--loris-configuration

…ris-integration

… into feature/M2-6644--loris-configuration

# Conflicts: # src/modules/Dashboard/api/api.ts # src/modules/Dashboard/api/api.types.ts # src/shared/components/FormComponents/SelectController/SelectController.tsx # src/shared/components/FormComponents/SelectController/SelectController.types.ts # src/shared/components/Table/Table.tsx # src/shared/state/Applet/Applet.schema.ts # src/shared/state/Workspaces/Workspaces.schema.ts # src/shared/types/featureFlags.ts

# Conflicts: # src/modules/Auth/state/Auth.thunk.ts # src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.tsx # src/shared/layouts/BaseLayout/components/LeftBar/LeftBar.tsx # src/shared/layouts/BaseLayout/components/LeftBar/LeftBar.utils.ts # src/shared/utils/featureFlags.ts

Release/1.38.0

Release/1.39.0

…--loris-configuration

Release/1.40.0

Release/1.41.0

…figuration

aws-amplify-us-east-1 · 2024-10-10T12:54:19Z

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-1927.d19gtpld8yi51u.amplifyapp.com

…tandards, method naming refactoring, types, bug fixes and other minor tweaks

ChaconC · 2024-10-11T18:06:52Z

src/modules/Dashboard/api/api.ts

 export const enableIntegrationApi = (integrations: Integration[], signal?: AbortSignal) =>
- authApiClient.post('/integrations/', integrations, {
+ authApiClient.post('/integrations', integrations, {
 signal,
 });


this endpoint doesn't exist anymore, it was replaced by saveIntegrationToApi

You sure? This is the one to save it

Maybe you're referencing a different backend branch, as I can see in the one I point to it is being used

The one that saves the integration is the one you added as saveIntegrationToApi, which takes type, config, etc as parameters. This is the dummy endpoint which didn't include any additional server information.

Got it! Makes sense now, will change. Thanks!

ChaconC · 2024-10-11T18:07:12Z

src/modules/Dashboard/api/api.ts

@@ -994,5 +994,5 @@ export const disableIntegrationApi = (integrations: string[], signal?: AbortSign
 signal,
 };

- return authApiClient.delete('/integrations/', config);
+ return authApiClient.delete('/integrations', config);


same for this endpoint, though the integration is not part of this PR so it's ok if you keep it for now

Makes sense, will remove it

ChaconC · 2024-10-11T18:08:25Z

src/shared/consts.tsx

@@ -437,4 +437,6 @@ export const observerStyles = {

 export const enum IntegrationTypes {
 Loris = 'loris',
+ LorisUpperCase = 'LORIS', // In the API the integration type is in uppercase in some endpoints and lowercase in others
+ SampleIntegration = 'sample',


What is SampleIntegration? If it is meant as an example please add a comment explaining usage.

Just the sample as I understood you requested me to add, did I misunderstand it?

The section I mentioned to include as example is for the configuration param (currently declared as SaveIntegrationParams)

ChaconC · 2024-10-11T18:16:23Z

src/modules/Builder/api/api.types.ts

+export type FetchIntegrationProjectsParams = {
+ hostname: string;
+ username: string;
+ password: string;
+};
+
+export type SaveIntegrationParams = {
+ appletId: string;
+ hostname: string;
+ project: string;
+ username: string;
+ password: string;
+ integrationType: IntegrationTypes;
+};


This could be refactored to better align with the BE object where Integration has appletId, integrationType and configuration. Where configuration is different depending on the integrationType.

The type for FetchIntegrationProjectsParams is only valid for LorisIntegrationConfiguration, where the password is optional and only used for saving the new integration.

Yeah I tried to do that, but was having issues. Will create a new interface and not use the applet one and it should be ok

ChaconC · 2024-10-11T18:17:55Z

src/modules/Builder/api/api.types.ts

+ // currently set as snake case on the API
+ applet_id: string;
+ integration_type: IntegrationTypes;


Could you double check this please, in reviewing the backend response I see camelCase responses

Only if it is in a different branch other than loris-integration-2. Is it? I tried it and I get errors

ChaconC · 2024-10-11T18:20:36Z

src/shared/consts.tsx

@@ -437,4 +437,6 @@ export const observerStyles = {

 export const enum IntegrationTypes {
 Loris = 'loris',
+ LorisUpperCase = 'LORIS', // In the API the integration type is in uppercase in some endpoints and lowercase in others


I'm not seeing where we use lowercase loris, and in any case it might be better to create a separate enum for that specific usage. I think all the new endpoints are using LORIS.

Maybe the endpoints you mentioned as replaced, but I'll double check and understand why. If necessary I create a separate type

ChaconC · 2024-10-11T18:21:15Z

...pletSettings/IntegrationsListSetting/Integrations/LorisIntegration/LorisIntegration.utils.ts

+};
+
+export const hasLorisIntegrationOnState = (integrations?: Integration[]): boolean =>
+ Boolean(integrations?.some((i) => i.integrationType === IntegrationTypes.Loris));


For example here the response is LORIS and you're comparing to loris

This is the way it's being saved in the state

IhorNesterenko99 and others added 30 commits December 5, 2023 15:14

M2-4320: Loris integration

34c55a1

Merge branch 'develop' into feature/M2-4320-loris-integration

12bc9ad

M2-4320: Add LORIS integration

5ebf2d5

M2-4320: Add LORIS integration

192a6a1

M2-4320: Add LORIS integration

2672c19

M2-4320: Add LORIS integration

f6ed0b3

Merge branch 'develop' into feature/M2-4320-loris-integration

ced6cb2

Merge branch 'develop' into feature/M2-4320-loris-integration

41fb9dd

Merge branch 'develop' into feature/M2-4320-loris-integration

1853bc8

M2-4320: LORIS integration

1845d62

Merge branch 'develop' into feature/M2-4320-loris-integration

d58498d

# Conflicts: # src/svgSprite.ts

Merge branch 'develop' into feature/M2-4320-loris-integration

110a97d

M2-5690: LORIS integration: unit tests fixes (#1549)

b16c426

M2-4320: LORIS integration: unit tests fixes

04ee456

Merge branch 'release/1.17.0' into feature/M2-4320-loris-integration

faee163

# Conflicts: # src/shared/features/AppletSettings/LiveResponseStreamingSetting/LiveResponseStreamingSetting.test.tsx

Merge branch 'release/1.18.0' into feature/M2-4320-loris-integration

8bccd08

Merge branch 'release/1.19.0' into feature/M2-4320-loris-integration

2259f38

Merge branch 'release/1.20.0' into feature/M2-4320-loris-integration

fda084b

Merge branch 'release/1.21.0' into feature/M2-4320-loris-integration

2825775

Merge branch 'release/1.23.0' into feature/M2-4320-loris-integration

f825218

# Conflicts: # src/modules/Builder/api/api.ts

Merge branch 'release/1.25.0' into feature/M2-4320-loris-integration

7417930

# Conflicts: # src/shared/consts.tsx

Merge branch 'release/1.26.0' into feature/M2-4320-loris-integration

b629d47

feat: Loris - Visits assignment (M2-6868) (#1794)

1f3966d

feat: comment loris visits (M2-4320)

c2e78b3

feat: comment loris visits (M2-4320)

45b7669

feat: Visits assignment in ML (M2-6868)

426c9bb

feat: Visits assignment in ML (M2-6868)

59a4ba3

feat: Visits assignment in ML, fix api call (M2-6868)

2842ec6

nmialik and others added 21 commits July 26, 2024 12:03

Merge remote-tracking branch 'origin/feature/M2-4320-loris-integration'…

825f3b6

… into feature/M2-6644--loris-configuration

feat: Loris Configuration (M2-6644)

5cb1617

tests: fix unit tests (M2-6644)

d82b7c1

tests: Unit tests (M2-6644)

ff7a394

Merge remote-tracking branch 'origin/develop' into feature/M2-4320-lo…

ad5ba74

…ris-integration

Merge remote-tracking branch 'origin/feature/M2-4320-loris-integration'…

48e3c97

… into feature/M2-6644--loris-configuration

tests: UploadPopup.utils (M2-6644)

f7f64f5

tests: UploadPopup component (M2-6644)

86491b0

chore: update Loris branch with the latest dev (M2-430)

9c58040

Merge pull request #1919 from ChildMindInstitute/release/1.38.0

9f9a573

Release/1.38.0

Merge pull request #1923 from ChildMindInstitute/release/1.39.0

9ab855b

Release/1.39.0

Merge branch 'feature/M2-4320-loris-integration' into feature/M2-6644…

09d9b88

…--loris-configuration

fix: svgsprite error fix

6d205ee

merge branch develop into feature/M2-6644--loris-configuration

4a06096

fixing loris integration settings import

ecbebee

Merge pull request #1929 from ChildMindInstitute/release/1.40.0

668abf5

Release/1.40.0

Merge pull request #1931 from ChildMindInstitute/release/1.41.0

a1f920f

Release/1.41.0

[M2-6644] Loris connect endpoint on backend, adjustments and banners

6a5da95

Merge remote-tracking branch 'origin' into feature/M2-6644--loris-con…

2cc1acb

…figuration

Merge branch 'develop' into feature/M2-6644--loris-configuration

2fc0a6f

ramirlm marked this pull request as ready for review October 10, 2024 12:58

ramirlm requested a review from ChaconC October 10, 2024 12:58

Ramir Mesquita added 4 commits October 10, 2024 14:23

fix: loris upload endpoint update

ca2d0e7

fix: fixing parameter for upload

422f4ec

fix: fixing upload endpoint typo

467a394

chore: [loris] improves api method signatures and functions to keep s…

96dc166

…tandards, method naming refactoring, types, bug fixes and other minor tweaks

ChaconC reviewed Oct 11, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Loris configuration(M2-6644) #1927

feat: Loris configuration(M2-6644) #1927

ramirlm commented Sep 23, 2024

aws-amplify-us-east-1 bot commented Oct 10, 2024

ChaconC Oct 11, 2024

ramirlm Oct 11, 2024

ramirlm Oct 12, 2024

ChaconC Oct 13, 2024

ramirlm Oct 14, 2024

ChaconC Oct 11, 2024

ramirlm Oct 11, 2024

ChaconC Oct 11, 2024

ramirlm Oct 11, 2024

ChaconC Oct 13, 2024

ChaconC Oct 11, 2024

ramirlm Oct 11, 2024

ChaconC Oct 11, 2024

ramirlm Oct 11, 2024

ChaconC Oct 11, 2024

ramirlm Oct 11, 2024

ChaconC Oct 11, 2024

ramirlm Oct 11, 2024

feat: Loris configuration(M2-6644) #1927

Are you sure you want to change the base?

feat: Loris configuration(M2-6644) #1927

Conversation

ramirlm commented Sep 23, 2024

📝 Description

📸 Screenshots

aws-amplify-us-east-1 bot commented Oct 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment