fix: Renames Curatr to Stream (#1476 - [LL-217](https://learningpool.atlassian.net/browse/LL-217))

https://learningpool.atlassian.net/browse/LL-217 #1476

Author: cbishopvelti

cli/src/commands/migrateCuratrDashboardsToStream.js

@@ -0,0 +1,38 @@
+import logger from 'lib/logger';
+import Dashboard from 'lib/models/dashboard';
+
+export const renameCuratrDashboardsToStream = async () => {
+ try {
+ const dashboards = await Dashboard.find(
+ {
+ title: { $regex: 'Curatr', $options: 'g' }
+ }
+ );
+
+ for (const dashboard of dashboards) {
+ dashboard.title = dashboard.title.replace('Curatr', 'Stream');
+
+ await dashboard.save();
+ }
+ } catch (error) {
+ logger.error(error);
+ }
+};
+
+export const renameStreamDashboardsToCuratr = async () => {
+ try {
+ const dashboards = await Dashboard.find(
+ {
+ title: { $regex: 'Stream', $options: 'g' }
+ }
+ );
+
+ for (const dashboard of dashboards) {
+ dashboard.title = dashboard.title.replace('Stream', 'Curatr');
+
+ await dashboard.save();
+ }
+ } catch (error) {
+ logger.error(error);
+ }
+};

cli/src/commands/migrateCuratrVisualisationTemplateTypesToStream.js

@@ -0,0 +1,67 @@
+import { invert } from 'lodash';
+
+import Visualisation from 'lib/models/visualisation';
+import logger from 'lib/logger';
+
+// Old name constants
+const TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT = 'TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT';
+const TEMPLATE_CURATR_COMMENT_COUNT = 'TEMPLATE_CURATR_COMMENT_COUNT';
+const TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB = 'TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB';
+const TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD = 'TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD';
+const TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS = 'TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS';
+const TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS = 'TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS';
+
+// New name constants
+const TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT = 'TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT';
+const TEMPLATE_STREAM_COMMENT_COUNT = 'TEMPLATE_STREAM_COMMENT_COUNT';
+const TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB = 'TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB';
+const TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD = 'TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD';
+const TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS = 'TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS';
+const TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS = 'TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS';
+
+const oldToNewRenameMap = {
+ [TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT]: TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT,
+ [TEMPLATE_CURATR_COMMENT_COUNT]: TEMPLATE_STREAM_COMMENT_COUNT,
+ [TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB]: TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB,
+ [TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD]: TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD,
+ [TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS]: TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS,
+ [TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS]: TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS
+};
+
+const newToOldRenameMap = invert(oldToNewRenameMap);
+
+export const renameCuratrTemplateTypesToStream = async () => {
+ try {
+ const visualisations = await Visualisation.find(
+ {
+ type: { $in: Object.keys(oldToNewRenameMap) }
+ }
+ );
+
+ for (const visualisation of visualisations) {
+ visualisation.type = oldToNewRenameMap[visualisation.type];
+
+ await visualisation.save();
+ }
+ } catch (error) {
+ logger.error(error);
+ }
+};
+
+export const renameStreamTemplateTypesToCuratr = async () => {
+ try {
+ const visualisations = await Visualisation.find(
+ {
+ type: { $in: Object.keys(newToOldRenameMap) }
+ }
+ );
+
+ for (const visualisation of visualisations) {
+ visualisation.type = newToOldRenameMap[visualisation.type];
+
+ await visualisation.save();
+ }
+ } catch (error) {
+ logger.error(error);
+ }
+};

cli/src/commands/v2-migrations/20200227000000_rename_curatr_vis_tpl_types_to_stream.js

@@ -0,0 +1,14 @@
+import {
+ renameCuratrTemplateTypesToStream,
+ renameStreamTemplateTypesToCuratr
+} from 'cli/commands/migrateCuratrVisualisationTemplateTypesToStream';
+
+const up = async () => {
+ await renameCuratrTemplateTypesToStream();
+};
+
+const down = async () => {
+ await renameStreamTemplateTypesToCuratr();
+};
+
+export default { up, down };

cli/src/commands/v2-migrations/20200228000000_rename_curatr_dashboards_to_stream.js

@@ -0,0 +1,15 @@
+import {
+ renameCuratrDashboardsToStream,
+ renameStreamDashboardsToCuratr
+} from 'cli/commands/migrateCuratrDashboardsToStream';
+
+
+const up = async () => {
+ await renameCuratrDashboardsToStream();
+};
+
+const down = async () => {
+ await renameStreamDashboardsToCuratr();
+};
+
+export default { up, down };

cli/src/commands/v2-migrations/index.js

@@ -1,4 +1,5 @@
 import { OrderedMap } from 'immutable';
+
 import commonIndexesMigration from './20171122100800_common_indexes';
 import updateRefs from './20171121153300_update_refs';
 import expiration from './20180212_expiration';
@@ -13,6 +14,8 @@ import migrateResetTokens from './20190509000000_migrate_null_resetTokens';
 import fixTypoLast1Years from './20190627000000_fix_typo_last_1_years';
 import personaImports from './20190711090000_persona_imports';
 import migrateVizTypesOfTemplates from './20190719000000_migrate_viz_types_of_templates';
+import renameCuratrVisTplTypesToStream from './20200227000000_rename_curatr_vis_tpl_types_to_stream';
+import renameCuratrDashboardsToStream from './20200228000000_rename_curatr_dashboards_to_stream';
 
 export default new OrderedMap()
  .set('20171122100800_common_indexes', commonIndexesMigration)
@@ -28,4 +31,6 @@ export default new OrderedMap()
  .set('20190509000000_migrate_null_resetTokens', migrateResetTokens)
  .set('20190711090000_persona_imports', personaImports)
  .set('20190627000000_fix_typo_last_1_years', fixTypoLast1Years)
- .set('20190719000000_migrate_viz_types_of_templates', migrateVizTypesOfTemplates);
+ .set('20190719000000_migrate_viz_types_of_templates', migrateVizTypesOfTemplates)
+ .set('20200227000000_rename_curatr_vis_tpl_types_to_stream', renameCuratrVisTplTypesToStream)
+ .set('20200228000000_rename_curatr_dashboards_to_stream', renameCuratrDashboardsToStream);

lib/constants/visualise.js

@@ -16,10 +16,11 @@ export const TEMPLATE_MOST_ACTIVE_PEOPLE = 'TEMPLATE_MOST_ACTIVE_PEOPLE';
 export const TEMPLATE_MOST_POPULAR_ACTIVITIES = 'TEMPLATE_MOST_POPULAR_ACTIVITIES';
 export const TEMPLATE_MOST_POPULAR_VERBS = 'TEMPLATE_MOST_POPULAR_VERBS';
 export const TEMPLATE_WEEKDAYS_ACTIVITY = 'TEMPLATE_WEEKDAYS_ACTIVITY';
-export const TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT = 'TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT';
-export const TEMPLATE_CURATR_COMMENT_COUNT = 'TEMPLATE_CURATR_COMMENT_COUNT';
-export const TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB = 'TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB';
-export const TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD = 'TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD';
-export const TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS = 'TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS';
-export const TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS = 'TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS';
 export const TEMPLATE_LEARNING_EXPERIENCE_TYPE = 'TEMPLATE_LEARNING_EXPERIENCE_TYPE';
+
+export const TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT = 'TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT';
+export const TEMPLATE_STREAM_COMMENT_COUNT = 'TEMPLATE_STREAM_COMMENT_COUNT';
+export const TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB = 'TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB';
+export const TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD = 'TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD';
+export const TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS = 'TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS';
+export const TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS = 'TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS';

ui/src/components/VisualiseIcon/index.js

@@ -16,12 +16,12 @@ import {
  TEMPLATE_MOST_POPULAR_ACTIVITIES,
  TEMPLATE_MOST_POPULAR_VERBS,
  TEMPLATE_WEEKDAYS_ACTIVITY,
- TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT,
- TEMPLATE_CURATR_COMMENT_COUNT,
- TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB,
- TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD,
- TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS,
- TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS,
+ TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT,
+ TEMPLATE_STREAM_COMMENT_COUNT,
+ TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB,
+ TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD,
+ TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS,
+ TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS,
  TEMPLATE_LEARNING_EXPERIENCE_TYPE,
 } from 'lib/constants/visualise';
 import {
@@ -84,19 +84,19 @@ const getImageSrc = (type, sourceView) => {
  case TEMPLATE_MOST_ACTIVE_PEOPLE:
  case TEMPLATE_MOST_POPULAR_ACTIVITIES:
  case TEMPLATE_MOST_POPULAR_VERBS:
- case TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD:
- case TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS:
+ case TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD:
+ case TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS:
  return LEADERBOARD_GREY_IMAGE;
  case TEMPLATE_LEARNING_EXPERIENCE_TYPE:
  return LEADERBOARD_GREY_IMAGE;
  case XVSY:
  return XVSY_IMAGE;
- case TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT:
+ case TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT:
  return XVSY_GREY_IMAGE;
  case STATEMENTS:
  return STATEMENTS_IMAGE;
  case TEMPLATE_WEEKDAYS_ACTIVITY:
- case TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB:
+ case TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB:
  return STATEMENTS_GREY_IMAGE;
  case FREQUENCY:
  return FREQUENCY_IMAGE;
@@ -105,11 +105,11 @@ const getImageSrc = (type, sourceView) => {
  case COUNTER:
  return COUNTER_IMAGE;
  case TEMPLATE_LAST_7_DAYS_STATEMENTS:
- case TEMPLATE_CURATR_COMMENT_COUNT:
+ case TEMPLATE_STREAM_COMMENT_COUNT:
  return COUNTER_GREY_IMAGE;
  case PIE:
  return PIE_IMAGE;
- case TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS:
+ case TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS:
  return PIE_GREY_IMAGE;
  default:
  return '';

ui/src/containers/DashboardTemplates/CuratrStarter.js renamed to ui/src/containers/DashboardTemplates/StreamStarter.js

@@ -2,13 +2,13 @@ import { connect } from 'react-redux';
 import { withProps, compose, withHandlers } from 'recompose';
 import { loggedInUserId } from 'ui/redux/modules/auth';
 import { activeOrgIdSelector } from 'ui/redux/modules/router';
-import { CREATE_CURATR_STARTER } from 'ui/redux/modules/dashboard/curatrStarter';
-import iconImage from './assets/curatr-starter.png';
+import { CREATE_STREAM_STARTER } from 'ui/redux/modules/dashboard/streamStarter';
+import iconImage from './assets/stream-starter.png';
 import TemplateCard from './TemplateCard';
 
 const enhance = compose(
  withProps({
- title: 'Curatr Starter',
+ title: 'Stream Starter',
  image: iconImage,
  }),
  connect(
@@ -17,21 +17,21 @@ const enhance = compose(
  organisationId: activeOrgIdSelector(state)
  }),
  dispatch => ({
- createCuratrStarter: ({ userId, organisationId }) => dispatch({
+ createStreamStarter: ({ userId, organisationId }) => dispatch({
  dispatch,
- type: CREATE_CURATR_STARTER,
+ type: CREATE_STREAM_STARTER,
  userId,
  organisationId,
  })
  })
  ),
  withHandlers({
- onSelect: ({ userId, organisationId, createCuratrStarter }) => () => {
- createCuratrStarter({ userId, organisationId });
+ onSelect: ({ userId, organisationId, createStreamStarter }) => () => {
+ createStreamStarter({ userId, organisationId });
  }
  }),
 );
 
-const CuratrStarter = enhance(TemplateCard);
+const StreamStarter = enhance(TemplateCard);
 
-export default CuratrStarter;
+export default StreamStarter;