Merge remote-tracking branch 'origin/main' into auto-updater

kubeshop · Jul 5, 2023 · 3962858 · 3962858
2 parents b98cacf + 393c23a
commit 3962858
Show file tree

Hide file tree

Showing 215 changed files with 5,788 additions and 2,217 deletions.
diff --git a/.github/workflows/monokle-build-nightly.yml b/.github/workflows/monokle-build-nightly.yml
@@ -99,6 +99,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         id: package
@@ -241,6 +242,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         id: package
@@ -367,6 +369,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         id: package

diff --git a/.github/workflows/monokle-publish-downloads.yml b/.github/workflows/monokle-publish-downloads.yml
@@ -93,6 +93,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |
@@ -221,6 +222,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |
@@ -321,6 +323,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |

diff --git a/.github/workflows/monokle-publish-test.yml b/.github/workflows/monokle-publish-test.yml
@@ -91,6 +91,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |
@@ -218,6 +219,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |
@@ -317,6 +319,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |

diff --git a/.github/workflows/monokle-publish-updater.yml b/.github/workflows/monokle-publish-updater.yml
@@ -92,6 +92,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |
@@ -220,6 +221,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |
@@ -320,6 +322,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         run: |

diff --git a/.github/workflows/monokle-publish.yml b/.github/workflows/monokle-publish.yml
@@ -87,6 +87,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         id: build
@@ -206,6 +207,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         id: package
@@ -298,6 +300,7 @@ jobs:
           MONOKLE_INSTALLS_URL: ${{ secrets.MONOKLE_INSTALLS_URL }}
           SEGMENT_API_KEY: ${{ secrets.SEGMENT_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          REACT_APP_NEWS_FEED_URL: ${{ secrets.REACT_APP_NEWS_FEED_URL }}
 
       - name: Package
         id: package

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.3.0](https://github.com/kubeshop/monokle/compare/v2.2.1-nightly-2023-07-05.0...v2.3.0) (2023-07-05)
+
 ## [2.2.0](https://github.com/kubeshop/monokle/compare/v2.1.2-nightly-2023-06-07.0...v2.2.0) (2023-06-07)
 
 

diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
@@ -18,8 +18,8 @@ const config = {
   url: `https://${organizationName}.github.io`,
   // Set the /<baseUrl>/ pathname under which your site is served
   // For GitHub pages deployment, it is often '/<projectName>/'
-  baseUrl: `/${projectName}/`,
-
+  // baseUrl: `/${projectName}/`,
+  baseUrl: `/`,
   // GitHub pages deployment config.
   // If you aren't using GitHub pages, you don't need these.
   organizationName, // Usually your GitHub org/user name.

diff --git a/electron/app/ipc/ipcListeners.ts b/electron/app/ipc/ipcListeners.ts
@@ -32,6 +32,7 @@ import type {FileExplorerOptions, FileOptions} from '@shared/models/fileExplorer
 import {AnyPlugin} from '@shared/models/plugin';
 import {DISABLED_TELEMETRY} from '@shared/models/telemetry';
 import {AnyTemplate, InterpolateTemplateOptions, TemplatePack} from '@shared/models/template';
+import electronStore from '@shared/utils/electronStore';
 import {disableSegment, enableSegment, getSegmentClient} from '@shared/utils/segment';
 
 import autoUpdater from '../autoUpdater';
@@ -55,7 +56,7 @@ import {
   updateTemplate,
   updateTemplatePack,
 } from '../services/templateService';
-import {askActionConfirmation} from '../utils';
+import {askActionConfirmation, calculateMinutesPassed} from '../utils';
 import {dispatchToAllWindows} from './ipcMainRedux';
 
 const userDataDir = app.getPath('userData');
@@ -103,7 +104,18 @@ const killTerminal = (id: string) => {
 ipcMain.on('track-event', async (event: any, {eventName, payload}: any) => {
   const segmentClient = getSegmentClient();
   if (segmentClient) {
+    const minutesPassedSinceFirstTimeRun = calculateMinutesPassed(electronStore.get('main.firstTimeRunTimestamp'));
+
     const properties: any = {appVersion: app.getVersion(), ...payload};
+
+    if (minutesPassedSinceFirstTimeRun >= 0 && minutesPassedSinceFirstTimeRun <= 10) {
+      properties['ftu10m'] = 1;
+    } else if (minutesPassedSinceFirstTimeRun > 10 && minutesPassedSinceFirstTimeRun <= 30) {
+      properties['ftu30m'] = 1;
+    } else if (minutesPassedSinceFirstTimeRun > 30 && minutesPassedSinceFirstTimeRun <= 60) {
+      properties['ftu60m'] = 1;
+    }
+
     segmentClient.track({
       event: eventName,
       userId: machineId,

diff --git a/electron/app/utils.ts b/electron/app/utils.ts
@@ -158,6 +158,7 @@ export const initTelemetry = (deviceID: string, disableEventTracking: boolean, a
       },
     });
     electronStore.set('main.deviceID', deviceID);
+    electronStore.set('main.firstTimeRunTimestamp', Date.now());
   }
 };
 
@@ -248,3 +249,15 @@ export const checkMissingDependencies = (dependencies: Array<string>): Array<str
     }
   });
 };
+
+// will calculate the minutes that passed from the first time the app was run
+
+export function calculateMinutesPassed(firstTimeRunTimestamp: number): number {
+  if (!firstTimeRunTimestamp) {
+    return -1;
+  }
+
+  const currentTimeInMillis = Date.now();
+  const minutesPassed = Math.floor((currentTimeInMillis - firstTimeRunTimestamp) / (1000 * 60));
+  return minutesPassed;
+}