Thread renderer

api/mutations/thread/editThread.js

@@ -1,4 +1,5 @@
 // @flow
+const debug = require('debug')('api:mutations:edit-thread');
 import type { GraphQLContext } from '../../';
 import type { EditThreadInput } from '../../models/thread';
 import UserError from '../../utils/UserError';
@@ -7,6 +8,7 @@ import { getThreads, editThread } from '../../models/thread';
 import { getUserPermissionsInCommunity } from '../../models/usersCommunities';
 import { getUserPermissionsInChannel } from '../../models/usersChannels';
 import { isAuthedResolver as requireAuth } from '../../utils/permissions';
+import processThreadContent from 'shared/draft-utils/process-thread-content';
 import { events } from 'shared/analytics';
 import { trackQueue } from 'shared/bull/queues';
 import {
@@ -83,6 +85,8 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
     );
   }
 
+  input.content.body = processThreadContent('TEXT', input.content.body || '');
+
   /*
     When threads are sent to the client, all image urls are signed and proxied
     via imgix. If a user edits the thread, we have to restore all image upload
@@ -130,6 +134,7 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
     });
   }
 
+  debug('store new body to database:', initialBody);
   const newInput = Object.assign({}, input, {
     ...input,
     content: {

api/utils/create-graphql-error-formatter.js

@@ -32,6 +32,10 @@ const errorPath = error => {
 const logGraphQLError = (req, error) => {
   debug('---GraphQL Error---');
   debug(error);
+  error &&
+    error.extensions &&
+    error.extensions.exception &&
+    debug(error.extensions.exception.stacktrace.join('\n'));
   if (req) {
     debug(collectQueries(req.body.query));
     debug('variables', JSON.stringify(req.body.variables || {}));

cypress/integration/thread/action_bar_spec.js

@@ -189,8 +189,8 @@ describe('action bar renders', () => {
       cy.get('[data-cy="thread-dropdown-edit"]').click();
       cy.get('[data-cy="save-thread-edit-button"]').should('be.visible');
       const title = 'Some new thread';
-      cy.get('[data-cy="rich-text-editor"].markdown').should('be.visible');
-      cy.get('[data-cy="thread-editor-title-input"]')
+      cy.get('[data-cy="rich-text-editor"]').should('be.visible');
+      cy.get('[data-cy="composer-title-input"]')
         .clear()
         .type(title);
       cy.get('[data-cy="save-thread-edit-button"]').click();
@@ -201,8 +201,8 @@ describe('action bar renders', () => {
       cy.get('[data-cy="thread-dropdown-edit"]').click();
       cy.get('[data-cy="save-thread-edit-button"]').should('be.visible');
       const originalTitle = 'The first thread! 🎉';
-      cy.get('[data-cy="rich-text-editor"].markdown').should('be.visible');
-      cy.get('[data-cy="thread-editor-title-input"]')
+      cy.get('[data-cy="rich-text-editor"]').should('be.visible');
+      cy.get('[data-cy="composer-title-input"]')
         .clear()
         .type(originalTitle);
       cy.get('[data-cy="save-thread-edit-button"]').click();

flow-typed/npm/prism-react-renderer_vx.x.x.js

@@ -0,0 +1,214 @@
+// flow-typed signature: 3987fe684d034fe6822d30ca25b56da6
+// flow-typed version: <<STUB>>/prism-react-renderer_vx.x.x/flow_v0.66.0
+
+/**
+ * This is an autogenerated libdef stub for:
+ *
+ *   'prism-react-renderer'
+ *
+ * Fill this stub out by replacing all the `any` types.
+ *
+ * Once filled out, we encourage you to share your work with the
+ * community by sending a pull request to:
+ * https://github.com/flowtype/flow-typed
+ */
+
+declare module 'prism-react-renderer' {
+  declare module.exports: any;
+}
+
+/**
+ * We include stubs for each file inside this npm package in case you need to
+ * require those files directly. Feel free to delete any files that aren't
+ * needed.
+ */
+declare module 'prism-react-renderer/es/components/Highlight' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/es/defaultProps' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/es/index' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/es/types' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/es/utils/normalizeTokens' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/es/utils/themeToDict' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/es/vendor/prism/includeLangs' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/es/vendor/prism/index' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/es/vendor/prism/prism-core' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/components/Highlight' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/defaultProps' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/index' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/types' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/utils/normalizeTokens' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/utils/themeToDict' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/vendor/prism/includeLangs' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/vendor/prism/index' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/lib/vendor/prism/prism-core' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/dracula' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/duotoneDark' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/duotoneLight' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/nightOwl' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/oceanicNext' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/shadesOfPurple' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/ultramin' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/vsDark' {
+  declare module.exports: any;
+}
+
+declare module 'prism-react-renderer/themes/vsDarkPlus' {
+  declare module.exports: any;
+}
+
+// Filename aliases
+declare module 'prism-react-renderer/es/components/Highlight.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/components/Highlight'>;
+}
+declare module 'prism-react-renderer/es/defaultProps.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/defaultProps'>;
+}
+declare module 'prism-react-renderer/es/index.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/index'>;
+}
+declare module 'prism-react-renderer/es/types.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/types'>;
+}
+declare module 'prism-react-renderer/es/utils/normalizeTokens.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/utils/normalizeTokens'>;
+}
+declare module 'prism-react-renderer/es/utils/themeToDict.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/utils/themeToDict'>;
+}
+declare module 'prism-react-renderer/es/vendor/prism/includeLangs.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/vendor/prism/includeLangs'>;
+}
+declare module 'prism-react-renderer/es/vendor/prism/index.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/vendor/prism/index'>;
+}
+declare module 'prism-react-renderer/es/vendor/prism/prism-core.js' {
+  declare module.exports: $Exports<'prism-react-renderer/es/vendor/prism/prism-core'>;
+}
+declare module 'prism-react-renderer/lib/components/Highlight.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/components/Highlight'>;
+}
+declare module 'prism-react-renderer/lib/defaultProps.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/defaultProps'>;
+}
+declare module 'prism-react-renderer/lib/index.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/index'>;
+}
+declare module 'prism-react-renderer/lib/types.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/types'>;
+}
+declare module 'prism-react-renderer/lib/utils/normalizeTokens.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/utils/normalizeTokens'>;
+}
+declare module 'prism-react-renderer/lib/utils/themeToDict.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/utils/themeToDict'>;
+}
+declare module 'prism-react-renderer/lib/vendor/prism/includeLangs.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/vendor/prism/includeLangs'>;
+}
+declare module 'prism-react-renderer/lib/vendor/prism/index.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/vendor/prism/index'>;
+}
+declare module 'prism-react-renderer/lib/vendor/prism/prism-core.js' {
+  declare module.exports: $Exports<'prism-react-renderer/lib/vendor/prism/prism-core'>;
+}
+declare module 'prism-react-renderer/themes/dracula.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/dracula'>;
+}
+declare module 'prism-react-renderer/themes/duotoneDark.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/duotoneDark'>;
+}
+declare module 'prism-react-renderer/themes/duotoneLight.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/duotoneLight'>;
+}
+declare module 'prism-react-renderer/themes/nightOwl.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/nightOwl'>;
+}
+declare module 'prism-react-renderer/themes/oceanicNext.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/oceanicNext'>;
+}
+declare module 'prism-react-renderer/themes/shadesOfPurple.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/shadesOfPurple'>;
+}
+declare module 'prism-react-renderer/themes/ultramin.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/ultramin'>;
+}
+declare module 'prism-react-renderer/themes/vsDark.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/vsDark'>;
+}
+declare module 'prism-react-renderer/themes/vsDarkPlus.js' {
+  declare module.exports: $Exports<'prism-react-renderer/themes/vsDarkPlus'>;
+}

package.json

@@ -146,6 +146,7 @@
     "passport-google-oauth2": "^0.1.6",
     "passport-twitter": "^1.0.4",
     "pre-commit": "^1.2.2",
+    "prism-react-renderer": "^0.1.5",
     "prismjs": "^1.15.0",
     "query-string": "5.1.1",
     "raf": "^3.4.0",

shared/clients/draft-js/message/types.js

@@ -6,8 +6,10 @@ export type KeyObj = {
 
 export type KeysObj = {
   keys: string[],
+  data?: Object,
 };
 
 export type DataObj = {
-  url: string,
+  url?: string,
+  href?: string,
 };