Merge pull request #2067 from tekdi/release-1.12.0

Release 1.12.0 to admin prod

Author: rushi-tekdi

apps/admin-app-repo/src/utils/telemetry.js

@@ -30,7 +30,7 @@ const telemetryConfig = {
     (typeof window !== 'undefined' && localStorage.getItem('id')) ||
     'Anonymous',
   sid: generateUUID(),
-  batchsize: 3,
+  batchsize: 1,
   mode: '',
   host: hostURL, //TODO: Change this host and endpoint properly
   endpoint: '/v1/telemetry',

apps/learner-web-app/src/components/Provider/GlobalProvider.tsx

@@ -36,6 +36,7 @@ export const GlobalProvider: React.FC<GlobalProviderProps> = ({ children }) => {
         localStorage.setItem('channelId', tenantInfo.channelId);
         localStorage.setItem('tenantId', tenantInfo.tenantId);
         localStorage.setItem('userProgram', tenantInfo.name);
+        localStorage.setItem('uiConfig', JSON.stringify(tenantInfo?.params?.uiConfig || {}));
         localStorage.setItem(
           'collectionFramework',
           tenantInfo.collectionFramework

apps/learner-web-app/src/components/pos/Search.tsx

@@ -16,7 +16,10 @@ const SearchPage = () => {
   const [searchValue, setSearchValue] = React.useState('');
   const [submitText, setSubmitText] = React.useState('');
   const searchParams = useSearchParams();
-
+  const storedConfig =
+  typeof window !== 'undefined'
+    ? JSON.parse(localStorage.getItem('uiConfig') || '{}')
+    : {};
   React.useEffect(() => {
     const queryParam = searchParams?.get('q') || '';
     setSearchValue(queryParam);
@@ -44,6 +47,8 @@ const SearchPage = () => {
         filters={{
           query: submitText,
         }}
+        contentTabs={storedConfig.showContent}
+
         isShowLayout={false}
         showFilter={false}
         showSearch={false}

apps/teachers/src/utils/telemetry.js

@@ -34,7 +34,7 @@ const telemetryConfig = {
     (typeof window !== 'undefined' && localStorage.getItem('userName')) ||
     'Anonymous',
   sid: generateUUID(),
-  batchsize: 3,
+  batchsize: 1,
   mode: '',
   host: hostURL,
   endpoint: '/v1/telemetry',

libs/shared-lib-v2/src/DynamicForm/utils/telemetry.ts

@@ -31,7 +31,7 @@ const telemetryConfig = {
     (typeof window !== 'undefined' && localStorage.getItem('id')) ||
     'Anonymous',
   sid: generateUUID(),
-  batchsize: 3,
+  batchsize: 1,
   mode: '',
   host: hostURL, //TODO: Change this host and endpoint properly
   endpoint: '/v1/telemetry',

mfes/authentication/src/pages/login.tsx

@@ -26,6 +26,8 @@ import config from '../../config.json';
 import ReactGA from 'react-ga4';
 import { Snackbar, Alert } from "@mui/material";
 import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
+import { Telemetry } from '../utils/app.constant';
+import { telemetryFactory } from '../utils/telemetry';
 
 
 type LoginPageProps = {
@@ -52,7 +54,21 @@ const LoginPage: React.FC<LoginPageProps> = ({ onLoginSuccess }) => {
 
   const passwordRef = useRef<HTMLInputElement>(null);
   const loginButtonRef = useRef<HTMLButtonElement>(null);
-
+  const telemetryOnSubmit = () => {
+    const telemetryInteract = {
+      context: {
+        env: 'sign-in',
+        cdata: [],
+      },
+      edata: {
+        id: 'login-success',
+        type: Telemetry.CLICK,
+        subtype: '',
+        pageid: 'sign-in',
+      },
+    };
+    telemetryFactory.interact(telemetryInteract);
+  };
   useEffect(() => {
     if (typeof window !== 'undefined' && window.localStorage) {
       let lang;
@@ -104,6 +120,7 @@ const LoginPage: React.FC<LoginPageProps> = ({ onLoginSuccess }) => {
 
             const userResponse = await getUserId();
 
+            telemetryOnSubmit();
             if (onLoginSuccess) {
               onLoginSuccess(userResponse);
               setLoading(false)

mfes/authentication/src/utils/telemetry.js

@@ -34,7 +34,7 @@ const telemetryConfig = {
     (typeof window !== 'undefined' && localStorage.getItem('userName')) ||
     'Anonymous',
   sid: generateUUID(),
-  batchsize: 3,
+  batchsize: 1,
   mode: '',
   host: hostURL,
   endpoint: '/v1/telemetry',

mfes/scp-teacher-repo/src/components/SessionCardFooter.tsx

@@ -131,7 +131,7 @@ const SessionCardFooter: React.FC<SessionCardFooterProps> = ({
               }
             );
             courseData = response?.result?.data[0];
-            courseId = courseData._id;
+            courseId = courseData?._id;
           }
 
           // let courseData = response?.result?.data[0];

mfes/scp-teacher-repo/src/services/CoursePlannerService.ts

@@ -90,7 +90,7 @@ export const getUserProjectTemplate = async ({
   solutionId,
   role,
   entityId,
-  acl
+  acl,
 }: GetUserProjectTemplateParams): Promise<any> => {
   const apiUrl: string = `${process.env.NEXT_PUBLIC_COURSE_PLANNER_API_URL}/userProjects/details?templateId=${templateId}&solutionId=${solutionId}`;
 
@@ -106,7 +106,7 @@ export const getUserProjectTemplate = async ({
     //   scope: {}
     // },
     entityId,
-    acl
+    acl,
   };
 
   try {
@@ -145,7 +145,7 @@ export const UserStatusDetails = async ({
 export const fetchCourseIdFromSolution = async (
   solutionId: string,
   cohortId: string,
-  acl:any 
+  acl: any
 ): Promise<any> => {
   try {
     const solutionResponse = await getSolutionDetails({
@@ -154,15 +154,23 @@ export const fetchCourseIdFromSolution = async (
     });
 
     const externalId = solutionResponse?.result?.externalId;
-    let response =await getUserProjectTemplate({
+    await getUserProjectTemplate({
       templateId: externalId,
       solutionId,
       role: Role.TEACHER,
       entityId: cohortId,
-      acl
+      acl,
+    });
+    const updatedResponse = await getTargetedSolutions({
+      subject: acl?.subject,
+      class: acl?.class,
+      board: acl?.board,
+      courseType: acl?.courseType,
+      medium: acl?.medium,
+      entityId: cohortId,
     });
 
-    return response;
+    return updatedResponse;
   } catch (error) {
     console.error('Error fetching solution details:', error);
     // throw error;

mfes/scp-teacher-repo/src/utils/telemetry.js

@@ -34,7 +34,7 @@ const telemetryConfig = {
     (typeof window !== 'undefined' && localStorage.getItem('userName')) ||
     'Anonymous',
   sid: generateUUID(),
-  batchsize: 3,
+  batchsize: 1,
   mode: '',
   host: hostURL,
   endpoint: '/v1/telemetry',