Merge branch 'next' into eslint-ecma-change

Author: kanwarujjaval

CHANGELOG.md

@@ -1,3 +1,15 @@
+## Version 24.10.3
+Fixes:
+- [dashboards] Fixing issue where dashboard widgets go into single column
+
+Security:
+- Bump puppeteer from 17.1.3 to 23.8.0
+- Bump express from 4.21.0 to 4.21.1 
+- Bump sass from 1.79.4 to 1.81.0
+- Bump express-session from 1.18.0 to 1.18.1
+- Bump cross-spawn from 7.0.3 to 7.0.6 in /ui-tests
+- Bump cross-spawn from 7.0.3 to 7.0.6 in /plugins/hooks
+
 ## Version 24.10.2
 Fixes:
 - [core] Correct aggregated collection cleanup on event omitting

Dockerfile-api

@@ -17,8 +17,9 @@ ENV COUNTLY_CONTAINER="api" \
 	COUNTLY_CONFIG_API_API_WORKERS="1" \
 	COUNTLY_CONFIG_API_API_HOST="0.0.0.0" \
 	NODE_OPTIONS="--max-old-space-size=2048" \
-	TINI_VERSION="0.18.0"
-
+	TINI_VERSION="0.18.0"\
+	PUPPETEER_CACHE_DIR=/opt/countly/.cache/puppeteer
+	
 WORKDIR /opt/countly
 COPY . .
 
@@ -58,7 +59,7 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
 	# cleanup & chown
 	npm remove -y --no-save mocha nyc should supertest && \
 	apt-get remove -y git gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 && \
-	apt-get install -y libgbm-dev libgbm1 gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils && \
+	apt-get install -y libgbm-dev libgbm1 gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils && \
 	apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
 	rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* /root/.npm && \
 	\
@@ -75,4 +76,4 @@ USER 1001:0
 
 ENTRYPOINT ["/usr/bin/tini", "-v", "--"]
 
-CMD ["/opt/countly/bin/docker/cmd.sh"]
+CMD ["/opt/countly/bin/docker/cmd.sh"]

api/utils/render.js

@@ -62,6 +62,11 @@ exports.renderView = function(options, cb) {
 
             var settings = {
                 headless: true,
+                env: {
+                    //https://github.com/hardkoded/puppeteer-sharp/issues/2633
+                    XDG_CONFIG_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium"),
+                    XDG_CACHE_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium")
+                },
                 args: ['--no-sandbox', '--disable-setuid-sandbox'],
                 ignoreHTTPSErrors: true,
                 userDataDir: pathModule.resolve(__dirname, "../../dump/chrome")
@@ -118,8 +123,11 @@ exports.renderView = function(options, cb) {
                 };
 
                 page.setDefaultNavigationTimeout(updatedTimeout);
-
-                await page.goto(host + '/login/token/' + token + '?ssr=true');
+                const resp = await page.goto(host + '/login/token/' + token + '?ssr=true');
+                const status = resp?.status();
+                if (status !== 200) {
+                    throw new Error(`Failed to open login page. Status: ${status}`);
+                }
 
                 await page.waitForSelector('countly', {timeout: updatedTimeout});
 

bin/countly.install_rhel.sh

@@ -55,7 +55,7 @@ else
 fi
 
 #Install dependancies required by the puppeteer
-sudo dnf install -y alsa-lib.x86_64 atk.x86_64 cups-libs.x86_64 gtk3.x86_64 libXcomposite.x86_64 libXcursor.x86_64 libXdamage.x86_64 libXext.x86_64 libXi.x86_64 libXrandr.x86_64 GConf2.x86_64 libXScrnSaver.x86_64 libXtst.x86_64 pango.x86_64 xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-cyrillic xorg-x11-fonts-misc xorg-x11-fonts-Type1 xorg-x11-utils
+sudo dnf install -y alsa-lib.x86_64 atk.x86_64 cups-libs.x86_64 gtk3.x86_64 libXcomposite.x86_64 libXcursor.x86_64 libXdamage.x86_64 libXext.x86_64 libXi.x86_64 libXrandr.x86_64 GConf2.x86_64 libXScrnSaver.x86_64 libXtst.x86_64 pango.x86_64 xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-cyrillic xorg-x11-fonts-misc xorg-x11-fonts-Type1 xorg-x11-utils libdrm libgbm at-spi2-atk libxkbcommon
 #Install nss after installing above dependencies
 sudo dnf update -y nss
 

bin/scripts/fix-data/regenerate_aggregated_data.js

@@ -40,6 +40,12 @@ Promise.all([pluginManager.dbConnection("countly"), pluginManager.dbConnection("
             query._id = {$in: appList.map(app_id=>common.db.ObjectID(app_id))};
         }
         const apps = await countlyDb.collection("apps").find(query, {_id: 1, name: 1, timezone: 1}).toArray();
+
+        await new Promise((resolve)=>{
+            common.plugins.loadConfigs(countlyDb, function() {
+                resolve();
+            });
+        });
         if (!apps || !apps.length) {
             return close();
         }

frontend/express/app.js

@@ -661,7 +661,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
             favicon: "images/favicon.png",
             documentationLink: convertLink(versionInfo.documentationLink, "https://support.count.ly/hc/en-us/categories/360002373332-Knowledge-Base"),
             helpCenterLink: convertLink(versionInfo.helpCenterLink, "https://support.count.ly/hc/en-us"),
-            featureRequestLink: convertLink(versionInfo.featureRequestLink, "https://support.count.ly/hc/en-us/community/topics/360001464272-Feature-Requests"),
+            featureRequestLink: convertLink(versionInfo.featureRequestLink, "https://discord.com/channels/1088398296789299280/1088721958218248243"),
             feedbackLink: convertLink(versionInfo.feedbackLink, "https://count.ly/legal/privacy-policy"),
         };
         plugins.loadConfigs(countlyDb, function() {

frontend/express/public/javascripts/countly/vue/templates/sidebar/users-menu.html

@@ -157,7 +157,7 @@
                         <i class="ion-android-textsms"></i>
                     </div>
                     <div class="bu-level-item">
-                        <a href="https://support.count.ly/hc/en-us/community/topics/360001464272-Feature-Requests" target="_blank">
+                        <a href="https://discord.com/channels/1088398296789299280/1088721958218248243" target="_blank">
                             <div>{{i18nM('common.feature-request')}}</div>
                         </a>
                     </div>