saby-customizer 0.0.6 → 0.0.8

package/features/doc-copy-link.js

@@ -1,4 +1,4 @@
-import { toolbar } from 'saby-customizer/lib.js'
+import { toolbar, sendCloudStatistic } from 'saby-customizer/lib.js'
 import { octicons } from 'saby-customizer/octicons.js'
 import { GitBranchCardData } from 'saby-customizer/features/git-branch.js'
 
@@ -11,6 +11,7 @@ toolbar.addButton({
   onclick: card => {
     const gitCard = new GitBranchCardData(card.data)
 
+    sendCloudStatistic('Тулбар задачи', 'Копирование ссылки')
     gitCard.restoreFromHistory()
       .then(() => gitCard.copyLink())
       .catch(console.error)

package/features/git-branch.js

@@ -1,5 +1,5 @@
 import { oom } from '@notml/core'
-import { toolbar, PopupDialog, getListOfOpenCards, snackbar, context, db } from 'saby-customizer/lib.js'
+import { toolbar, PopupDialog, getListOfOpenCards, snackbar, context, db, sendCloudStatistic } from 'saby-customizer/lib.js'
 import { octicons } from 'saby-customizer/octicons.js'
 
 
@@ -110,6 +110,7 @@ export class GitBranchCardData {
 
   /** Копирование ссылки на задачу */
   copyLink() {
+    sendCloudStatistic('Типы задач', this.name)
     navigator.clipboard.writeText(this.raw.url)
     snackbar.show(`Скопирована ссылка: ${this.raw.url}`)
   }
@@ -118,6 +119,7 @@ export class GitBranchCardData {
   async copyBranchName() {
     const branchName = await this.getBranchName()
 
+    sendCloudStatistic('Типы задач', this.name)
     navigator.clipboard.writeText(branchName)
     snackbar.show(`Скопировано имя ветки: ${branchName}`)
 
@@ -132,6 +134,7 @@ export class GitBranchCardData {
       this.raw.url + '\n' +
       this.raw.description
 
+    sendCloudStatistic('Типы задач', this.name)
     navigator.clipboard.writeText(description)
     snackbar.show(`Скопировано описание для git commit:\n${description}`)
 
@@ -321,7 +324,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
     }).dom,
     /** @type {import('@material/mwc-icon-button').IconButton} */// @ts-ignore
     descriptionEdit: oom.mwcIconButton({
-      title: 'Редактировать описание для git commit',
+      title: 'Редактировать описание для Git коммита',
       class: 'icon_18',
       innerHTML: octicons.pencil.toSVG({ width: 18 }),
       onclick: () => this.editDescription()
@@ -512,6 +515,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
 
   /** Открывает форму редактирования редактирование описания для коммита */
   editDescription() {
+    sendCloudStatistic('Диалог - Ветки для Git', 'Редактирование описания для Git коммита')
     this.elements.descriptionEdit.classList.toggle('hide')
     this.elements.description.classList.toggle('hide')
     this.elements.descriptionTextarea.classList.toggle('hide')
@@ -531,11 +535,13 @@ class GitBranchCard extends oom.extends(HTMLElement) {
     const version = this.versionsList[index]
 
     if (version === 'Произвольная') {
+      sendCloudStatistic('Диалог - Ветки для Git', 'Выбор произвольной версии для ветки Git')
       this.elements.branchVersionTextfield.classList.toggle('hide')
       this.elements.branchButton.classList.toggle('hide')
       this.elements.branchVersionTextfield.focus()
       this.elements.branchVersionTextfield.select()
     } else {
+      sendCloudStatistic('Диалог - Ветки для Git', 'Выбор версии для ветки Git из списка')
       this.version = version
     }
   }
@@ -570,6 +576,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
 
   /** Открывает форму редактирования доп. имени ветки */
   editBranchSubName() {
+    sendCloudStatistic('Диалог - Ветки для Git', 'Редактирование имени ветки для Git')
     this.elements.branchSubName.classList.toggle('hide')
     this.elements.branchSubNameTextfield.classList.toggle('hide')
     this.elements.branchSubNameTextfield.focus()
@@ -593,6 +600,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
 
   /** Копирование ссылки на задачу */
   copyLink() {
+    sendCloudStatistic('Диалог - Ветки для Git', 'Копирование ссылки')
     this.data.copyLink()
   }
 
@@ -602,6 +610,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
       this.elements.branchVersionTextfield.checkValidity()
 
     if (valid) {
+      sendCloudStatistic('Диалог - Ветки для Git', 'Копирование ветки для Git')
       await this.data.copyBranchName()
     }
   }
@@ -612,6 +621,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
       this.elements.branchVersionTextfield.checkValidity()
 
     if (valid) {
+      sendCloudStatistic('Диалог - Ветки для Git', 'Копирование описания для Git коммита')
       await this.data.copyDescription()
     }
   }
@@ -689,6 +699,7 @@ class GitBranchCardList extends oom.extends(HTMLElement) {
           this.openTaskList.dom.classList.remove('hide')
           break
         case 1:
+          sendCloudStatistic('Диалог - Ветки для Git', 'Открытие истории задач')
           this.historyTaskList({ innerHTML: '' }, oom.div({ class: 'empty' }, 'Загрузка ...'))
           this.openTaskList.dom.classList.add('hide')
           this.historyTaskList.dom.classList.remove('hide')
@@ -782,11 +793,14 @@ toolbar.addButton({
   title: 'История веток для Git (Alt+H)',
   iconSVG: octicons['git-branch'].toSVG({ width: 24 }),
   keysMapping: 'alt-KeyH',
-  onclick: () => PopupDialog.toggle({
-    key: 'git-branch-dialog',
-    title: 'Ветки для Git',
-    Element: GitBranchCardList
-  })
+  onclick: () => {
+    sendCloudStatistic('Правая панель', 'Открытие диалога - Ветки для Git')
+    PopupDialog.toggle({
+      key: 'git-branch-dialog',
+      title: 'Ветки для Git',
+      Element: GitBranchCardList
+    })
+  }
 })
 
 toolbar.addButton({
@@ -798,6 +812,7 @@ toolbar.addButton({
   onclick: card => {
     const gitCard = new GitBranchCardData(card.data)
 
+    sendCloudStatistic('Тулбар задачи', 'Копирование ветки для Git')
     gitCard.restoreFromHistory()
       .then(() => gitCard.copyBranchName())
       .catch(console.error)
@@ -812,6 +827,7 @@ toolbar.addButton({
   onclick: card => {
     const gitCard = new GitBranchCardData(card.data)
 
+    sendCloudStatistic('Тулбар задачи', 'Копирование описания для Git коммита')
     gitCard.restoreFromHistory()
       .then(() => gitCard.copyDescription())
       .catch(console.error)
@@ -827,6 +843,7 @@ toolbar.addButton({
     const links = []
     const view = card.element.querySelector('.fed2-DocumentPrint__content-view')?.shadowRoot
 
+    sendCloudStatistic('Тулбар задачи', 'Открытие ветки для Review кода')
     if (view) {
       const rows = Array.from(view.querySelectorAll('.git_row'))
       const rc = `div[title="rc-${card.data.version}"]`
@@ -846,6 +863,7 @@ toolbar.addButton({
         window.open(link, '_blank')
       }
     } else {
+      sendCloudStatistic('Ошибки SABY Customizer', 'Не удалось найти ветки для Review кода')
       snackbar.show('Не удалось найти ветки для Review кода')
     }
   }

package/lib/saby-lib/cloud-statistic.js

@@ -1,3 +1,25 @@
-// Собрать стату по использованию фич кастомайзера
-// https://online.sbis.ru/news/4a005fd5-c99b-4e8d-a78b-eeb67b78d892
-// https://git.sbis.ru/contragents/online/-/blob/rc-22.1200/client/ContractorCommon/_statisticCollection/Helper.ts
+/*
+  Сбор статы по использованию фич кастомайзера
+*/
+/* global requirejs */
+let sendStatistic = null
+const loadSender = () => new Promise((resolve) => {
+  if (sendStatistic) {
+    return resolve(sendStatistic)
+  }
+  requirejs(['CloudStatisticsHelper/cloudStatisticsHelper'], ({ sendCloudStatistic }) => {
+    sendStatistic = sendCloudStatistic
+    resolve(sendStatistic)
+  })
+})
+
+/**
+ * Отправка прикладной статистики
+ * @param {string} context Элемент системы
+ * @param {string} action Действие
+ */
+export function sendCloudStatistic(context, action) {
+  loadSender().then((sendStatistic) => {
+    sendStatistic({ functionality: 'SABY Customizer', context, action })
+  })
+}

package/lib/saby-lib/edo.js

@@ -1,5 +1,6 @@
 const replaceDocTypeName = {
   'Error': 'Ошибка',
+  'Ошибка на стенде': 'Ошибка',
   'Task to Development': 'Задача',
   'Задача в разработку': 'Задача',
   'Изменение документации разработки': 'ЗадачаДок',

package/lib.js

@@ -3,6 +3,7 @@ export * from './lib/database.js'
 export * from './lib/hotkeys.js'
 export * from './lib/layout.js'
 export * from './lib/popup-dialog.js'
+export * from './lib/saby-lib/cloud-statistic.js'
 export * from './lib/saby-lib/edo.js'
 export * from './lib/saby-lib/rpc.js'
 export * from './lib/saby-lib/toolbar.js'

package/material.js

@@ -173,16 +173,6 @@ function query(selector, cache) {
                 enumerable: true,
                 configurable: true,
             };
-            if (cache) {
-                const key = typeof name === 'symbol' ? Symbol() : `__${name}`;
-                descriptor.get = function () {
-                    var _a, _b;
-                    if (this[key] === undefined) {
-                        this[key] = (_b = (_a = this.renderRoot) === null || _a === void 0 ? void 0 : _a.querySelector(selector)) !== null && _b !== void 0 ? _b : null;
-                    }
-                    return this[key];
-                };
-            }
             return descriptor;
         },
     });
@@ -232,11 +222,7 @@ function queryAssignedElements(options) {
 function queryAssignedNodes(slotOrOptions, flatten, selector) {
     let slot = slotOrOptions;
     let assignedNodesOptions;
-    if (typeof slotOrOptions === 'object') {
-        slot = slotOrOptions.slot;
-        assignedNodesOptions = slotOrOptions;
-    }
-    else {
+    {
         assignedNodesOptions = { flatten };
     }
     if (selector) {
@@ -250,7 +236,7 @@ function queryAssignedNodes(slotOrOptions, flatten, selector) {
         descriptor: (_name) => ({
             get() {
                 var _a, _b;
-                const slotSelector = `slot${slot ? `[name=${slot}]` : ':not([name])'}`;
+                const slotSelector = `slot${':not([name])'}`;
                 const slotEl = (_a = this.renderRoot) === null || _a === void 0 ? void 0 : _a.querySelector(slotSelector);
                 return (_b = slotEl === null || slotEl === void 0 ? void 0 : slotEl.assignedNodes(assignedNodesOptions)) !== null && _b !== void 0 ? _b : [];
             },
@@ -500,12 +486,12 @@ function queryAssignedNodes(slotOrOptions, flatten, selector) {
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 (function () {
-  if (typeof window === 'undefined') {
+  if (typeof window === 'undefined' || typeof Element === 'undefined') {
     return;
   }
   var slice = Array.prototype.slice;
   var matches = Element.prototype.matches || Element.prototype.msMatchesSelector;
-  var _focusableElementsString = ['a[href]', 'area[href]', 'input:not([disabled])', 'select:not([disabled])', 'textarea:not([disabled])', 'button:not([disabled])', 'details', 'summary', 'iframe', 'object', 'embed', '[contenteditable]'].join(',');
+  var _focusableElementsString = ['a[href]', 'area[href]', 'input:not([disabled])', 'select:not([disabled])', 'textarea:not([disabled])', 'button:not([disabled])', 'details', 'summary', 'iframe', 'object', 'embed', 'video', '[contenteditable]'].join(',');
   var InertRoot = function () {
     function InertRoot(rootElement, inertManager) {
       _classCallCheck(this, InertRoot);
@@ -1494,7 +1480,7 @@ const cssResultFromStyleSheet = (sheet) => {
     return unsafeCSS(cssText);
 };
 const getCompatibleStyle = supportsAdoptingStyleSheets ||
-    (NODE_MODE )
+    (NODE_MODE)
     ? (s) => s
     : (s) => s instanceof CSSStyleSheet ? cssResultFromStyleSheet(s) : s;
 
@@ -3122,10 +3108,7 @@ const PartType = {
     ATTRIBUTE: 1,
     CHILD: 2,
     PROPERTY: 3,
-    BOOLEAN_ATTRIBUTE: 4,
-    EVENT: 5,
-    ELEMENT: 6,
-};
+    BOOLEAN_ATTRIBUTE: 4};
 const directive = (c) => (...values) => ({
     ['_$litDirective$']: c,
     values,
@@ -10470,7 +10453,7 @@ var MDCTopAppBarFoundation =  (function (_super) {
         if (this.checkForUpdate()) {
             var offset = this.currentAppBarOffsetTop;
             if (Math.abs(offset) >= this.topAppBarHeight) {
-                offset = -numbers$1.MAX_TOP_APP_BAR_HEIGHT;
+                offset = -128;
             }
             this.adapter.setStyle('top', offset + 'px');
         }

package/octicons.js

@@ -19534,128 +19534,143 @@ var require$$0 = {
 }
 };
 
-var getOwnPropertySymbols = Object.getOwnPropertySymbols;
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-var propIsEnumerable = Object.prototype.propertyIsEnumerable;
-function toObject(val) {
-	if (val === null || val === undefined) {
-		throw new TypeError('Object.assign cannot be called with null or undefined');
-	}
-	return Object(val);
-}
-function shouldUseNative() {
-	try {
-		if (!Object.assign) {
-			return false;
-		}
-		var test1 = new String('abc');
-		test1[5] = 'de';
-		if (Object.getOwnPropertyNames(test1)[0] === '5') {
+var objectAssign;
+var hasRequiredObjectAssign;
+function requireObjectAssign () {
+	if (hasRequiredObjectAssign) return objectAssign;
+	hasRequiredObjectAssign = 1;
+	var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+	var hasOwnProperty = Object.prototype.hasOwnProperty;
+	var propIsEnumerable = Object.prototype.propertyIsEnumerable;
+	function toObject(val) {
+		if (val === null || val === undefined) {
+			throw new TypeError('Object.assign cannot be called with null or undefined');
+		}
+		return Object(val);
+	}
+	function shouldUseNative() {
+		try {
+			if (!Object.assign) {
+				return false;
+			}
+			var test1 = new String('abc');
+			test1[5] = 'de';
+			if (Object.getOwnPropertyNames(test1)[0] === '5') {
+				return false;
+			}
+			var test2 = {};
+			for (var i = 0; i < 10; i++) {
+				test2['_' + String.fromCharCode(i)] = i;
+			}
+			var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
+				return test2[n];
+			});
+			if (order2.join('') !== '0123456789') {
+				return false;
+			}
+			var test3 = {};
+			'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
+				test3[letter] = letter;
+			});
+			if (Object.keys(Object.assign({}, test3)).join('') !==
+					'abcdefghijklmnopqrst') {
+				return false;
+			}
+			return true;
+		} catch (err) {
 			return false;
 		}
-		var test2 = {};
-		for (var i = 0; i < 10; i++) {
-			test2['_' + String.fromCharCode(i)] = i;
-		}
-		var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
-			return test2[n];
-		});
-		if (order2.join('') !== '0123456789') {
-			return false;
-		}
-		var test3 = {};
-		'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
-			test3[letter] = letter;
-		});
-		if (Object.keys(Object.assign({}, test3)).join('') !==
-				'abcdefghijklmnopqrst') {
-			return false;
-		}
-		return true;
-	} catch (err) {
-		return false;
 	}
-}
-var objectAssign$1 = shouldUseNative() ? Object.assign : function (target, source) {
-	var from;
-	var to = toObject(target);
-	var symbols;
-	for (var s = 1; s < arguments.length; s++) {
-		from = Object(arguments[s]);
-		for (var key in from) {
-			if (hasOwnProperty.call(from, key)) {
-				to[key] = from[key];
-			}
-		}
-		if (getOwnPropertySymbols) {
-			symbols = getOwnPropertySymbols(from);
-			for (var i = 0; i < symbols.length; i++) {
-				if (propIsEnumerable.call(from, symbols[i])) {
-					to[symbols[i]] = from[symbols[i]];
+	objectAssign = shouldUseNative() ? Object.assign : function (target, source) {
+		var from;
+		var to = toObject(target);
+		var symbols;
+		for (var s = 1; s < arguments.length; s++) {
+			from = Object(arguments[s]);
+			for (var key in from) {
+				if (hasOwnProperty.call(from, key)) {
+					to[key] = from[key];
+				}
+			}
+			if (getOwnPropertySymbols) {
+				symbols = getOwnPropertySymbols(from);
+				for (var i = 0; i < symbols.length; i++) {
+					if (propIsEnumerable.call(from, symbols[i])) {
+						to[symbols[i]] = from[symbols[i]];
+					}
 				}
 			}
 		}
-	}
-	return to;
-};
-getDefaultExportFromCjs(objectAssign$1);
-
-const data = require$$0;
-const objectAssign = objectAssign$1;
-const DEFAULT_HEIGHT = 16;
-for (const key of Object.keys(data)) {
-  const htmlAttributes = (icon, defaultOptions, options) => {
-    const attributes = [];
-    const attrObj = objectAssign({}, defaultOptions, options);
-    if (options) {
-      if (options['width'] || options['height']) {
-        attrObj['width'] = options['width']
-          ? options['width']
-          : (parseInt(options['height']) * defaultOptions['width']) / defaultOptions['height'];
-        attrObj['height'] = options['height']
-          ? options['height']
-          : (parseInt(options['width']) * defaultOptions['height']) / defaultOptions['width'];
-      }
-      if (options['class']) {
-        attrObj['class'] = `octicon octicon-${key} ${options['class']}`;
-        attrObj['class'].trim();
-      }
-      if (options['aria-label']) {
-        attrObj['aria-label'] = options['aria-label'];
-        attrObj['role'] = 'img';
-        delete attrObj['aria-hidden'];
-      }
-    }
-    for (const option of Object.keys(attrObj)) {
-      attributes.push(`${option}="${attrObj[option]}"`);
-    }
-    return attributes.join(' ').trim()
-  };
-  data[key].symbol = key;
-  for (const height of Object.keys(data[key].heights)) {
-    data[key].heights[height].options = {
-      version: '1.1',
-      width: data[key].heights[height].width,
-      height: parseInt(height),
-      viewBox: `0 0 ${data[key].heights[height].width} ${height}`,
-      class: `octicon octicon-${key}`,
-      'aria-hidden': 'true'
-    };
-  }
-  data[key].toSVG = function (options = {}) {
-    const {height, width} = options;
-    const naturalHeight = closestNaturalHeight(Object.keys(data[key].heights), height || width || DEFAULT_HEIGHT);
-    return `<svg ${htmlAttributes(data[key], data[key].heights[naturalHeight].options, options)}>${
-      data[key].heights[naturalHeight].path
-    }</svg>`
-  };
+		return to;
+	};
+	return objectAssign;
 }
-var octicons = data;
-function closestNaturalHeight(naturalHeights, height) {
-  return naturalHeights
-    .map(naturalHeight => parseInt(naturalHeight, 10))
-    .reduce((acc, naturalHeight) => (naturalHeight <= height ? naturalHeight : acc), naturalHeights[0])
+
+var octicons;
+var hasRequiredOcticons;
+function requireOcticons () {
+	if (hasRequiredOcticons) return octicons;
+	hasRequiredOcticons = 1;
+	const data = require$$0;
+	const objectAssign = requireObjectAssign();
+	const DEFAULT_HEIGHT = 16;
+	for (const key of Object.keys(data)) {
+	  const htmlAttributes = (icon, defaultOptions, options) => {
+	    const attributes = [];
+	    const attrObj = objectAssign({}, defaultOptions, options);
+	    if (options) {
+	      if (options['width'] || options['height']) {
+	        attrObj['width'] = options['width']
+	          ? options['width']
+	          : (parseInt(options['height']) * defaultOptions['width']) / defaultOptions['height'];
+	        attrObj['height'] = options['height']
+	          ? options['height']
+	          : (parseInt(options['width']) * defaultOptions['height']) / defaultOptions['width'];
+	      }
+	      if (options['class']) {
+	        attrObj['class'] = `octicon octicon-${key} ${options['class']}`;
+	        attrObj['class'].trim();
+	      }
+	      if (options['aria-label']) {
+	        attrObj['aria-label'] = options['aria-label'];
+	        attrObj['role'] = 'img';
+	        delete attrObj['aria-hidden'];
+	      }
+	    }
+	    for (const option of Object.keys(attrObj)) {
+	      attributes.push(`${option}="${attrObj[option]}"`);
+	    }
+	    return attributes.join(' ').trim()
+	  };
+	  data[key].symbol = key;
+	  for (const height of Object.keys(data[key].heights)) {
+	    data[key].heights[height].options = {
+	      version: '1.1',
+	      width: data[key].heights[height].width,
+	      height: parseInt(height),
+	      viewBox: `0 0 ${data[key].heights[height].width} ${height}`,
+	      class: `octicon octicon-${key}`,
+	      'aria-hidden': 'true'
+	    };
+	  }
+	  data[key].toSVG = function (options = {}) {
+	    const {height, width} = options;
+	    const naturalHeight = closestNaturalHeight(Object.keys(data[key].heights), height || width || DEFAULT_HEIGHT);
+	    return `<svg ${htmlAttributes(data[key], data[key].heights[naturalHeight].options, options)}>${
+	      data[key].heights[naturalHeight].path
+	    }</svg>`
+	  };
+	}
+	octicons = data;
+	function closestNaturalHeight(naturalHeights, height) {
+	  return naturalHeights
+	    .map(naturalHeight => parseInt(naturalHeight, 10))
+	    .reduce((acc, naturalHeight) => (naturalHeight <= height ? naturalHeight : acc), naturalHeights[0])
+	}
+	return octicons;
 }
-var index = getDefaultExportFromCjs(octicons);
+
+var octiconsExports = requireOcticons();
+var index = /*@__PURE__*/getDefaultExportFromCjs(octiconsExports);
 
 export { index as octicons };

package/package.json

@@ -9,7 +9,7 @@
   },
   "repository": "github:saby-customizer/saby-customizer.github.io",
   "license": "Unlicense",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "type": "module",
   "main": "./userscript.js",
   "exports": {