Merge branch 'master' into feat/revert-removing-accounting

.github/workflows/build-and-push-docker-image.yml

@@ -30,11 +30,20 @@ jobs:
           envkey_VUE_APP_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_PROD }}
           envkey_VUE_APP_API_ENDPOINT: "https://api.hawk.so"
 
+      - name: Make prod envfile
+        if: endsWith(github.ref, '/prod-ru')
+        uses: SpicyPizza/create-envfile@v1
+        with:
+          envkey_VUE_APP_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_PROD }}
+          envkey_VUE_APP_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_PROD }}
+          envkey_VUE_APP_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_PROD }}
+          envkey_VUE_APP_API_ENDPOINT: "https://api.hawk-tracker.ru"
+
       - name: Build and push docker image
         uses: docker/build-push-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: ${{ env.DOCKER_REPO }}
           tag_with_ref: true
-          push: ${{ endsWith(github.ref, '/stage') || endsWith(github.ref, '/prod') }}
+          push: ${{ endsWith(github.ref, '/stage') || endsWith(github.ref, '/prod') || endsWith(github.ref, '/prod-ru') }}

cypress/integration/repetitionAssembler.test.ts

@@ -117,6 +117,68 @@ describe('Merging of the repetition and the original event payloads at the overv
     expect(result).to.deep.equal(assembledRepetition);
   });
 
+  it('(array of objects) should replace null in original if the repetition event has value', () => {
+    originalEvent = {
+      ...originalEvent,
+      backtrace: [
+        {
+          ...baseEvent.backtrace[0],
+          sourceCode: null
+        }
+      ],
+    };
+
+    repetitionEvent = {
+      ...repetitionEvent,
+      backtrace: [
+        {
+          ...baseEvent.backtrace[0],
+          sourceCode: [
+            {
+              content: '111',
+              line: 4
+            },
+            {
+              content: '222',
+              line: 5
+            },
+            {
+              content: '333',
+              line: 6
+            }
+          ]
+        }
+      ],
+    };
+
+    assembledRepetition = {
+      ...baseEvent,
+      backtrace: [
+        {
+          ...baseEvent.backtrace[0],
+          sourceCode: [
+            {
+              content: '111',
+              line: 4
+            },
+            {
+              content: '222',
+              line: 5
+            },
+            {
+              content: '333',
+              line: 6
+            }
+          ]
+        }
+      ],
+    };
+
+    const result = repetitionAssembler(originalEvent, repetitionEvent);
+
+    expect(result).to.deep.equal(assembledRepetition);
+  });
+
   it('should take the repetition field value instead of the original event value in the array of objects', () => {
     originalEvent = {
       ...originalEvent,
@@ -229,4 +291,4 @@ describe('Merging of the repetition and the original event payloads at the overv
 
     expect(result).to.deep.equal(assembledRepetition);
   });
-});
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.so",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/components/event/Overview.vue

@@ -26,8 +26,23 @@
         v-if="getIntegrationAddons('vue')"
         class="event-overview__section"
         :addons="getIntegrationAddons('vue')"
+        icon="vue"
         title="Vue"
       />
+      <DetailsAddons
+        v-if="getIntegrationAddons('nuxt')"
+        class="event-overview__section"
+        :addons="getIntegrationAddons('nuxt')"
+        icon="nuxt"
+        title="Nuxt"
+      />
+      <DetailsAddons
+        v-if="getIntegrationAddons('flask')"
+        class="event-overview__section"
+        :addons="getIntegrationAddons('flask')"
+        icon="flask"
+        title="Flask"
+      />
       <DetailsAddons
         v-if="hasContext"
         class="event-overview__section"
@@ -112,7 +127,7 @@ export default Vue.extend({
         return null;
       }
 
-      const integrationToFilter = [ 'vue' ];
+      const integrationToFilter = [ 'vue', 'nuxt', 'flask' ];
       const filteredAddons = {};
 
       Object.entries(this.event.payload.addons).forEach(([name, value]) => {

src/components/event/details/DetailsAddons.vue

@@ -1,10 +1,10 @@
 <template>
   <DetailsBase>
     <template #header>
-      {{ title }}
-      <template v-if="title === 'Vue' ">
-        <Icon symbol="vue" />
+      <template v-if="icon">
+        <Icon :symbol="icon" />
       </template>
+      {{ title }}
     </template>
     <template #content>
       <div
@@ -90,6 +90,14 @@ export default Vue.extend({
       type: Object as PropType<EventAddons>,
       required: true,
     },
+
+    /**
+     * Integration framework logo
+     */
+    icon: {
+      type: String,
+      default: '',
+    }
   },
   computed: {
   },
@@ -101,7 +109,7 @@ export default Vue.extend({
      * @param key - addon key
      */
     isHTML(key: string): boolean {
-      return key === 'component' && this.title === 'Vue';
+      return key.toLowerCase() === 'component' && ['Vue', 'Nuxt'].includes(this.title);
     },
   },
 });

src/components/event/details/DetailsBase.vue

@@ -49,12 +49,13 @@ export default {
       font-size: 12px;
       letter-spacing: 0.15px;
       text-transform: uppercase;
+      display: flex;
+      align-items: center;
+      gap: 4px;
 
       .icon {
-        width: 16px;
-        height: 13px;
-        margin-top: -2px;
-        margin-left: 5px;
+        width: 20px;
+        height: 20px;
         vertical-align: middle;
       }
     }

src/types/events.ts

@@ -252,7 +252,7 @@ export interface HawkEventBacktraceFrame {
   /**
    * Part of source code file near the called line
    */
-  sourceCode: BacktraceSourceCode[];
+  sourceCode: BacktraceSourceCode[] | null;
 
   /**
    * Function name extracted from current stack frame

src/utils.ts

@@ -193,8 +193,19 @@ export function repetitionAssembler(originalEvent: HawkEventPayload, repetition:
       return originalParam;
     }
 
-    if (typeof repetitionParam === 'object' && typeof originalEvent === 'object') {
-      return repetitionAssembler(originalParam, repetitionParam);
+
+    if (typeof repetitionParam === 'object' && typeof originalParam === 'object') {
+      /**
+       * If original event has null but repetition has some value, we need to return repetition value
+       */
+      if (originalParam === null) {
+        return repetitionParam;
+      /**
+       * Otherwise, we need to recursively merge original and repetition values
+       */
+      } else {
+        return repetitionAssembler(originalParam, repetitionParam);
+      }
     }
 
     return repetitionParam;