Merge pull request #2042 from ChildMindInstitute/release/2025.02.3

Release/2025.02.3

Author: mbanting

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    commit-message:
+      prefix: "[npm] Dependabot:"
+      prefix-development: "[npm-dev] Dependabot:"
+    pull-request-branch-name:
+      separator: "-"

src/modules/Builder/features/ActivityItems/ItemConfiguration/OptionalItemsAndSettings/OptionalItemsAndSettings.const.ts

@@ -75,6 +75,7 @@ export const defaultMultiSelectionConfig: MultipleSelectionConfig = {
 export const defaultSingleSelectionConfig: SingleSelectionConfig = {
   ...defaultMultiSelectionConfig,
   autoAdvance: false,
+  responseDataIdentifier: false,
 };
 
 export const defaultTextConfig: TextInputConfig = {

src/modules/Builder/features/ActivityItems/ItemConfiguration/Settings/ItemSettingsController/ItemSettingsController.const.ts

@@ -21,6 +21,7 @@ export const itemSettingsOptionsByInputType: ItemSettingsOptionsByInputType = {
         ItemConfigurationSettings.HasColorPalette,
         ItemConfigurationSettings.HasTooltips,
         ItemConfigurationSettings.PortraitLayout,
+        ItemConfigurationSettings.HasResponseDataIdentifier,
       ],
     },
     {

src/modules/Builder/features/ActivityItems/ItemConfiguration/Settings/ItemSettingsController/ItemSettingsController.test.tsx

@@ -140,6 +140,7 @@ const mockedSettingsByType = {
     ItemConfigurationSettings.HasColorPalette,
     ItemConfigurationSettings.HasTooltips,
     ItemConfigurationSettings.PortraitLayout,
+    ItemConfigurationSettings.HasResponseDataIdentifier,
     ItemConfigurationSettings.HasTextInput,
     ItemConfigurationSettings.IsTextInputRequired,
     ItemConfigurationSettings.HasTimer,

src/modules/Builder/features/ActivityItems/ItemConfiguration/__mocks__/mock.tsx

@@ -195,6 +195,7 @@ export const mockedEmptySingleSelection = {
     },
     autoAdvance: false,
     portraitLayout: false,
+    responseDataIdentifier: false,
   },
   isHidden: false,
   allowEdit: true,

src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.tsx

@@ -28,6 +28,7 @@ export const BuilderAppletSettings = () => {
             roles: appletData?.id ? workspaceRoles?.data?.[appletData.id] : undefined,
             enableShareToLibrary: featureFlags.enableShareToLibrary,
             enableLorisIntegration: featureFlags.enableLorisIntegration,
+            enableProlificIntegration: featureFlags.enableProlificIntegration,
             appletId: appletData?.id,
           })}
         />

src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.types.ts

@@ -5,6 +5,7 @@ export type GetSettings = {
   isPublished?: boolean;
   roles?: Roles[];
   enableLorisIntegration?: boolean;
+  enableProlificIntegration?: boolean;
   enableShareToLibrary?: boolean;
   appletId?: string;
 };

src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.utils.tsx

@@ -22,7 +22,7 @@ import {
 import { Item as ItemNavigation } from 'shared/components/NavigationMenu/NavigationMenu.types';
 
 import { GetSettings } from './BuilderAppletSettings.types';
-import { LorisIntegration } from './IntegrationsListSetting/Integrations';
+import { IntegrationsListSetting } from './IntegrationsListSetting';
 
 const ReportConfigSetting = lazy(() => import('modules/Builder/features/ReportConfigSetting'));
 
@@ -32,6 +32,7 @@ export const getSettings = ({
   roles,
   enableLorisIntegration,
   enableShareToLibrary,
+  enableProlificIntegration,
   appletId,
 }: GetSettings): ItemNavigation[] => {
   const tooltip = isNewApplet ? 'saveAndPublishFirst' : undefined;
@@ -41,6 +42,8 @@ export const getSettings = ({
   const isSharingVisible =
     !isNewApplet && (roles?.includes(Roles.SuperAdmin) || isShareToLibraryVisible);
 
+  const showIntegrations = enableLorisIntegration || enableProlificIntegration;
+
   return [
     {
       label: 'usersAndData',
@@ -62,15 +65,14 @@ export const getSettings = ({
           param: SettingParam.LiveResponseStreaming,
           'data-testid': `${dataTestid}-live-response-streaming`,
         },
-        ...(enableLorisIntegration
+        ...(showIntegrations
           ? [
               {
                 icon: <Svg id="integrations" />,
-                label: 'loris.integration',
-                component: <LorisIntegration />,
-                param: SettingParam.LorisIntegration,
-                isVisible: enableLorisIntegration,
-                'data-testid': `${dataTestid}-loris-integration`,
+                label: 'integrations',
+                component: <IntegrationsListSetting />,
+                param: SettingParam.Integrations,
+                isVisible: showIntegrations,
               },
             ]
           : []),

src/modules/Builder/features/BuilderAppletSettings/IntegrationsListSetting/Integrations/LorisIntegration/LorisIntegration.styles.ts

@@ -18,7 +18,11 @@ import {
 } from 'shared/styles';
 import { IntegrationTypes } from 'shared/consts';
 
-import { StyledLink, StyledLorisIntegration, StyledStatusChip } from './LorisIntegration.styles';
+import {
+  StyledLink,
+  StyledIntegration,
+  StyledStatusChip,
+} from '../../IntegrationsListSetting.styles';
 import { ConfigurationPopup } from './ConfigurationPopup';
 import { DisconnectionPopup } from './DisconnectionPopup';
 import { UploadPopup } from './UploadPopup';
@@ -72,7 +76,7 @@ export const LorisIntegration = () => {
 
   return (
     <FormProvider {...methods}>
-      <StyledLorisIntegration data-testid="loris-integration">
+      <StyledIntegration data-testid="loris-integration">
         <Box>
           <Svg width={94} height={94} id="loris-integration" />
         </Box>
@@ -152,7 +156,7 @@ export const LorisIntegration = () => {
             </Button>
           )}
         </StyledFlexAllCenter>
-      </StyledLorisIntegration>
+      </StyledIntegration>
       {isConfigurationPopupVisible && (
         <ConfigurationPopup
           open={isConfigurationPopupVisible}