@memori.ai/memori-react 2.6.2 → 2.6.4

package/src/helpers/media.test.ts

@@ -0,0 +1,133 @@
+import { getResourceUrl } from './media';
+
+const tenantID = 'app.memorytwin.com';
+const sessionID = 'e995ac6f-8014-4ac0-9992-60fe87ae8b44';
+const mediumID = 'a196b513-d745-4121-8913-8f457b999add';
+
+describe('Media URL helper', () => {
+  it('Get default avatar URL with no url', async () => {
+    expect(
+      getResourceUrl({
+        type: 'avatar',
+        baseURL: 'https://twin.memori.ai',
+        apiURL: 'https://backend.memori.ai/api/v2',
+      })
+    ).toBe('https://twin.memori.ai/images/memoriAvatar.png');
+  });
+  it('Get default cover URL with no url', async () => {
+    expect(
+      getResourceUrl({
+        type: 'cover',
+        apiURL: 'https://backend.memori.ai/api/v2',
+        baseURL: 'https://twin.memori.ai',
+      })
+    ).toBe('https://twin.memori.ai/images/memoriCover.png');
+  });
+
+  it('Get correct URL for media', async () => {
+    expect(
+      getResourceUrl({
+        resourceURI:
+          'https://assets.memori.ai/api/v2/asset/0eed819c-b496-4419-a9a3-aacbe949bb7c.jpeg/',
+        sessionID: sessionID,
+        apiURL: 'https://backend.memori.ai/api/v2',
+      })
+    ).toBe(
+      `https://assets.memori.ai/api/v2/asset/0eed819c-b496-4419-a9a3-aacbe949bb7c.jpeg/${sessionID}`
+    );
+  });
+
+  it('Get correct URL for external media', async () => {
+    expect(
+      getResourceUrl({
+        resourceURI:
+          'https://api.lorem.space/image/game?w=150&h=220&hash=8B7BCDC2',
+        apiURL: 'https://backend.memori.ai/api/v2',
+      })
+    ).toBe('https://api.lorem.space/image/game?w=150&h=220&hash=8B7BCDC2');
+  });
+
+  it('Get correct URL for old memoriai/memory media', async () => {
+    expect(
+      getResourceUrl({
+        resourceURI:
+          'https://backend.memori.ai/api/v1/memoriai/memory/2d434f42-3e95-46ad-9bd5-a10b65977407/media/cloud/studio.memori.ai/2f7b56d1-06a2-4908-9dd3-ef30359b5d05.jpeg',
+        apiURL: 'https://backend.memori.ai/api/v2',
+        sessionID: sessionID,
+      })
+    ).toBe(
+      `https://backend.memori.ai/api/v1/memoriai/memory/2d434f42-3e95-46ad-9bd5-a10b65977407/media/cloud/studio.memori.ai/2f7b56d1-06a2-4908-9dd3-ef30359b5d05.jpeg?memori-ai-session-id=${sessionID}`
+    );
+  });
+
+  it('Get correct URL for old cloud://tenantID media', async () => {
+    expect(
+      getResourceUrl({
+        // cloud://twin.memori.ai/5fc7cd8b-7c8f-4d92-83ad-f48d04b6aafe.jpeg
+        resourceURI: `cloud://${tenantID}/${mediumID}`,
+        apiURL: 'https://backend.memori.ai/api/v2',
+        sessionID: sessionID,
+        tenantID: tenantID,
+      })
+    ).toBe(
+      `https://backend.memori.ai/api/v1/CloudAsset/${tenantID}/${mediumID}`
+    );
+  });
+
+  it('Get correct URL for old cloud://tenantID media', async () => {
+    expect(
+      getResourceUrl({
+        // cloud://twin.memori.ai/5fc7cd8b-7c8f-4d92-83ad-f48d04b6aafe.jpeg
+        resourceURI: `cloud://twin.memori.ai/5fc7cd8b-7c8f-4d92-83ad-f48d04b6aafe.jpeg
+`,
+        apiURL: 'https://backend.memori.ai/api/v2',
+        sessionID: sessionID,
+        tenantID: 'twin.memori.ai',
+      })
+    ).toBe(
+      `https://backend.memori.ai/api/v1/CloudAsset/twin.memori.ai/5fc7cd8b-7c8f-4d92-83ad-f48d04b6aafe.jpeg
+`
+    );
+  });
+
+  it('Get correct URL for old cloud://tenantID media', async () => {
+    expect(
+      getResourceUrl({
+        resourceURI:
+          'cloud://twin.memori.ai/6c30043c-9de1-4d13-87e4-c53adb3f9885.jpg',
+        apiURL: 'https://backend.memori.ai/api/v2',
+        sessionID: sessionID,
+        tenantID: 'twin.memori.ai',
+      })
+    ).toBe(
+      `https://backend.memori.ai/api/v1/CloudAsset/twin.memori.ai/6c30043c-9de1-4d13-87e4-c53adb3f9885.jpg`
+    );
+  });
+
+  it('Get correct URL for old cloud://tenantID media with old non-existent tenant', async () => {
+    expect(
+      getResourceUrl({
+        // cloud://twin.memori.ai/5fc7cd8b-7c8f-4d92-83ad-f48d04b6aafe.jpeg
+        resourceURI: `cloud://twin.memori.ai/5fc7cd8b-7c8f-4d92-83ad-f48d04b6aafe.jpeg
+`,
+        apiURL: 'https://backend.memori.ai/api/v2',
+        sessionID: sessionID,
+        tenantID: 'app.memorytwin.com',
+      })
+    ).toBe(
+      `https://backend.memori.ai/api/v1/CloudAsset/twin.memori.ai/5fc7cd8b-7c8f-4d92-83ad-f48d04b6aafe.jpeg
+`
+    );
+  });
+
+  it('Get correct URL for old guid://tenant media', async () => {
+    expect(
+      getResourceUrl({
+        resourceURI: `guid://${mediumID}`,
+        apiURL: 'https://backend.memori.ai/api/v2',
+        sessionID: sessionID,
+        tenantID: tenantID,
+      })
+    ).toBe(`https://backend.memori.ai/api/v1/GuidAsset/${mediumID}`);
+  });
+});

package/src/helpers/media.ts

@@ -30,9 +30,12 @@ export const getResourceUrl = ({
     } else if (
       (resourceURI.startsWith('https://') ||
         resourceURI.startsWith('http://')) &&
-      new URL(resourceURI).hostname.includes('memori.ai')
+      (new URL(resourceURI).hostname.includes('memori.ai') ||
+        new URL(resourceURI).hostname.includes('aclambda.online'))
     ) {
-      return `${resourceURI}${sessionID ? `/${sessionID}` : ''}`;
+      return `${resourceURI}${
+        resourceURI.endsWith('/') || !sessionID ? '' : '/'
+      }${sessionID || ''}`;
     } else if (resourceURI.startsWith('cloud://')) {
       return `${
         apiURL?.replace(/v2/, 'v1') || ''

package/src/helpers/statistics.test.ts

@@ -0,0 +1,213 @@
+import { EventLog, Stats } from '@memori.ai/memori-api-client/dist/types';
+import {
+  getBadge,
+  getNextBadge,
+  getPointsForBadge,
+  getPointsFromStats,
+  getGamificationLevel,
+  eventLogGroupUsersByDate,
+  getGamificationLevelByStats,
+} from './statistics';
+
+export const stats: Stats = {
+  totalReceivers: 2,
+  receiversWithMemories: 1,
+  totalMemories: 50,
+  publicMemories: 30,
+  memoriesWithMedia: 25,
+  totalQuestions: 35,
+  publicQuestions: 30,
+  questionsWithMoreThanOneAnswer: 20,
+  totalStories: 15,
+  publicStories: 10,
+  storiesWithDate: 5,
+  storiesWithPlace: 3,
+  storiesWithDateAndPlace: 2,
+  unansweredQuestions: 10,
+  successfulCorrelations: 5,
+  failedCorrelations: 1,
+};
+
+export const eventLogs: EventLog[] = [
+  {
+    eventLogID: '28c9f4c8-d7d5-44c4-9f79-418944b03e82',
+    eventType: 'MemoriOpened',
+    ipAddress: '::ffff:10.11.12.14',
+    memoriID: '1afe57c6-1b69-4a61-96ea-52bf7b8d158e',
+    timestamp: '2022-04-15T15:00:27.534191',
+    userAgent: 'RestSharp/106.13.0.0',
+  },
+  {
+    eventLogID: '28c9f4c8-d7d5-44c4-9f79-418944b03e83',
+    eventType: 'MemoriOpened',
+    ipAddress: '::ffff:10.11.12.13',
+    memoriID: '1afe57c6-1b69-4a61-96ea-52bf7b8d158e',
+    timestamp: '2022-04-15T15:00:27.534191',
+    userAgent: 'RestSharp/106.13.0.0',
+  },
+  {
+    eventLogID: '28c9f4c8-d7d5-44c4-9f79-418944b03e84',
+    eventType: 'MemoriClosed',
+    ipAddress: '::ffff:10.11.12.13',
+    memoriID: '1afe57c6-1b69-4a61-96ea-52bf7b8d158e',
+    timestamp: '2022-04-15T15:10:27.534191',
+    userAgent: 'RestSharp/106.13.0.0',
+  },
+  {
+    eventLogID: '28c9f4c8-d7d5-44c4-9f79-418944b03e85',
+    eventType: 'MemoriOpened',
+    ipAddress: '::ffff:10.11.12.13',
+    memoriID: '1afe57c6-1b69-4a61-96ea-52bf7b8d158e',
+    timestamp: '2022-04-15T15:15:27.534191',
+    userAgent: 'RestSharp/106.13.0.0',
+  },
+  {
+    eventLogID: '28c9f4c8-d7d5-44c4-9f79-418944b03e86',
+    eventType: 'MemoriClosed',
+    ipAddress: '::ffff:10.11.12.13',
+    memoriID: '1afe57c6-1b69-4a61-96ea-52bf7b8d158e',
+    timestamp: '2022-04-15T15:20:27.534191',
+    userAgent: 'RestSharp/106.13.0.0',
+  },
+  {
+    eventLogID: '28c9f4c8-d7d5-44c4-9f79-418944b03e88',
+    eventType: 'MemoriClosed',
+    ipAddress: undefined,
+    memoriID: '1afe57c6-1b69-4a61-96ea-52bf7b8d158e',
+    timestamp: '2022-04-15T15:28:27.534191',
+    userAgent: 'RestSharp/106.13.0.0',
+  },
+];
+
+describe('getBadge', () => {
+  it('should return 🆕 badge for 0 points', () => {
+    expect(getBadge(0)).toBe('🆕');
+  });
+  it('should return 🐹 for 10 points', () => {
+    expect(getBadge(10)).toBe('🐹');
+  });
+  it('should return 🥇 for 99 points', () => {
+    expect(getBadge(99)).toBe('🥇');
+  });
+  it('should return 🥇 for 99.9 points with round', () => {
+    expect(getBadge(99.9)).toBe('🥇');
+  });
+  it('should return 🔥 for 100 points', () => {
+    expect(getBadge(100)).toBe('🔥');
+  });
+  it('should return 🔥 for 101 points', () => {
+    expect(getBadge(101)).toBe('🔥');
+  });
+  it('should return 🌎 for 150 points', () => {
+    expect(getBadge(150)).toBe('🌍');
+  });
+  it('should return 🧠 for 1000 points', () => {
+    expect(getBadge(1000)).toBe('🧠');
+  });
+});
+
+describe('getNextBadge', () => {
+  it('should return { points: 10, badge: "🐹" } for 🆕 badge', () => {
+    expect(getNextBadge('🆕')).toEqual({ points: 10, badge: '🐹' });
+  });
+  it('should return { points: 150, badge: "🌍" } for 👾', () => {
+    expect(getNextBadge('👾')).toEqual({ points: 150, badge: '🌍' });
+  });
+  it('should return { points: 600, badge: "🧠" } for ❤', () => {
+    expect(getNextBadge('❤️')).toEqual({ points: 600, badge: '🧠' });
+  });
+});
+
+describe('getPointsForBadge', () => {
+  it('should return 0 for "new" badge', () => {
+    expect(getPointsForBadge('🆕')).toBe(0);
+  });
+  it('should return 10 for 🐹', () => {
+    expect(getPointsForBadge('🐹')).toBe(10);
+  });
+  it('should return 150 for 🌎', () => {
+    expect(getPointsForBadge('🌍')).toBe(150);
+  });
+  it('should return 600 for 🧠', () => {
+    expect(getPointsForBadge('🧠')).toBe(600);
+  });
+});
+
+describe('getPointsFromStats', () => {
+  it('should return 0 for no stats', () => {
+    expect(getPointsFromStats({} as Stats)).toBe(0);
+  });
+  it('should return x for stats', () => {
+    expect(getPointsFromStats(stats)).toBe(68);
+  });
+});
+
+describe('getGamificationLevel', () => {
+  it('should return correct level for 0 points', () => {
+    expect(getGamificationLevel(0)).toEqual({
+      points: 0,
+      badge: '🆕',
+      pointsForCurrentBadge: 0,
+      nextBadge: { points: 10, badge: '🐹' },
+    });
+  });
+  it('should return correct level with 68 points', () => {
+    expect(getGamificationLevel(68.34)).toEqual({
+      points: 68,
+      badge: '🏅',
+      pointsForCurrentBadge: 60,
+      nextBadge: { points: 70, badge: '🥉' },
+    });
+  });
+  it('should return correct level with 100 points', () => {
+    expect(getGamificationLevel(100)).toEqual({
+      points: 100,
+      badge: '🔥',
+      pointsForCurrentBadge: 100,
+      nextBadge: { points: 110, badge: '🎓' },
+    });
+  });
+  it('should return correct level with 68 points and correct float round', () => {
+    expect(getGamificationLevel(67.84)).toEqual({
+      points: 68,
+      badge: '🏅',
+      pointsForCurrentBadge: 60,
+      nextBadge: { points: 70, badge: '🥉' },
+    });
+  });
+  it('should return correct level with 99.9 points', () => {
+    expect(getGamificationLevel(99.9)).toEqual({
+      points: 100,
+      badge: '🔥',
+      pointsForCurrentBadge: 100,
+      nextBadge: { points: 110, badge: '🎓' },
+    });
+  });
+  it('should return correct level with overflow 9999 points', () => {
+    expect(getGamificationLevel(9999)).toEqual({
+      points: 9999,
+      badge: '🧠',
+      pointsForCurrentBadge: 600,
+      nextBadge: undefined,
+    });
+  });
+});
+
+describe('getGamificationLevelByStats', () => {
+  it('should return correct level for no stats', () => {
+    expect(getGamificationLevelByStats({} as Stats)).toEqual({
+      points: 0,
+      badge: '🆕',
+      pointsForCurrentBadge: 0,
+      nextBadge: { points: 10, badge: '🐹' },
+    });
+  });
+  it('should return correct level for stats', () => {
+    expect(getGamificationLevelByStats(stats)).toEqual({
+      points: 68,
+      badge: '🏅',
+      pointsForCurrentBadge: 60,
+      nextBadge: { points: 70, badge: '🥉' },
+    });
+  });
+});

package/src/helpers/utils.test.ts

@@ -0,0 +1,31 @@
+import { difference } from './utils';
+
+describe('Utils/difference', () => {
+  it('should return the difference between two objects with numeric values', () => {
+    const obj1 = { a: 1, b: 2, c: 3 };
+    const obj2 = { a: 1, b: 2, c: 4 };
+    const result = difference(obj1, obj2);
+    expect(result).toEqual({ c: 4 });
+  });
+
+  it('should return the difference between two objects with new properties and strings', () => {
+    const obj1 = { a: 1, c: '' };
+    const obj2 = { a: 1, b: '', c: 'ciao' };
+    const result = difference(obj1, obj2);
+    expect(result).toEqual({ b: '', c: 'ciao' });
+  });
+
+  it('should return the difference between two objects from null or undefined', () => {
+    const obj1 = { a: 1, c: null };
+    const obj2 = { a: 1, b: '', c: 'ciao' };
+    const result = difference(obj1, obj2);
+    expect(result).toEqual({ b: '', c: 'ciao' });
+  });
+
+  it('should return the difference between two objects with lists', () => {
+    const obj1 = { a: [], b: 'thesame' };
+    const obj2 = { a: ['alpha', 'beta', 'gamma'], b: 'thesame' };
+    const result = difference(obj1, obj2);
+    expect(result).toEqual({ a: ['alpha', 'beta', 'gamma'] });
+  });
+});

package/src/helpers/utils.ts

@@ -26,7 +26,7 @@ export const hasTouchscreen = (): boolean => {
   return hasTouchScreen;
 };
 
-export const iOS = (): boolean => {
+export const isiOS = (): boolean => {
   let platform =
     (navigator as any)?.userAgentData?.platform ||
     navigator?.platform ||

package/src/styles.css

@@ -84,4 +84,4 @@ body.sb-show-main #root,
     --memori-modal--width: 100%;
     --memori-modal--width--md: 80%;
     --memori-error-color: #ff4d4f;
-}
+}