FormattedMessage shows at least i18n key when no message is found

packages/graphql/extendModel.server.ts

@@ -31,18 +31,23 @@ import {
 } from "./server/resolvers";
 // don't forget to reexport common code
 export * from "./extendModel";
-import extendModel, { GraphqlModelOptions } from "./extendModel";
+import extendModel, {
+  GraphqlModelDefinition,
+  GraphqlModelOptions,
+} from "./extendModel";
 import cloneDeep from "lodash/cloneDeep";
 import isEmpty from "lodash/isEmpty";
+
+import merge from "lodash/merge";
 /**
  * This type is meant to be exposed server side
  *  @server-only
  */
 export interface GraphqlModelOptionsServer extends GraphqlModelOptions {
   /** Custom query resolvers (single, multi). Set to "null" if you don't want Vulcan to set any resolvers. Leave undefined if you want to use default resolvers. */
-  queryResolvers?: Partial<QueryResolverDefinitions>;
+  queryResolvers?: Partial<QueryResolverDefinitions> | null;
   /** Custom mutation resolvers (create, update, delete). Set to "null" if you don't want Vulcan to set any resolvers. Leave undefined if you want to use default resolvers. */
-  mutationResolvers?: Partial<MutationResolverDefinitions>;
+  mutationResolvers?: Partial<MutationResolverDefinitions> | null;
   callbacks?: MutationCallbackDefinitions;
 }
 
@@ -99,9 +104,10 @@ const extendSchemaServer = (
 };
 
 /**
- * Adds server-only fields as well
- * @param options
- * @returns
+ * Plugin function that adds graphql options to a generic model,
+ * including server-side fields
+ *
+ * NOTE: should not be used directly, prefer calling "createGraphqlModelServer"
  */
 export const extendModelServer =
   (
@@ -145,8 +151,13 @@ export interface CreateGraphqlModelOptionsServer
   extends CreateModelOptions<VulcanGraphqlSchemaServer> {
   graphql: GraphqlModelOptionsServer;
 }
+/**
+ * Server-side definition of a model
+ */
+export type GraphqlModelDefinitionServer = CreateGraphqlModelOptionsServer;
 
 /**
+ * Create a graphql model, accepting server-options
  * @server-only
  */
 export const createGraphqlModelServer = (
@@ -161,6 +172,27 @@ export const createGraphqlModelServer = (
   return model;
 };
 
+/**
+ * Adds server only options to a model
+ * @param fullModelDef
+ * @param extensionModelDef
+ * @returns
+ */
+export const mergeModelDefinitionServer = (
+  fullModelDef: GraphqlModelDefinition,
+  /**
+   * Partial model definition, adding some server-only options to an existing model
+   */
+  extensionModelDef: Omit<Partial<GraphqlModelDefinitionServer>, "graphql"> & {
+    graphql?: Partial<GraphqlModelDefinitionServer["graphql"]>;
+  }
+) => {
+  return merge({}, fullModelDef, extensionModelDef);
+};
+
+/**
+ */
+
 //// CODE FROM CREATE COLLECTION
 //import { Mongo } from "meteor/mongo";
 //import SimpleSchema from "simpl-schema";

packages/graphql/extendModel.ts

@@ -41,7 +41,11 @@ export interface GraphqlModelOptionsShared extends GraphqlModelOptions {
   callbacks?: never;
 }
 
-// Reusable model extension function
+/**
+ * Plugin function that adds graphql options to a generic model
+ *
+ * NOTE: should not be used directly, prefer calling "createGraphqlModel"
+ */
 const extendModel =
   (options: GraphqlModelOptions) /*: ExtendModelFunc<VulcanGraphqlModel>*/ =>
   (model: VulcanModel): VulcanGraphqlModel => {
@@ -93,6 +97,11 @@ export interface CreateGraphqlModelOptionsShared
   // => it will display nicer messages when you try to mistakenly use a server-only field
   graphql: GraphqlModelOptionsShared;
 }
+/**
+ * Definition of a model, to be passed to "createGraphqlModel"
+ */
+export type GraphqlModelDefinition = CreateGraphqlModelOptionsShared;
+
 /**
  * Let's you create a full-fledged graphql model
  *

packages/i18n/lib/modules/FormattedMessage.tsx

@@ -25,7 +25,7 @@ export const FormattedMessage = ({
   const cssClass = `i18n-message ${className}`;
 
   // if message is empty (no message found AND no default message), use [id]
-  if (message === "") {
+  if (!message /* === ""*/) {
     message = `[${id}]`;
   }
 

packages/i18n/lib/modules/tests/FormattedMessage.stories.tsx

@@ -0,0 +1,28 @@
+import React from "react";
+import { Story, Meta } from "@storybook/react";
+import { FormattedMessage, FormattedMessageProps } from "../FormattedMessage";
+
+export default {
+  component: FormattedMessage,
+  title: "FormattedMessage",
+  decorators: [
+    (Story) => (
+      // Replace by VulcanComponents if you need them
+      <div>
+        <Story />
+      </div>
+    ),
+  ],
+  args: {},
+  parameters: { actions: { argTypesRegex: "^.*Callback$" } },
+} as Meta<FormattedMessageProps>;
+
+const FormattedMessageTemplate: Story<FormattedMessageProps> = (args) => (
+  <FormattedMessage {...args} />
+);
+export const DefaultFormattedMessage = FormattedMessageTemplate.bind({});
+
+export const UnknownId = FormattedMessageTemplate.bind({});
+UnknownId.args = {
+  id: "unknown-id-should-be-displayed-as-is",
+};

packages/react-ui/components/MutationButton.tsx

@@ -113,6 +113,7 @@ export const MutationButton = (props: MutationButtonProps) => {
         await successCallback(result);
       }
     } catch (error) {
+      // TODO: may not work because the mutationFunc may not throw in case of error
       setError(error);
       if (errorCallback) {
         await errorCallback(error);