Skip to content

Commit 5db0c98

Browse files
cbishopvelticbishopvelti
authored
fix: Renames Curatr to Stream (#1476 - [LL-217](https://learningpool.atlassian.net/browse/LL-217))
https://learningpool.atlassian.net/browse/LL-217 #1476
1 parent ebd9561 commit 5db0c98

63 files changed

Lines changed: 345 additions & 198 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cli/src/commands/migrateCuratrDashboardsToStream.js‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import logger from 'lib/logger';
2+
import Dashboard from 'lib/models/dashboard';
3+
4+
export const renameCuratrDashboardsToStream = async () => {
5+
try {
6+
const dashboards = await Dashboard.find(
7+
{
8+
title: { $regex: 'Curatr', $options: 'g' }
9+
}
10+
);
11+
12+
for (const dashboard of dashboards) {
13+
dashboard.title = dashboard.title.replace('Curatr', 'Stream');
14+
15+
await dashboard.save();
16+
}
17+
} catch (error) {
18+
logger.error(error);
19+
}
20+
};
21+
22+
export const renameStreamDashboardsToCuratr = async () => {
23+
try {
24+
const dashboards = await Dashboard.find(
25+
{
26+
title: { $regex: 'Stream', $options: 'g' }
27+
}
28+
);
29+
30+
for (const dashboard of dashboards) {
31+
dashboard.title = dashboard.title.replace('Stream', 'Curatr');
32+
33+
await dashboard.save();
34+
}
35+
} catch (error) {
36+
logger.error(error);
37+
}
38+
};

‎cli/src/commands/migrateCuratrVisualisationTemplateTypesToStream.js‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
import { invert } from 'lodash';
2+
3+
import Visualisation from 'lib/models/visualisation';
4+
import logger from 'lib/logger';
5+
6+
// Old name constants
7+
const TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT = 'TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT';
8+
const TEMPLATE_CURATR_COMMENT_COUNT = 'TEMPLATE_CURATR_COMMENT_COUNT';
9+
const TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB = 'TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB';
10+
const TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD = 'TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD';
11+
const TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS = 'TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS';
12+
const TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS = 'TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS';
13+
14+
// New name constants
15+
const TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT = 'TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT';
16+
const TEMPLATE_STREAM_COMMENT_COUNT = 'TEMPLATE_STREAM_COMMENT_COUNT';
17+
const TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB = 'TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB';
18+
const TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD = 'TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD';
19+
const TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS = 'TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS';
20+
const TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS = 'TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS';
21+
22+
const oldToNewRenameMap = {
23+
[TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT]: TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT,
24+
[TEMPLATE_CURATR_COMMENT_COUNT]: TEMPLATE_STREAM_COMMENT_COUNT,
25+
[TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB]: TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB,
26+
[TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD]: TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD,
27+
[TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS]: TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS,
28+
[TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS]: TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS
29+
};
30+
31+
const newToOldRenameMap = invert(oldToNewRenameMap);
32+
33+
export const renameCuratrTemplateTypesToStream = async () => {
34+
try {
35+
const visualisations = await Visualisation.find(
36+
{
37+
type: { $in: Object.keys(oldToNewRenameMap) }
38+
}
39+
);
40+
41+
for (const visualisation of visualisations) {
42+
visualisation.type = oldToNewRenameMap[visualisation.type];
43+
44+
await visualisation.save();
45+
}
46+
} catch (error) {
47+
logger.error(error);
48+
}
49+
};
50+
51+
export const renameStreamTemplateTypesToCuratr = async () => {
52+
try {
53+
const visualisations = await Visualisation.find(
54+
{
55+
type: { $in: Object.keys(newToOldRenameMap) }
56+
}
57+
);
58+
59+
for (const visualisation of visualisations) {
60+
visualisation.type = newToOldRenameMap[visualisation.type];
61+
62+
await visualisation.save();
63+
}
64+
} catch (error) {
65+
logger.error(error);
66+
}
67+
};

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import {
2+
renameCuratrTemplateTypesToStream,
3+
renameStreamTemplateTypesToCuratr
4+
} from 'cli/commands/migrateCuratrVisualisationTemplateTypesToStream';
5+
6+
const up = async () => {
7+
await renameCuratrTemplateTypesToStream();
8+
};
9+
10+
const down = async () => {
11+
await renameStreamTemplateTypesToCuratr();
12+
};
13+
14+
export default { up, down };

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import {
2+
renameCuratrDashboardsToStream,
3+
renameStreamDashboardsToCuratr
4+
} from 'cli/commands/migrateCuratrDashboardsToStream';
5+
6+
7+
const up = async () => {
8+
await renameCuratrDashboardsToStream();
9+
};
10+
11+
const down = async () => {
12+
await renameStreamDashboardsToCuratr();
13+
};
14+
15+
export default { up, down };

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { OrderedMap } from 'immutable';
2+
23
import commonIndexesMigration from './20171122100800_common_indexes';
34
import updateRefs from './20171121153300_update_refs';
45
import expiration from './20180212_expiration';
@@ -13,6 +14,8 @@ import migrateResetTokens from './20190509000000_migrate_null_resetTokens';
1314
import fixTypoLast1Years from './20190627000000_fix_typo_last_1_years';
1415
import personaImports from './20190711090000_persona_imports';
1516
import migrateVizTypesOfTemplates from './20190719000000_migrate_viz_types_of_templates';
17+
import renameCuratrVisTplTypesToStream from './20200227000000_rename_curatr_vis_tpl_types_to_stream';
18+
import renameCuratrDashboardsToStream from './20200228000000_rename_curatr_dashboards_to_stream';
1619

1720
export default new OrderedMap()
1821
.set('20171122100800_common_indexes', commonIndexesMigration)
@@ -28,4 +31,6 @@ export default new OrderedMap()
2831
.set('20190509000000_migrate_null_resetTokens', migrateResetTokens)
2932
.set('20190711090000_persona_imports', personaImports)
3033
.set('20190627000000_fix_typo_last_1_years', fixTypoLast1Years)
31-
.set('20190719000000_migrate_viz_types_of_templates', migrateVizTypesOfTemplates);
34+
.set('20190719000000_migrate_viz_types_of_templates', migrateVizTypesOfTemplates)
35+
.set('20200227000000_rename_curatr_vis_tpl_types_to_stream', renameCuratrVisTplTypesToStream)
36+
.set('20200228000000_rename_curatr_dashboards_to_stream', renameCuratrDashboardsToStream);

‎lib/constants/visualise.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ export const TEMPLATE_MOST_ACTIVE_PEOPLE = 'TEMPLATE_MOST_ACTIVE_PEOPLE';
1616
export const TEMPLATE_MOST_POPULAR_ACTIVITIES = 'TEMPLATE_MOST_POPULAR_ACTIVITIES';
1717
export const TEMPLATE_MOST_POPULAR_VERBS = 'TEMPLATE_MOST_POPULAR_VERBS';
1818
export const TEMPLATE_WEEKDAYS_ACTIVITY = 'TEMPLATE_WEEKDAYS_ACTIVITY';
19-
export const TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT = 'TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT';
20-
export const TEMPLATE_CURATR_COMMENT_COUNT = 'TEMPLATE_CURATR_COMMENT_COUNT';
21-
export const TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB = 'TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB';
22-
export const TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD = 'TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD';
23-
export const TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS = 'TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS';
24-
export const TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS = 'TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS';
2519
export const TEMPLATE_LEARNING_EXPERIENCE_TYPE = 'TEMPLATE_LEARNING_EXPERIENCE_TYPE';
20+
21+
export const TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT = 'TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT';
22+
export const TEMPLATE_STREAM_COMMENT_COUNT = 'TEMPLATE_STREAM_COMMENT_COUNT';
23+
export const TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB = 'TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB';
24+
export const TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD = 'TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD';
25+
export const TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS = 'TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS';
26+
export const TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS = 'TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS';

‎ui/src/components/VisualiseIcon/index.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import {
1616
TEMPLATE_MOST_POPULAR_ACTIVITIES,
1717
TEMPLATE_MOST_POPULAR_VERBS,
1818
TEMPLATE_WEEKDAYS_ACTIVITY,
19-
TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT,
20-
TEMPLATE_CURATR_COMMENT_COUNT,
21-
TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB,
22-
TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD,
23-
TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS,
24-
TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS,
19+
TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT,
20+
TEMPLATE_STREAM_COMMENT_COUNT,
21+
TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB,
22+
TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD,
23+
TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS,
24+
TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS,
2525
TEMPLATE_LEARNING_EXPERIENCE_TYPE,
2626
} from 'lib/constants/visualise';
2727
import {
@@ -84,19 +84,19 @@ const getImageSrc = (type, sourceView) => {
8484
case TEMPLATE_MOST_ACTIVE_PEOPLE:
8585
case TEMPLATE_MOST_POPULAR_ACTIVITIES:
8686
case TEMPLATE_MOST_POPULAR_VERBS:
87-
case TEMPLATE_CURATR_USER_ENGAGEMENT_LEADERBOARD:
88-
case TEMPLATE_CURATR_ACTIVITIES_WITH_MOST_COMMENTS:
87+
case TEMPLATE_STREAM_USER_ENGAGEMENT_LEADERBOARD:
88+
case TEMPLATE_STREAM_ACTIVITIES_WITH_MOST_COMMENTS:
8989
return LEADERBOARD_GREY_IMAGE;
9090
case TEMPLATE_LEARNING_EXPERIENCE_TYPE:
9191
return LEADERBOARD_GREY_IMAGE;
9292
case XVSY:
9393
return XVSY_IMAGE;
94-
case TEMPLATE_CURATR_INTERACTIONS_VS_ENGAGEMENT:
94+
case TEMPLATE_STREAM_INTERACTIONS_VS_ENGAGEMENT:
9595
return XVSY_GREY_IMAGE;
9696
case STATEMENTS:
9797
return STATEMENTS_IMAGE;
9898
case TEMPLATE_WEEKDAYS_ACTIVITY:
99-
case TEMPLATE_CURATR_LEARNER_INTERACTIONS_BY_DATE_AND_VERB:
99+
case TEMPLATE_STREAM_LEARNER_INTERACTIONS_BY_DATE_AND_VERB:
100100
return STATEMENTS_GREY_IMAGE;
101101
case FREQUENCY:
102102
return FREQUENCY_IMAGE;
@@ -105,11 +105,11 @@ const getImageSrc = (type, sourceView) => {
105105
case COUNTER:
106106
return COUNTER_IMAGE;
107107
case TEMPLATE_LAST_7_DAYS_STATEMENTS:
108-
case TEMPLATE_CURATR_COMMENT_COUNT:
108+
case TEMPLATE_STREAM_COMMENT_COUNT:
109109
return COUNTER_GREY_IMAGE;
110110
case PIE:
111111
return PIE_IMAGE;
112-
case TEMPLATE_CURATR_PROPORTION_OF_SOCIAL_INTERACTIONS:
112+
case TEMPLATE_STREAM_PROPORTION_OF_SOCIAL_INTERACTIONS:
113113
return PIE_GREY_IMAGE;
114114
default:
115115
return '';

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { connect } from 'react-redux';
22
import { withProps, compose, withHandlers } from 'recompose';
33
import { loggedInUserId } from 'ui/redux/modules/auth';
44
import { activeOrgIdSelector } from 'ui/redux/modules/router';
5-
import { CREATE_CURATR_STARTER } from 'ui/redux/modules/dashboard/curatrStarter';
6-
import iconImage from './assets/curatr-starter.png';
5+
import { CREATE_STREAM_STARTER } from 'ui/redux/modules/dashboard/streamStarter';
6+
import iconImage from './assets/stream-starter.png';
77
import TemplateCard from './TemplateCard';
88

99
const enhance = compose(
1010
withProps({
11-
title: 'Curatr Starter',
11+
title: 'Stream Starter',
1212
image: iconImage,
1313
}),
1414
connect(
@@ -17,21 +17,21 @@ const enhance = compose(
1717
organisationId: activeOrgIdSelector(state)
1818
}),
1919
dispatch => ({
20-
createCuratrStarter: ({ userId, organisationId }) => dispatch({
20+
createStreamStarter: ({ userId, organisationId }) => dispatch({
2121
dispatch,
22-
type: CREATE_CURATR_STARTER,
22+
type: CREATE_STREAM_STARTER,
2323
userId,
2424
organisationId,
2525
})
2626
})
2727
),
2828
withHandlers({
29-
onSelect: ({ userId, organisationId, createCuratrStarter }) => () => {
30-
createCuratrStarter({ userId, organisationId });
29+
onSelect: ({ userId, organisationId, createStreamStarter }) => () => {
30+
createStreamStarter({ userId, organisationId });
3131
}
3232
}),
3333
);
3434

35-
const CuratrStarter = enhance(TemplateCard);
35+
const StreamStarter = enhance(TemplateCard);
3636

37-
export default CuratrStarter;
37+
export default StreamStarter;

‎ui/src/containers/DashboardTemplates/assets/curatr-starter.png‎

-4.19 KB
Binary file not shown.

‎ui/src/containers/DashboardTemplates/assets/stream-starter.png‎

3.91 KB
Loading

0 commit comments

Comments
 (0)