Merge branch 'master' into dependabot/maven/org.codehaus.mojo-exec-ma…

…ven-plugin-3.5.0
Graylog2 · Oct 23, 2024 · 6fdd592 · 6fdd592
2 parents bbc16a1 + 9bec368
commit 6fdd592
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...face/src/components/event-notifications/event-notification-form/EventNotificationForm.tsx b/...face/src/components/event-notifications/event-notification-form/EventNotificationForm.tsx
@@ -139,7 +139,7 @@ class EventNotificationForm extends React.Component<EventNotificationFormProps,
     const { isSubmitEnabled } = this.state;
 
     const notificationPlugin = getNotificationPlugin(notification.config.type);
-    const notificationFormComponent = notificationPlugin.formComponent
+    const notificationFormComponent = notificationPlugin?.formComponent
       ? React.createElement(notificationPlugin.formComponent, {
         config: notification.config,
         onChange: this.handleConfigChange,

diff --git a/graylog2-web-interface/webpack/core.js b/graylog2-web-interface/webpack/core.js
@@ -160,7 +160,11 @@ const config = (target, appPath, rootPath, webInterfaceRoot, supportedBrowsers)
         new webpack.DefinePlugin({
           DEVELOPMENT: true,
         }),
-        new ForkTsCheckerWebpackPlugin(),
+        new ForkTsCheckerWebpackPlugin({
+          typescript: {
+            memoryLimit: 4096,
+          },
+        }),
       ],
     });
   }