Merge pull request #1971 from grafana/dev

Merge dev to main

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.2.26 (2023-05-18)
+
+### Fixed
+
+- Fix inbound email bug when attaching files by @vadimkerr ([#1970](https://github.com/grafana/oncall/pull/1970))
+
 ## v1.2.25 (2023-05-18)
 
 ### Added

engine/apps/api/views/features.py

@@ -64,4 +64,12 @@ class FeaturesAPIView(APIView):
         if is_webhooks_enabled_for_organization(request.auth.organization.pk):
             enabled_features.append(FEATURE_WEBHOOKS2)
 
+        enabled_mobile_test_push = DynamicSetting.objects.get_or_create(
+            name="enabled_mobile_test_push",
+            defaults={"boolean_value": False},
+        )[0]
+
+        if enabled_mobile_test_push.boolean_value:
+            enabled_features.append(FEATURE_MOBILE_TEST_PUSH)
+
         return enabled_features

engine/apps/email/inbound.py

@@ -69,7 +69,7 @@ class InboundEmailWebhookView(AlertChannelDefiningMixin, APIView):
                 alert_receive_channel_pk=alert_receive_channel.pk,
                 image_url=None,
                 link_to_upstream_details=None,
-                integration_unique_data=request.data,
+                integration_unique_data=None,
                 raw_request_data=payload,
             )
 

grafana-plugin/src/containers/MobileAppConnection/MobileAppConnection.tsx

@@ -200,28 +200,26 @@ const MobileAppConnection = observer(({ userPk }: Props) => {
             {content}
           </Block>
         </div>
-        {false && // temporary disable test notifications
-          mobileAppIsCurrentlyConnected &&
-          isCurrentUser && (
-            <div className={cx('notification-buttons')}>
-              <HorizontalGroup spacing={'md'} justify={'flex-end'}>
-                <Button
-                  variant="secondary"
-                  onClick={() => onSendTestNotification()}
-                  disabled={isAttemptingTestNotification}
-                >
-                  Send Test Push notification
-                </Button>
-                <Button
-                  variant="destructive"
-                  onClick={() => onSendTestNotification(true)}
-                  disabled={isAttemptingTestNotification}
-                >
-                  Send Critical Test Push notification
-                </Button>
-              </HorizontalGroup>
-            </div>
-          )}
+        {store.hasFeature(AppFeature.MobileTestPush) && mobileAppIsCurrentlyConnected && isCurrentUser && (
+          <div className={cx('notification-buttons')}>
+            <HorizontalGroup spacing={'md'} justify={'flex-end'}>
+              <Button
+                variant="secondary"
+                onClick={() => onSendTestNotification()}
+                disabled={isAttemptingTestNotification}
+              >
+                Send Test Push notification
+              </Button>
+              <Button
+                variant="destructive"
+                onClick={() => onSendTestNotification(true)}
+                disabled={isAttemptingTestNotification}
+              >
+                Send Critical Test Push notification
+              </Button>
+            </HorizontalGroup>
+          </div>
+        )}
       </VerticalGroup>
     </WithPermissionControlDisplay>
   );

grafana-plugin/src/state/features.ts

@@ -6,4 +6,5 @@ export enum AppFeature {
   CloudConnection = 'grafana_cloud_connection',
   WebSchedules = 'web_schedules',
   Webhooks2 = 'webhooks2',
+  MobileTestPush = 'mobile_test_push',
 }