saby-customizer 0.0.0-pre.31 → 0.0.0-pre.32

package/features/git-branch.js

@@ -55,9 +55,7 @@ export class GitBranchCardData {
    * @param {string} value Версия
    */
   set version(value) {
-    if (this.raw.milestones && this.raw.milestones.includes(value)) {
-      this.raw.version = value
-    }
+    this.raw.version = value || this.raw.version
   }
 
   /** @returns {string} Часть имени ветки, зависящая от регламента задачи */
@@ -249,6 +247,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
       marginBottom: '-1px',
       cursor: 'pointer',
       color: 'var(--mdc-theme-primary, #6200ee)',
+      whiteSpace: 'nowrap',
       overflow: 'hidden',
       textOverflow: 'ellipsis'
     },
@@ -260,6 +259,9 @@ class GitBranchCard extends oom.extends(HTMLElement) {
       height: '48px',
       marginTop: '-1px'
     },
+    '.branch-sub-name-version': {
+      width: '132px'
+    },
     '.actions': {
       display: 'flex',
       marginLeft: '12px'
@@ -306,6 +308,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
   }
 
   data = new GitBranchCardData(this.options.data)
+  versionsList = this.data.milestones.concat(['Произвольная'])
 
   elements = {
     /** @type {HTMLSpanElement} */
@@ -339,13 +342,23 @@ class GitBranchCard extends oom.extends(HTMLElement) {
       oninput: () => this.oninputDescription()
     }).dom,
     /** @type {import('@material/mwc-menu').Menu} */// @ts-ignore
-    versions: this.data.milestones.reduce((mwcMenu, item) => {
+    versions: this.versionsList.reduce((mwcMenu, item) => {
       return mwcMenu(oom.mwcListItem(item))
     }, oom.mwcMenu({ fixed: true, activatable: true })).dom,
+    /** @type {import('@material/mwc-textfield').TextField} */// @ts-ignore
+    branchVersionTextfield: oom.mwcTextfield({
+      class: 'branch-sub-name branch-sub-name-version hide',
+      value: this.data.version,
+      placeholder: 'YY.XXXX',
+      pattern: '^\\d\\d.\\d\\d\\d\\d$',
+      validationmessage: 'Пример: 99.9999',
+      oninput: () => this.oninputBranchVersion(),
+      onblur: () => this.onblurBranchVersion()
+    }).dom,
     /** @type {HTMLDivElement} */// @ts-ignore
     branchButton: oom.div({
       class: 'version-button',
-      onclick: () => { this.elements.versions.open = true }
+      onclick: () => this.editBranchVersion()
     }, this.data.version).dom,
     /** @type {HTMLSpanElement} */
     branchNamePart: oom.span({
@@ -396,6 +409,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
     this.data.version = value
     if (this.data.version === value) {
       this.elements.branchButton.textContent = this.data.version
+      this.elements.branchVersionTextfield.value = this.data.version
       this.elements.cardTitle.textContent = this.data.branchTitle
     }
   }
@@ -441,7 +455,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
   template = () => {
     this.elements.versions.anchor = this.elements.branchButton
     this.elements.versions.addEventListener('selected', (/** @type {CustomEvent<import('@material/mwc-list/mwc-list-foundation').ActionDetail>} */event) => {
-      this.version = this.data.milestones[event.detail.index]
+      this.selectedVersion(event.detail.index)
     })
 
     this.updateBranchNamePart().catch(console.error)
@@ -484,6 +498,7 @@ class GitBranchCard extends oom.extends(HTMLElement) {
         .div({ class: 'branch' },
           this.elements.branchButton,
           this.elements.versions,
+          this.elements.branchVersionTextfield,
           this.elements.branchNamePart,
           this.elements.branchSubName,
           this.elements.branchSubNameTextfield)
@@ -512,6 +527,52 @@ class GitBranchCard extends oom.extends(HTMLElement) {
     this.description = this.elements.descriptionTextarea.value
   }
 
+  /**
+   * Обработчик выбора версии из меню
+   *
+   * @param {number} index Выбранная в меню позиция
+   */
+  selectedVersion(index) {
+    const version = this.versionsList[index]
+
+    if (version === 'Произвольная') {
+      this.elements.branchVersionTextfield.classList.toggle('hide')
+      this.elements.branchButton.classList.toggle('hide')
+      this.elements.branchVersionTextfield.focus()
+      this.elements.branchVersionTextfield.select()
+    } else {
+      this.version = version
+    }
+  }
+
+  /** Открывает форму редактирования версии ветки */
+  editBranchVersion() {
+    if (this.data.milestones.length === 0) {
+      this.elements.branchVersionTextfield.classList.toggle('hide')
+      this.elements.branchButton.classList.toggle('hide')
+      this.elements.branchVersionTextfield.focus()
+      this.elements.branchVersionTextfield.select()
+    } else {
+      this.elements.versions.open = true
+    }
+  }
+
+  /** Сохранение данных о версии ветки при вводе */
+  oninputBranchVersion() {
+    if (this.elements.branchVersionTextfield.checkValidity()) {
+      this.version = this.elements.branchVersionTextfield.value
+    }
+  }
+
+  /** Скрывает поле ввода версии ветки при потере фокуса */
+  onblurBranchVersion() {
+    if (this.elements.branchVersionTextfield.checkValidity()) {
+      this.elements.branchVersionTextfield.classList.toggle('hide')
+      this.elements.branchButton.classList.toggle('hide')
+      this.version = this.elements.branchVersionTextfield.value
+    }
+  }
+
   /** Открывает форму редактирования доп. имени ветки */
   editBranchSubName() {
     this.elements.branchSubName.classList.toggle('hide')
@@ -542,14 +603,22 @@ class GitBranchCard extends oom.extends(HTMLElement) {
 
   /** Копирование имени ветки */
   async copyBranchName() {
-    if (this.elements.branchSubNameTextfield.checkValidity()) {
+    const valid = this.elements.branchSubNameTextfield.checkValidity() &&
+      this.elements.branchVersionTextfield.checkValidity()
+
+    if (valid) {
       await this.data.copyBranchName()
     }
   }
 
   /** Копирование описания для git commit */
   async copyDescription() {
-    await this.data.copyDescription()
+    const valid = this.elements.branchSubNameTextfield.checkValidity() &&
+      this.elements.branchVersionTextfield.checkValidity()
+
+    if (valid) {
+      await this.data.copyDescription()
+    }
   }
 
   /** Восстановление из истории последнего сохраненного состояния карточки */
@@ -570,7 +639,7 @@ class GitBranchCardList extends oom.extends(HTMLElement) {
   static style = oom.style({
     'display': 'contents',
     '.empty': {
-      padding: '100px',
+      padding: '50px',
       textAlign: 'center'
     },
     '.content': {
@@ -587,7 +656,8 @@ class GitBranchCardList extends oom.extends(HTMLElement) {
       display: 'flex',
       justifyContent: 'space-between',
       alignItems: 'center',
-      padding: '4px 4px 0px'
+      padding: '4px 4px 0px',
+      height: '36px'
     },
     '.nav-buttons-space': {
       width: '64px'
@@ -641,8 +711,7 @@ class GitBranchCardList extends oom.extends(HTMLElement) {
   async buildTaskList() {
     let taskTist = null
     const openTaskList = (await getListOfOpenCards({
-      names: ['Ошибка', 'Задача'],
-      hasVersion: true
+      names: ['Ошибка', 'Задача']
     })).map(card => new GitBranchCard(card))
 
     await Promise.all(openTaskList.map(card => card.restoreFromHistory()))
@@ -669,6 +738,9 @@ class GitBranchCardList extends oom.extends(HTMLElement) {
       .toArray()
 
     if (historyData.length > 0) {
+      const totalCount = await gitBranchHistory.count()
+      const currentSize = offset + Math.min(this.historyListLimit, historyData.length)
+
       if (this.historyListPage > 0) {
         navButtons(oom.mwcButton({
           innerHTML: octicons['arrow-left'].toSVG({ width: 24 }),
@@ -680,7 +752,7 @@ class GitBranchCardList extends oom.extends(HTMLElement) {
       } else {
         navButtons(oom.span({ class: 'nav-buttons-space' }))
       }
-      navButtons(oom.span(`${offset + 1} - ${offset + this.historyListLimit}`, {
+      navButtons(oom.span(`${offset + 1} - ${currentSize} / ${totalCount}`, {
         class: 'nav-buttons-page-label'
       }))
       if (historyData.length > this.historyListLimit) {
@@ -697,6 +769,9 @@ class GitBranchCardList extends oom.extends(HTMLElement) {
       }
 
       this.historyTaskList({ innerHTML: '' }, navButtons, ...historyData.map(card => new GitBranchCard(card)))
+    } else if (this.historyListPage > 0) {
+      --this.historyListPage
+      this.buildHistoryList().catch(console.error)
     } else {
       this.historyTaskList({ innerHTML: '' }, oom.div({ class: 'empty' }, 'Задач в истории не найдено'))
     }

package/lib/saby-lib/edo.js

@@ -120,7 +120,7 @@ export function getListOfOpenCards(filter = {}) {
         url: '',
         author: record.get('ЛицоСоздал.Название') || record.get('Сотрудник.Название'),
         milestones: [],
-        version: 'dev',
+        version: `${(new Date().getFullYear() + '').slice(-2)}.0000`,
         description: ''
       }
 

package/lib/saby-lib/toolbar.js

@@ -145,7 +145,7 @@ class ToolbarContainer extends oom.extends(HTMLElement, optionsDefaults) {
         /** @type {ToolbarContainer} */
         let topSidebar = topPanel.querySelector('saby-customizer-toolbar')
 
-        if (topSidebar && topSidebar.options?.card.data.number !== card.data.number) {
+        if (topSidebar && topSidebar.options?.card.data.id !== card.data.id) {
           topSidebar.remove()
           topSidebar = null
         }

package/octicons.js

@@ -2603,6 +2603,21 @@ var require$$0 = {
 },
 	clock: clock,
 	code: code,
+	"code-of-conduct": {
+	name: "code-of-conduct",
+	keywords: [
+	],
+	heights: {
+		"16": {
+			width: 16,
+			path: "<path fill-rule=\"evenodd\" d=\"M8.048 2.241c.964-.709 2.079-1.238 3.325-1.241a4.613 4.613 0 013.282 1.355c.41.408.757.86.996 1.428.238.568.348 1.206.347 1.968 0 2.193-1.505 4.254-3.081 5.862-1.496 1.526-3.213 2.796-4.249 3.563l-.22.163a.75.75 0 01-.895 0l-.221-.163c-1.036-.767-2.753-2.037-4.249-3.563C1.51 10.008.007 7.952.002 5.762a4.614 4.614 0 011.353-3.407C3.123.585 6.223.537 8.048 2.24zm-1.153.983c-.81.78-1.546 1.669-2.166 2.417-.184.222-.358.432-.52.623a.75.75 0 00.04 1.016c.35.35.697.697 1.043 1.047.866.875 2.292.914 3.185.032.264-.26.534-.528.802-.797.694-.694 1.8-.701 2.474-.03L12.92 8.7l.283.284c-.244.334-.515.666-.81.995l-1.384-1.28A.75.75 0 109.99 9.802l1.357 1.252c-.325.31-.656.606-.984.887l-1.48-1.366a.75.75 0 10-1.018 1.102L9.191 12.9c-.433.34-.838.643-1.191.905-1.04-.773-2.537-1.907-3.846-3.242C2.611 8.99 1.502 7.306 1.502 5.75a3.114 3.114 0 01.913-2.335c1.159-1.158 3.23-1.224 4.48-.191zm7.112 4.442c.313-.65.491-1.293.491-1.916v-.001c0-.614-.088-1.045-.23-1.385-.143-.339-.357-.633-.673-.949a3.113 3.113 0 00-2.218-.915c-1.092.003-2.165.627-3.226 1.602-.823.755-1.554 1.637-2.228 2.45l-.127.154.562.566a.756.756 0 001.066.02l.794-.79c1.258-1.258 3.312-1.31 4.594-.032.396.394.792.791 1.173 1.173l.022.023z\"></path>"
+		},
+		"24": {
+			width: 24,
+			path: "<path fill-rule=\"evenodd\" d=\"M2.828 4.328C5.26 1.896 9.5 1.881 11.935 4.317c.024.024.046.05.067.076 1.391-1.078 2.993-1.886 4.777-1.89a6.216 6.216 0 014.424 1.825c.559.56 1.023 1.165 1.34 1.922.318.756.47 1.617.468 2.663 0 2.972-2.047 5.808-4.269 8.074-2.098 2.14-4.507 3.924-5.974 5.009l-.311.23a.752.752 0 01-.897 0l-.312-.23c-1.466-1.085-3.875-2.869-5.973-5.009-2.22-2.263-4.264-5.095-4.27-8.063v.012-.024.012a6.217 6.217 0 011.823-4.596zm8.033 1.042c-1.846-1.834-5.124-1.823-6.969.022a4.713 4.713 0 00-1.382 3.52c0 2.332 1.65 4.79 3.839 7.022 1.947 1.986 4.184 3.66 5.66 4.752a79.983 79.983 0 002.159-1.645l-2.14-1.974a.752.752 0 011.02-1.106l2.295 2.118c.616-.52 1.242-1.08 1.85-1.672l-2.16-1.992a.752.752 0 011.021-1.106l2.188 2.02a18.992 18.992 0 001.528-1.877l-.585-.586-1.651-1.652c-1.078-1.074-2.837-1.055-3.935.043-.379.38-.76.758-1.132 1.126-1.14 1.124-2.96 1.077-4.07-.043-.489-.495-.98-.988-1.475-1.482a.752.752 0 01-.04-1.019c.234-.276.483-.576.745-.893.928-1.12 2.023-2.442 3.234-3.576zm9.725 6.77c.579-1.08.92-2.167.92-3.228.002-.899-.128-1.552-.35-2.08-.22-.526-.551-.974-1.017-1.44a4.71 4.71 0 00-3.356-1.384c-1.66.004-3.25.951-4.77 2.346-1.18 1.084-2.233 2.353-3.188 3.506l-.351.423c.331.332.663.664.993.998a1.375 1.375 0 001.943.03c.37-.365.748-.74 1.125-1.118 1.662-1.663 4.373-1.726 6.06-.045.56.558 1.12 1.12 1.658 1.658l.333.334z\"></path>"
+		}
+	}
+},
 	"code-review": {
 	name: "code-review",
 	keywords: [

package/package.json

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