config/webpack.config.dev.cjs

@@ -1,7 +1,7 @@
 const path = require('path')
 const { merge } = require('webpack-merge')
 const LiveReloadPlugin = require('webpack-livereload-plugin')
-const { UserScriptMetaDataPlugin } = require('userscript-metadata-webpack-plugin')
+const UserScriptMetaDataPlugin = require('userscript-metadata-webpack-plugin')
 
 const metadata = require('./metadata.cjs')
 const webpackConfig = require('./webpack.config.base.cjs')

config/webpack.config.production.cjs

@@ -1,5 +1,5 @@
 const { merge } = require('webpack-merge')
-const { UserScriptMetaDataPlugin } = require('userscript-metadata-webpack-plugin')
+const UserScriptMetaDataPlugin = require('userscript-metadata-webpack-plugin')
 
 const metadata = require('./metadata.cjs')
 const webpackConfig = require('./webpack.config.base.cjs')

package.json

@@ -1,7 +1,7 @@
 {
   "name": "3cx-tapi",
   "description": "3CX CP Tapi and Projectmanager integration",
-  "version": "9.1.0",
+  "version": "9.0.3",
   "author": {
     "name": "Daniel Triendl",
     "email": "d.triendl@cp-solutions.at"
@@ -24,33 +24,33 @@
   },
   "private": true,
   "dependencies": {
-    "axios": "^1.4.0",
+    "axios": "0.27.2",
-    "axios-userscript-adapter": "^0.2.0-alpha.2",
+    "axios-userscript-adapter": "0.1.12",
-    "chrono-node": "^2.6.3"
+    "chrono-node": "^2.4.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.5",
+    "@babel/core": "7.19.3",
-    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-env": "7.19.3",
-    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/eslint-plugin": "5.38.1",
-    "@typescript-eslint/parser": "^5.60.1",
+    "@typescript-eslint/parser": "5.38.1",
-    "babel-loader": "^9.1.2",
+    "babel-loader": "8.2.5",
-    "browserslist": "^4.21.9",
+    "browserslist": "4.21.4",
-    "css-loader": "^6.8.1",
+    "css-loader": "6.7.1",
-    "eslint": "^8.43.0",
+    "eslint": "8.24.0",
-    "eslint-config-standard": "^17.1.0",
+    "eslint-config-standard": "17.0.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "2.26.0",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-promise": "6.0.1",
     "less": "4.1.3",
-    "less-loader": "^11.1.3",
+    "less-loader": "11.0.0",
-    "style-loader": "^3.3.3",
+    "style-loader": "3.3.1",
-    "ts-loader": "^9.4.3",
+    "ts-loader": "9.4.1",
-    "typescript": "^5.1.3",
+    "typescript": "4.8.4",
-    "userscript-metadata-webpack-plugin": "^0.4.0",
+    "userscript-metadata-webpack-plugin": "0.1.5",
-    "webpack": "^5.88.0",
+    "webpack": "5.74.0",
-    "webpack-bundle-analyzer": "^4.9.0",
+    "webpack-bundle-analyzer": "4.6.1",
-    "webpack-cli": "^5.1.4",
+    "webpack-cli": "4.10.0",
     "webpack-livereload-plugin": "3.0.2",
-    "webpack-merge": "^5.9.0"
+    "webpack-merge": "5.8.0"
   }
 }

src/call-history.ts

@@ -22,10 +22,9 @@ export class CallHistory {
       date = dateParts.groups.date
       duration = dateParts.groups.duration
     }
-    var parsedDate = chrono.parseDate(date)
+    var parsedDate = chrono.de.parseDate(date)
-    var parsedDateDe = chrono.de.parseDate(date)
+    if (!parsedDate) {
-    if (parsedDateDe) {
+      parsedDate = chrono.parseDate(date)
-      parsedDate = parsedDateDe
     }
     if (!parsedDate) {
       return

src/search.css

@@ -1,39 +1,9 @@
-.tapi-search-autocomplete {
+.tapi-search-result {
-    /*the container must be positioned relative:*/
+    color: #000;
-    position: relative;
+    padding: 5px;
-    display: inline-block;
-    margin-right: 20px;
-  }
-.tapi-search-autocomplete input {
-    border: 1px solid transparent;
-    background-color: #f1f1f1;
-    /*padding: 10px;*/
-    /*font-size: 16px;*/
-}
-.tapi-search-autocomplete input[type=text] {
-    background-color: #f1f1f1;
-    width: 100%;
 }
 
-.tapi-search-autocomplete-items {
+.tapi-search-result:hover, .tapi-search-result-selected {
-    position: absolute;
+    background-color: #E7E6E6;
-    border: 1px solid #d4d4d4;
-    border-bottom: none;
-    border-top: none;
-    z-index: 99;
-    /*position the autocomplete items to be the same width as the container:*/
-    top: 100%;
-    left: 0;
-    right: 0;
-}
-.tapi-search-autocomplete-items div {
-    padding: 10px;
-    cursor: pointer;
-    background-color: #fff;
-    border-bottom: 1px solid #d4d4d4;
-    color: #000;
-}
-.tapi-search-autocomplete-items div:hover, .tapi-search-autocomplete-active {
-    /*when hovering an item:*/
-    background-color: #E7E6E6 !important;
 }
+

src/search.ts

@@ -10,10 +10,13 @@ export class Search {
     console.log('Create TAPI Search')
 
     var form = document.createElement('form')
+    form.style.width = '200px'
+    form.style.float = 'right'
+    form.style.marginRight = '20px'
     form.onsubmit = () => {
-      var items = document.getElementsByClassName('tapi-search-autocomplete-active')
+      var items = document.getElementsByClassName('tapi-search-result-selected')
       if (items.length === 0) {
-        items = document.getElementsByClassName('tapi-search-autocomplete-item')
+        items = document.getElementsByClassName('tapi-search-result')
       }
       if (items.length > 0) {
         this.dial((<HTMLElement>items[0]).dataset.tapiNumber)
@@ -25,14 +28,23 @@ export class Search {
     }
 
     var searchBox = document.createElement('div')
-    searchBox.classList.add('tapi-search-autocomplete')
+    searchBox.classList.add('contact-search-box')
-    searchBox.style.width = '200px'
     searchBox.id = 'tapiSearchBox'
     form.appendChild(searchBox)
 
+    var searchWrapper = document.createElement('div')
+    searchWrapper.classList.add('search-input-wrapper')
+    searchWrapper.style.position = 'relative'
+    searchBox.appendChild(searchWrapper)
+
     var search = document.createElement('input')
     search.id = 'tapiSearchInput'
     search.autocomplete = 'off'
+    search.classList.add('padder')
+    search.classList.add('rounded')
+    search.classList.add('bg-light')
+    search.classList.add('no-border')
+    search.classList.add('contact-search-box')
     search.placeholder = 'TAPI Suche'
     search.onfocus = () => { this.doSearch() }
     search.onkeydown = (ev) => { this.doSearchKeyDown(ev) }
@@ -41,15 +53,22 @@ export class Search {
       setTimeout(() => {
         console.log('TAPI clear search results')
         this.removeSearchResults()
-      }, 250)
+      }, 500)
     }
-    searchBox.appendChild(search)
+    searchWrapper.appendChild(search)
+
+    var icon = document.createElement('span')
+    icon.classList.add('fa')
+    icon.classList.add('fa-search')
+    icon.classList.add('form-control-feedback')
+    icon.style.color = 'grey'
+    searchWrapper.appendChild(icon)
 
     element.parentElement.insertBefore(form, element)
   }
 
   private removeSearchResults () {
-    var resultList = document.getElementById('tapi-search-autocomplete-list')
+    var resultList = document.getElementById('tapiResults')
     if (resultList) {
       resultList.parentNode.removeChild(resultList)
     }
@@ -58,12 +77,12 @@ export class Search {
 
   private doSearchKeyDown (ev: KeyboardEvent) {
     if (ev.key === 'ArrowUp') {
-      let items = document.getElementsByClassName('tapi-search-autocomplete-active')
+      let items = document.getElementsByClassName('tapi-search-result-selected')
       if (items.length > 0) {
         var prev = <Element>items[0].previousSibling
       }
       if (!prev) {
-        items = document.getElementsByClassName('tapi-search-autocomplete-item')
+        items = document.getElementsByClassName('tapi-search-result')
         if (items.length > 0) {
           prev = items[items.length - 1]
         }
@@ -73,12 +92,12 @@ export class Search {
         prev.scrollIntoView(true)
       }
     } else if (ev.key === 'ArrowDown') {
-      let items = document.getElementsByClassName('tapi-search-autocomplete-active')
+      let items = document.getElementsByClassName('tapi-search-result-selected')
       if (items.length > 0) {
         var next = <Element>items[0].nextSibling
       }
       if (!next) {
-        items = document.getElementsByClassName('tapi-search-autocomplete-item')
+        items = document.getElementsByClassName('tapi-search-result')
         if (items.length > 0) {
           next = items[0]
         }
@@ -109,31 +128,45 @@ export class Search {
     this.removeSearchResults()
     this.currentSearchText = searchText
 
-    var results = document.createElement('div');
+    var resultList = document.createElement('ul')
-    results.setAttribute('id', 'tapi-search-autocomplete-list')
+    resultList.id = 'tapiResults'
-    results.setAttribute('class', 'tapi-search-autocomplete-items')
+    resultList.classList.add('search-nav-absolute')
-    document.getElementById('tapiSearchBox').appendChild(results)
+    resultList.classList.add('search-nav-ul')
+    document.getElementById('tapiSearchBox').appendChild(resultList)
 
+    resultList.innerHTML = ''
     contacts.forEach(contact => {
-      var item = document.createElement('div');
+      var li = document.createElement('li')
-      item.setAttribute('class', 'tapi-search-autocomplete-item')
+      li.classList.add('tapi-search-result')
-      item.appendChild(document.createTextNode(contact.tD_NAME))
+      li.classList.add('pointer')
-      item.appendChild(document.createTextNode(contact.tD_MEDIUM + ': ' + contact.tD_NUMBER_TAPI))
+      li.onmouseover = () => { this.selectResult(li) }
-      item.onclick = () => { this.dial(contact.tD_NUMBER_TAPI) }
+      li.dataset.tapiNumber = contact.tD_NUMBER_TAPI
-      item.onmouseover = () => { this.selectResult(item) }
+      li.onclick = () => { this.dial(contact.tD_NUMBER_TAPI) }
-      item.dataset.tapiNumber = contact.tD_NUMBER_TAPI
+      li.style.listStyle = 'outside none none' // display: flex; align-items: center;
-      results.appendChild(item);
+
+      var resultText = document.createElement('div')
+      resultText.classList.add('search-result-txt')
+      li.appendChild(resultText)
+
+      var line1 = document.createElement('div')
+      line1.appendChild(document.createTextNode(contact.tD_NAME))
+      resultText.appendChild(line1)
+
+      var line2 = document.createElement('div')
+      line2.appendChild(document.createTextNode(contact.tD_MEDIUM + ': ' + contact.tD_NUMBER_TAPI))
+      resultText.appendChild(line2)
+
+      resultList.appendChild(li)
     })
   }, 200)
 
-  private selectResult (item: Element) {
+  private selectResult (resultLi: Element) {
-    console.log('Select item', item)
+    var items = document.getElementsByClassName('tapi-search-result')
-    var items = document.getElementsByClassName('tapi-search-autocomplete-active')
+    for (var item of items) {
-    for (var i of items) {
+      item.classList.remove('tapi-search-result-selected')
-      i.classList.remove('tapi-search-autocomplete-active')
     }
 
-    item.classList.add('tapi-search-autocomplete-active')
+    resultLi.classList.add('tapi-search-result-selected')
   }
 
   private dial (number: string) {