npm - @zextras/carbonio-shell-ui - Versions diffs - 5.1.0 → 5.2.0 - Mend

@zextras/carbonio-shell-ui 5.1.0 → 5.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/dist/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,20 @@
 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.
+## [5.2.0](https://github.com/zextras/carbonio-shell-ui/compare/v5.1.0...v5.2.0) (2024-03-21)
+### Features
+* implement matomo tracker ([8d0594b](https://github.com/zextras/carbonio-shell-ui/commit/8d0594be791580126dc340d433ac623ac78180ea)), closes [#388](https://github.com/zextras/carbonio-shell-ui/issues/388)
+### Bug Fixes
+* prevent overwriting display of main route if focus mode is true ([f0cb48f](https://github.com/zextras/carbonio-shell-ui/commit/f0cb48faa3013a40825cb42dab124ebb1164c848)), closes [#382](https://github.com/zextras/carbonio-shell-ui/issues/382)
+* reset primary color when is no more received in configs ([aecb64e](https://github.com/zextras/carbonio-shell-ui/commit/aecb64e6571e80761000c34beae62405531ab4d7)), closes [#384](https://github.com/zextras/carbonio-shell-ui/issues/384)
+* show quota when used quota is 0 ([06617d8](https://github.com/zextras/carbonio-shell-ui/commit/06617d8ecb2872b3dfcc2dd486694d1d80143a03)), closes [#381](https://github.com/zextras/carbonio-shell-ui/issues/381)
 ## [5.1.0](https://github.com/zextras/carbonio-shell-ui/compare/v5.0.3...v5.1.0) (2024-01-10)

package/dist/commit CHANGED Viewed

	@@ -1 +1 @@
1	- ~~c457e070b67de5d09e14c596f0fd488fc484de2f~~
1	+ 016f4afd2f000494c7fbdfcaf11d5bf3e8648975

package/dist/component.json CHANGED Viewed

@@ -1,9 +1,9 @@
 {
 	"name": "carbonio-shell-ui",
-	"js_entrypoint": "/static/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f/zapp-shell.bundle.js",
+	"js_entrypoint": "/static/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975/zapp-shell.bundle.js",
 	"description": "The Zextras Carbonio web client",
-	"version": "5.1.0",
-	"commit": "c457e070b67de5d09e14c596f0fd488fc484de2f",
+	"version": "5.2.0",
+	"commit": "016f4afd2f000494c7fbdfcaf11d5bf3e8648975",
 	"priority": -1,
 	"type": "shell",
 	"attrKey": "",

package/dist/index.html CHANGED Viewed

@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<meta http-equiv="Cache-Control" content="no-cache" />
 	<meta http-equiv="Pragma" content="no-cache" />
 	<meta http-equiv="Expires" content="0" />
-<script defer src="/static/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f/zapp-shell.bundle.js"></script><link href="/static/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f/style.0e15c04f.css" rel="stylesheet"></head>
+<script defer src="/static/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975/zapp-shell.bundle.js"></script><link href="/static/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975/style.a3b78aca.css" rel="stylesheet"></head>
 <body>
 	<div id="app"></div>

package/dist/package/PKGBUILD CHANGED Viewed

@@ -6,7 +6,7 @@
 # upgrade, but so far there is nothing we can do about it (we would need to coordinate multiple nginx).
 pkgname="carbonio-shell-ui"
-pkgver="5.1.0"
+pkgver="5.2.0"
 pkgrel="1"
 pkgdesc="The Zextras Carbonio web client"
 maintainer="Zextras (packages@zextras.com)"
@@ -23,11 +23,11 @@ depends=(
 package() {
   cd "${srcdir}"
-  mkdir -p "${pkgdir}/opt/zextras/web/iris/${pkgname}/c457e070b67de5d09e14c596f0fd488fc484de2f"
-  cp -a  ../../dist/* "${pkgdir}/opt/zextras/web/iris/${pkgname}/c457e070b67de5d09e14c596f0fd488fc484de2f"
-  chown root:root -R "${pkgdir}/opt/zextras/web/iris/${pkgname}/c457e070b67de5d09e14c596f0fd488fc484de2f"
-  chmod 644 -R "${pkgdir}/opt/zextras/web/iris/${pkgname}/c457e070b67de5d09e14c596f0fd488fc484de2f"
-  find "${pkgdir}/opt/zextras/web/iris/${pkgname}/c457e070b67de5d09e14c596f0fd488fc484de2f" -type d -exec chmod a+x "{}" \;
+  mkdir -p "${pkgdir}/opt/zextras/web/iris/${pkgname}/016f4afd2f000494c7fbdfcaf11d5bf3e8648975"
+  cp -a  ../../dist/* "${pkgdir}/opt/zextras/web/iris/${pkgname}/016f4afd2f000494c7fbdfcaf11d5bf3e8648975"
+  chown root:root -R "${pkgdir}/opt/zextras/web/iris/${pkgname}/016f4afd2f000494c7fbdfcaf11d5bf3e8648975"
+  chmod 644 -R "${pkgdir}/opt/zextras/web/iris/${pkgname}/016f4afd2f000494c7fbdfcaf11d5bf3e8648975"
+  find "${pkgdir}/opt/zextras/web/iris/${pkgname}/016f4afd2f000494c7fbdfcaf11d5bf3e8648975" -type d -exec chmod a+x "{}" \;
 }
 postinst() {
@@ -35,7 +35,7 @@ postinst() {
   mkdir -p "/opt/zextras/web/iris/carbonio-shell-ui/current"
   # not every package has a index.html
-  cd "/opt/zextras/web/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f"
+  cd "/opt/zextras/web/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975"
   find . -name "*.html" -exec cp --parents "{}" /opt/zextras/web/iris/carbonio-shell-ui/current/ \;
   # re-generate the component list, for every component

package/dist/{src_boot_bootstrapper_tsx-node_modules_moment_locale_sync_recursive_.791d4085.chunk.js → src_boot_bootstrapper_tsx-node_modules_moment_locale_sync_recursive_.1dcb614b.chunk.js} RENAMED Viewed

@@ -522,6 +522,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _store_app__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../store/app */ "./src/store/app/index.ts");
 /* harmony import */ var _ui_extras_app_link__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../ui-extras/app-link */ "./src/ui-extras/app-link.tsx");
 /* harmony import */ var _ui_extras_spinner__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../ui-extras/spinner */ "./src/ui-extras/spinner.tsx");
+/* harmony import */ var _tracker__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../tracker */ "./src/boot/tracker.ts");
 /*
  * SPDX-FileCopyrightText: 2021 Zextras <https://www.zextras.com>
  *
@@ -538,6 +539,7 @@ __webpack_require__.r(__webpack_exports__);
 const _scripts = {};
 let _scriptId = 0;
 function loadApp(appPkg) {
@@ -551,7 +553,8 @@ function loadApp(appPkg) {
           SettingsHeader: _settings_components_settings_header__WEBPACK_IMPORTED_MODULE_6__["default"],
           ...(0,_app_loader_setters__WEBPACK_IMPORTED_MODULE_3__.getAppSetters)(appPkg),
           ...(0,_app_loader_functions__WEBPACK_IMPORTED_MODULE_2__.getAppFunctions)(appPkg),
-          ..._constants__WEBPACK_IMPORTED_MODULE_4__
+          ..._constants__WEBPACK_IMPORTED_MODULE_4__,
+          Tracker: _tracker__WEBPACK_IMPORTED_MODULE_10__.Tracker
         };
       }
       window.__ZAPP_HMR_EXPORT__[appPkg.name] = appComponent => {
@@ -953,6 +956,43 @@ const Loader = () => {
 /***/ }),
+/***/ "./src/boot/matomo.ts":
+/*!****************************!*\
+  !*** ./src/boot/matomo.ts ***!
+  \****************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   getMatomoTracker: () => (/* binding */ getMatomoTracker),
+/* harmony export */   initMatomo: () => (/* binding */ initMatomo)
+/* harmony export */ });
+/*
+ * SPDX-FileCopyrightText: 2024 Zextras <https://www.zextras.com>
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+function initMatomo(url) {
+  const matomoScriptId = 'matomo-script';
+  if (document.getElementById(matomoScriptId)) {
+    return;
+  }
+  const matomoScript = document.createElement('script');
+  const scriptElement = document.getElementsByTagName('script')[0];
+  matomoScript.type = 'text/javascript';
+  matomoScript.async = true;
+  matomoScript.src = `${url}matomo.js`;
+  matomoScript.id = matomoScriptId;
+  scriptElement.parentNode?.insertBefore(matomoScript, scriptElement);
+}
+function getMatomoTracker(url, siteId) {
+  return Matomo.getTracker(`${url}matomo.php`, siteId);
+}
+/***/ }),
 /***/ "./src/boot/shell-i18n-provider.tsx":
 /*!******************************************!*\
   !*** ./src/boot/shell-i18n-provider.tsx ***!
@@ -1162,6 +1202,69 @@ const ThemeProvider = _ref3 => {
 /***/ }),
+/***/ "./src/boot/tracker.ts":
+/*!*****************************!*\
+  !*** ./src/boot/tracker.ts ***!
+  \*****************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Tracker: () => (/* binding */ Tracker)
+/* harmony export */ });
+/* harmony import */ var _matomo__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./matomo */ "./src/boot/matomo.ts");
+/*
+ * SPDX-FileCopyrightText: 2024 Zextras <https://www.zextras.com>
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+class Tracker {
+  static URL = 'https://analytics.zextras.tools/';
+  static isEnabled = false;
+  constructor(siteId) {
+    this.siteId = siteId;
+    if (Tracker.isEnabled) {
+      this.matomoTracker = (0,_matomo__WEBPACK_IMPORTED_MODULE_0__.getMatomoTracker)(Tracker.URL, siteId);
+    } else {
+      this.matomoTracker = null;
+    }
+  }
+  static enableTracker(isEnabled) {
+    if (isEnabled) {
+      (0,_matomo__WEBPACK_IMPORTED_MODULE_0__.initMatomo)(Tracker.URL);
+    }
+    Tracker.isEnabled = isEnabled;
+  }
+  trackPageView(customTitle) {
+    const tracker = this.getMatomoTrackerInstance();
+    tracker?.setCustomUrl(window.location.href);
+    tracker?.trackPageView(customTitle);
+  }
+  trackEvent(category, action, name, value) {
+    const tracker = this.getMatomoTrackerInstance();
+    tracker?.setCustomUrl(window.location.href);
+    tracker?.trackEvent(category, action, name, value);
+  }
+  getMatomoTrackerInstance() {
+    if (!Tracker.isEnabled) {
+      return null;
+    }
+    if (this.matomoTracker === null) {
+      try {
+        this.matomoTracker = (0,_matomo__WEBPACK_IMPORTED_MODULE_0__.getMatomoTracker)(Tracker.URL, this.siteId);
+      } catch (e) {
+        console.warn('Matomo is not initialized yet: ', e);
+      }
+    }
+    return this.matomoTracker;
+  }
+}
+/***/ }),
 /***/ "./src/boot/use-get-primary-color.tsx":
 /*!********************************************!*\
   !*** ./src/boot/use-get-primary-color.tsx ***!
@@ -1175,8 +1278,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _zextras_carbonio_design_system__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @zextras/carbonio-design-system */ "./node_modules/@zextras/carbonio-design-system/dist/zapp-ui.bundle.js");
-/* harmony import */ var _zextras_carbonio_design_system__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_zextras_carbonio_design_system__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js");
 /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../constants */ "./src/constants/index.ts");
@@ -1194,18 +1295,17 @@ __webpack_require__.r(__webpack_exports__);
 function useGetPrimaryColor() {
   const [localStorageLastPrimary, setLocalStorageLastPrimary] = (0,_shell_hooks_useLocalStorage__WEBPACK_IMPORTED_MODULE_4__.useLocalStorage)(_constants__WEBPACK_IMPORTED_MODULE_2__.LOCAL_STORAGE_LAST_PRIMARY_KEY, undefined);
   const {
     carbonioWebUiPrimaryColor,
-    carbonioWebUiDarkPrimaryColor
+    carbonioWebUiDarkPrimaryColor,
+    loaded
   } = (0,_store_login_store__WEBPACK_IMPORTED_MODULE_5__.useLoginConfigStore)();
   const {
     darkModeEnabled,
     darkReaderStatus
   } = (0,_dark_mode_use_dark_mode__WEBPACK_IMPORTED_MODULE_3__.useDarkMode)();
-  const theme = (0,_zextras_carbonio_design_system__WEBPACK_IMPORTED_MODULE_6__.useTheme)();
   const primaryColor = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(() => {
     if (darkReaderStatus !== undefined && (carbonioWebUiPrimaryColor || carbonioWebUiDarkPrimaryColor)) {
       if (darkModeEnabled) {
@@ -1213,14 +1313,11 @@ function useGetPrimaryColor() {
       }
       return carbonioWebUiPrimaryColor || carbonioWebUiDarkPrimaryColor;
     }
-    if (localStorageLastPrimary && (0,lodash__WEBPACK_IMPORTED_MODULE_1__.size)(localStorageLastPrimary) > 0) {
+    if (localStorageLastPrimary && (0,lodash__WEBPACK_IMPORTED_MODULE_1__.size)(localStorageLastPrimary) > 0 && !loaded) {
       return darkModeEnabled && (localStorageLastPrimary.dark || localStorageLastPrimary.light) || localStorageLastPrimary.light || localStorageLastPrimary.dark;
     }
-    if (theme) {
-      return theme.palette.primary.regular;
-    }
     return undefined;
-  }, [carbonioWebUiDarkPrimaryColor, carbonioWebUiPrimaryColor, darkModeEnabled, darkReaderStatus, localStorageLastPrimary, theme]);
+  }, [carbonioWebUiDarkPrimaryColor, carbonioWebUiPrimaryColor, darkModeEnabled, darkReaderStatus, loaded, localStorageLastPrimary]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
     if (darkReaderStatus !== undefined) {
       setLocalStorageLastPrimary(prevState => ({
@@ -5615,7 +5712,7 @@ const UserQuota = _ref => {
   const used = (0,_store_account_store__WEBPACK_IMPORTED_MODULE_2__.useAccountStore)(s => s.usedQuota);
   const quota = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(() => {
     const userQuota = Number(settings?.attrs?.zimbraMailQuota);
-    if (used && userQuota && userQuota > 0) {
+    if (userQuota > 0) {
       return Math.round(used / userQuota * 100);
     }
     return -1;
@@ -5628,7 +5725,7 @@ const UserQuota = _ref => {
   }, [quota]);
   const description = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(() => {
     switch (true) {
-      case !quota || quota < 0:
+      case quota < 0:
         return t('user_quota.unlimited', 'You have unlimited space available');
       case quota === 100:
         return t('user_quota.space_full', 'It seems that all available space is full');
@@ -10367,7 +10464,7 @@ const useAppStore = (0,zustand__WEBPACK_IMPORTED_MODULE_4__.create)()((set, get)
             component: routeData.appView
           });
         }
-        if (routeData.app && state.apps[routeData.app]) {
+        if (routeData.app && state.apps[routeData.app] && routeData.focusMode !== true) {
           state.apps[routeData.app].display = routeData.label;
         }
       }));
@@ -11355,7 +11452,7 @@ const defaultI18nInitOptions = {
     console.warn(`Missing translation with key '${key}'`);
   },
   backend: {
-    loadPath: `${"/static/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f/"}/i18n/{{lng}}.json`
+    loadPath: `${"/static/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975/"}/i18n/{{lng}}.json`
   }
 };
 const useI18nStore = (0,zustand__WEBPACK_IMPORTED_MODULE_6__.create)()(set => ({
@@ -11389,7 +11486,7 @@ const useI18nStore = (0,zustand__WEBPACK_IMPORTED_MODULE_6__.create)()(set => ({
             ...defaultI18nInitOptions,
             lng: locale,
             backend: {
-              loadPath: app.name === _constants__WEBPACK_IMPORTED_MODULE_4__.SHELL_APP_ID ? `${"/static/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f/"}/i18n/{{lng}}.json` : `${(0,lodash__WEBPACK_IMPORTED_MODULE_2__.dropRight)(app.js_entrypoint.split('/')).join('/')}/i18n/{{lng}}.json`
+              loadPath: app.name === _constants__WEBPACK_IMPORTED_MODULE_4__.SHELL_APP_ID ? `${"/static/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975/"}/i18n/{{lng}}.json` : `${(0,lodash__WEBPACK_IMPORTED_MODULE_2__.dropRight)(app.js_entrypoint.split('/')).join('/')}/i18n/{{lng}}.json`
             }
           });
           // eslint-disable-next-line no-param-reassign
@@ -11586,8 +11683,8 @@ const Composer = _ref => {
     });
   }, [inlineLabel, onFileClick, onFileSelect, t]);
   const editorInitConfig = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(() => ({
-    content_css: `${"/static/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f/"}/tinymce/skins/content/default/content.css`,
-    language_url: `${"/static/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f/"}tinymce/langs/${language}.js`,
+    content_css: `${"/static/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975/"}/tinymce/skins/content/default/content.css`,
+    language_url: `${"/static/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975/"}tinymce/langs/${language}.js`,
     language,
     setup: setupCallback,
     min_height: 350,
@@ -12109,7 +12206,7 @@ const useLoginConfigStore = (0,zustand__WEBPACK_IMPORTED_MODULE_0__.create)()(()
   // setup defaults for fields which does not depend on dark mode
   carbonioWebUiTitle: 'Carbonio Client',
   // default to png because this icon is used also in notification, and svg are not supported there
-  carbonioWebUiFavicon: `${"/static/iris/carbonio-shell-ui/c457e070b67de5d09e14c596f0fd488fc484de2f/"}favicon.png`
+  carbonioWebUiFavicon: `${"/static/iris/carbonio-shell-ui/016f4afd2f000494c7fbdfcaf11d5bf3e8648975/"}favicon.png`
 }));
 /***/ }),
@@ -13505,4 +13602,4 @@ module.exports = __webpack_require__.p + "20d012c938e8d0dcc703.mp3";
 /***/ })
 }]);
-//# sourceMappingURL=src_boot_bootstrapper_tsx-node_modules_moment_locale_sync_recursive_.791d4085.chunk.js.map
+//# sourceMappingURL=src_boot_bootstrapper_tsx-node_modules_moment_locale_sync_recursive_.1dcb614b.chunk.js.map