Dev (#642)

* update ky, fix ag to svelte example, RestDataApi will look for q and do stringify if its an object * Fixed quick search * Fixed search * refactor select2 so uses same fomratter for displayFields * comment out select tests since we dont support * get tests working for jest and ts. revamp truthy and empty * add jest to the checks * remove the setup for now * get jest tests working and move critical tests in, all tests are in __tests__ * Select fixes (#643) * Fixed select with complex dataApiParams * Lint fix * esm to get mockserver working with imports * reverted ts, to slow. * fix and cleanup the listctrl dep (#644) * fix and cleanup the listctrl dep * should have a property that we pass to GRidCtrl for contextMenuClickAction * pass everything through with the gridOpts * fixed showSearchForm * more clean up * cleanup to get rid of extendFilters * removed a bunch of console logs * add init search to config * Filtering refactoring Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com> * Grid remove listctrl dep (#645) * fix and cleanup the listctrl dep * should have a property that we pass to GRidCtrl for contextMenuClickAction * pass everything through with the gridOpts * fixed showSearchForm * more clean up * cleanup to get rid of extendFilters * removed a bunch of console logs * add init search to config * Filtering refactoring * get sort squared away * more lodash cleanup * fix for es6 * rename to restrictSearch * add start of the DataQuery class Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com> * Grid remove listctrl dep (#646) * fix and cleanup the listctrl dep * should have a property that we pass to GRidCtrl for contextMenuClickAction * pass everything through with the gridOpts * fixed showSearchForm * more clean up * cleanup to get rid of extendFilters * removed a bunch of console logs * add init search to config * Filtering refactoring * get sort squared away * more lodash cleanup * fix for es6 * rename to restrictSearch * add start of the DataQuery class Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com> * fixed foo bar * Grid fixes (#648) * Fixed cors issue for grids * Grid actions without listCtrl import * Custom toolbar actions * Fixed typo Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com> Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com>
yakworks · Dec 15, 2021 · 86dd8a8 · 86dd8a8
1 parent 7e2e4a8
commit 86dd8a8
Show file tree

Hide file tree

Showing 83 changed files with 1,437 additions and 956 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,6 +19,7 @@ jobs:
           paths: [ './node_modules' ]
 
       - run: make lint
+      - run: make jest
       - run: make test.karma
       - run: make test.jasmine
       - run: make build.demo

diff --git a/Makefile b/Makefile
@@ -13,6 +13,7 @@ include $(SHIPKIT_MAKEFILES)/circle.make
 export BOT_EMAIL ?= 9cibot@9ci.com
 karma.sh = npx karma
 lint.sh = npx eslint
+jest.sh = npx jest
 
 # --- standard base build ----
 
@@ -26,7 +27,7 @@ install: node_modules
 check: install lint test
 
 ## runs both karma and jasmine tests
-test: test.karma test.jasmine
+test: jest test.karma test.jasmine
 
 ## runs karma tests
 test.karma:
@@ -36,6 +37,10 @@ test.karma:
 test.jasmine:
 	$(karma.sh) start tests/karma-jasmine.conf.js --single-run --no-auto-watch --no-sandbox $$*
 
+## runs jasmine tests
+jest:
+	$(jest.sh)
+
 ## runs eslint
 lint:
 	$(lint.sh) src/

diff --git a/examples/demo/config.js b/examples/demo/config.js
@@ -1,4 +1,4 @@
 var configData = {
-  base_url:"http://localhost:3002/",
+  base_url:"http://0.0.0.0:3002/",
   foo:"bar"
 }
diff --git a/examples/demo/mocker/index.js b/examples/demo/mocker/index.js
@@ -1,3 +1,6 @@
+//esm allows imports to work with node
+require = require("esm")(module);
+
 const delay = require('mocker-api/utils/delay')
 // const _ = require('lodash')
 const yaml = require('js-yaml')

diff --git a/examples/demo/public/data/CustomerConfig.yml b/examples/demo/public/data/CustomerConfig.yml
@@ -4,7 +4,7 @@ gridOptions:
     - { name: num, width: 30 }
     - { name: name, formatter: editActionLink }
     - { name: city, width: 100 }
-    - { name: state, width: 60 }
+    - { name: location.state, width: 60 }
     - { name: postalCode, label: Zip, width: 60 }
     - { name: country, width: 60 }
   # sortname: name

diff --git a/examples/demo/public/data/Customers.json b/examples/demo/public/data/Customers.json
@@ -3,6 +3,13 @@
     "id": 1,
     "name": "Rhynoodle",
     "num": "RH0143",
+    "location": {
+      "street": "04828 Mcguire Alley",
+      "city": "Sacramento",
+      "state": "CA",
+      "postalCode": 95833,
+      "country": "US"
+    },
     "street": "04828 Mcguire Alley",
     "city": "Sacramento",
     "state": "CA",
@@ -14,6 +21,13 @@
     "id": 2,
     "name": "Yodo",
     "num": "YO7612",
+    "location": {
+      "street": "405 Old Shore Avenue",
+      "city": "Merritt",
+      "state": "BC",
+      "postalCode": "V1K",
+      "country": "CA"
+    },
     "street": "405 Old Shore Avenue",
     "city": "Merritt",
     "state": "BC",
@@ -25,6 +39,13 @@
     "id": 3,
     "name": "Omba",
     "num": "OM3054",
+    "location": {
+      "street": "8 Charing Cross Circle",
+      "city": "Niños Heroes",
+      "state": "OAX",
+      "postalCode": 68145,
+      "country": "MX"
+    },
     "street": "8 Charing Cross Circle",
     "city": "Niños Heroes",
     "state": "OAX",
@@ -36,6 +57,13 @@
     "id": 4,
     "name": "Gabcube",
     "num": "GA8966",
+    "location": {
+      "street": "55 Warbler Street",
+      "city": "Colorado Springs",
+      "state": "CO",
+      "postalCode": 80945,
+      "country": "US"
+    },
     "street": "55 Warbler Street",
     "city": "Colorado Springs",
     "state": "CO",
@@ -47,6 +75,13 @@
     "id": 5,
     "name": "Voonder",
     "num": "VO3537",
+    "location": {
+      "street": "4402 Summer Ridge Drive",
+      "city": "Maskinongé",
+      "state": "QC",
+      "postalCode": "T7A",
+      "country": "CA"
+    },
     "street": "4402 Summer Ridge Drive",
     "city": "Maskinongé",
     "state": "QC",

diff --git a/examples/demo/src/app.config.js b/examples/demo/src/app.config.js
@@ -4,12 +4,25 @@ import appName from './app.module'
 import './config.router'
 import appState from 'angle-grinder/src/tools/AppState'
 import {setConfig} from 'angle-grinder/src/tools/AppConfig'
-import {setClientConfig} from "angle-grinder/src/dataApi/kyClient";
+import {setClientConfig} from "angle-grinder/src/dataApi/kyApi";
 
 const app = angular.module(appName)
 // export default app.name
 
 app.run(function($rootScope, $state, $stateParams) {
+
+  // window.onbeforeunload = function(){
+  //   sessionStorage.setItem("origin", window.location.href);
+  // }
+
+  // window.onload = function(){
+  //   console.log("************window.location.href", window.location.href)
+  //   if(window.location.href == sessionStorage.getItem("origin")){
+  //       console.log("************clearing storage", window.location.href)
+  //       sessionStorage.clear();
+  //   }
+  // }
+
   'ngInject';
   // Set the ui-router state vars to global root to access them from any scope
   $rootScope.$state = $state

diff --git a/examples/demo/src/controls/select-rest/select-rest.html b/examples/demo/src/controls/select-rest/select-rest.html
@@ -1,6 +1,7 @@
+<p>LEGACY WAY OF DOING IT WITH AJAX, PREFER USING dataApiKey</p>
 <form name="selRestForm" ag-form is-horizontal>
 
-  <ag-select-rest select-options="{ multiple: true, minimumInputLength: 1}"
+  <ag-select-rest select-options="{ multiple: true, minimumInputLength: 1, closeOnSelect:false}"
                   ng-model="$ctrl.vm.multipleCustomer"
                   url="/api/customer/picklist">
   </ag-select-rest>

diff --git a/examples/demo/src/controls/select/basic/comp.html b/examples/demo/src/controls/select/basic/comp.html
@@ -22,36 +22,31 @@
   </div>
 </div>
 
-<div class="columns is-mobile">
-  <ag-label>Basic Select2</ag-label>
-  <div class="field column is-grouped">
-    <div class="control is-expanded">
-      <input class="input" ng-model="$ctrl.vm.day"
-        placeholder="select a day" ui-select2 ui-select2-data="['Mon','Tue','Wed','Thu','Fri','Sat','Sun']">
-    </div>
-    <div class="control is-expanded">
-      <input class="input" ng-model="$ctrl.vm.color"
-        ui-select2="{ allowClear: false, placeholder: 'select a color', data:['red','green', 'blue']}">
-    </div>
-  </div>
-</div>
+<ag-select name="agsel-day" ng-model="$ctrl.vm.day" placeholder="select a day"
+        select-options="{ data: ['Mon','Tue','Wed','Thu','Fri','Sat','Sun'] }"></ag-select>
 
 <p>using ag-select component</p>
 <ag-select name="agSelect" ng-model="$ctrl.vm.agColor" placeholder="select a color" hint="this is a hint"
   select-options="{ data: $ctrl.colorData }"></ag-select>
 
 <p>rest data from dataApiKey</p>
-<ag-select name="agSelect" ng-model="$ctrl.vm.cust"
-    select-options="{ dataApiKey: 'customer' }"></ag-select>
-  <ag-select name="agSelect" ng-model="$ctrl.vm.custParams"
+
+<ag-select name="agSelect-min" ng-model="$ctrl.vm.cust"
+    select-options="{
+      multiple: true, dataApiKey: 'customer',
+      closeOnSelect: false, minimumInputLength: 1,
+      displayFields:['num', 'name'] }">
+</ag-select>
+
+<ag-select name="agSelect" ng-model="$ctrl.vm.custParams"
     select-options="{ dataApiKey: 'customer', dataApiParams: {country: 'US'} }"></ag-select>
 <ag-select name="agSelect" ng-model="$ctrl.vm.custMulti"
     select-options="{ multiple: true, closeOnSelect: false, showSelectAll:true, dataApiKey: 'customer'}"></ag-select>
-  <ag-select name="agSelect" ng-model="$ctrl.vm.displayFields"
+<ag-select name="agSelect" ng-model="$ctrl.vm.displayFields"
              select-options="{ multiple: true, closeOnSelect: false, showSelectAll:true, dataApiKey: 'customer', displayFields:['name','num']}"></ag-select>
 
 <p>rest data from promise</p>
-<ag-select name="agSelect" ng-model="$ctrl.vm.cust"
+<ag-select name="agSelect" ng-model="$ctrl.vm.cust2"
     select-options="{ data: $ctrl.custApiData }"></ag-select>
 <ag-select name="agSelect" ng-model="$ctrl.vm.custMulti"
     select-options="{ multiple: true, closeOnSelect: false, showSelectAll:true, data: $ctrl.custApiData }"></ag-select>

diff --git a/examples/demo/src/controls/select/selFromData/comp.html b/examples/demo/src/controls/select/selFromData/comp.html
@@ -1,3 +1,4 @@
+
 <form name="selForm" ag-form >
 <ag-select name="singleColor" ng-model="$ctrl.vm.singleColor"
   select-options="$ctrl.singleColorOpts">

diff --git a/examples/demo/src/grids/customGridList/list/list.html b/examples/demo/src/grids/customGridList/list/list.html
@@ -5,7 +5,9 @@
   <gridz ng-if="$ctrl.isConfigured" grid-options="$ctrl.cfg.gridOptions"
         toolbar-options="$ctrl.cfg.toolbarOptions"
         grid-id="basicGrid"
-        list-ctrl="$ctrl">
+        list-ctrl="$ctrl"
+        init-search="{name: 'yo*'}"
+        >
   </gridz>
 
   <pre ng-cloak class="mt-4">vm: {{$ctrl.vm | json}}</pre>

diff --git a/examples/demo/src/grids/routes.js b/examples/demo/src/grids/routes.js
@@ -24,6 +24,7 @@ const gridsStates = {
       }],
       resolve: {
         apiKey: () => 'customer',
+        // gridOptions: () => ({multiSort: true}),
         notification: () => ({
           class: 'is-primary is-light',
           text: 'Uses ui-router to send rest apiKey to generic agGridList component'

diff --git a/examples/demo/src/store/RestStoreApi.js b/examples/demo/src/store/RestStoreApi.js
@@ -1,8 +1,8 @@
 import RestDataApi from 'angle-grinder/src/dataApi/RestDataApi'
-import ky from 'ky'
+import kyApi from 'angle-grinder/src/dataApi/kyApi'
 
 function makeDataApi(endpoint){
-  return new RestDataApi(`${configData.base_url}api/${endpoint}`)
+  return new RestDataApi(`api/${endpoint}`)
 }
 
 /** main holder for api */
@@ -23,7 +23,7 @@ export class RestStoreApi {
   get tag() { return makeDataApi('tag') }
 
   appConfig(configKey) {
-    return ky.get(`api/appConfig/${configKey}`).json()
+    return kyApi.ky.get(`api/appConfig/${configKey}`).json()
   }
 
   /**

diff --git a/examples/grails-demo/src/main.js b/examples/grails-demo/src/main.js
@@ -13,7 +13,7 @@ import './app.config'
 import './AppCtrl'
 
 import './grids'
-import {setClientConfig} from 'angle-grinder/src/dataApi/kyClient'
+import {setClientConfig} from 'angle-grinder/src/dataApi/kyApi'
 
 setClientConfig({prefixUrl: 'http://localhost:8080'})
 $log.debugEnabled(true)
diff --git a/jest.config.js b/jest.config.js
@@ -1,10 +1,10 @@
 module.exports = {
-    testMatch: [ "**/__tests__/**/*.[jt]s?(x)"],
+  testMatch: [ "**/__tests__/**/*.[jt]s?(x)"],
 	// testMatch: ['<rootDir>/svelte/__tests__/specs/**/*.spec.js'],
 	transform: {
 		'^.+\\.m?(j|t)s$': 'babel-jest',
-		// '^.+\\.svelte$': ['svelte-jester', {preprocess: true}],
-		'^.+\\.svelte$': ['svelte-jester'],
+		'^.+\\.svelte$': ['svelte-jester', {preprocess: true}],
+		// '^.+\\.svelte$': ['svelte-jester'],
 		/**
 		* transform any svelte components in node_modules with svelte-jester
 		*/
@@ -17,6 +17,6 @@ module.exports = {
 	},
 	setupFilesAfterEnv: [
 		'@testing-library/jest-dom/extend-expect',
-		"<rootDir>/jest.setup.js"
+		// "<rootDir>/jest.setup.js"
 	]
-};
+};
diff --git a/package.json b/package.json
@@ -53,6 +53,7 @@
     "dayjs": "^1.10.6",
     "dequal": "^2.0.2",
     "dotenv": "^10.0.0",
+    "esm": "^3.2.25",
     "fast-safe-stringify": "^2.0.8",
     "fastclick": "^1.0.6",
     "feather-icons": "^4.28.0",
@@ -86,6 +87,7 @@
     "@babel/plugin-proposal-optional-chaining": "^7.7.5",
     "@babel/plugin-transform-react-jsx": "^7.14.9",
     "@babel/preset-env": "^7.15.6",
+    "@babel/preset-typescript": "^7.16.0",
     "@fullhuman/postcss-purgecss": "^1.3.0",
     "@testing-library/jest-dom": "^5.14.1",
     "angular-mocks": "1.6.10",

diff --git a/src/dataApi/AppConfigApi.js b/src/dataApi/AppConfigApi.js
@@ -1,4 +1,4 @@
-import kyApi from './kyClient'
+import kyApi from './kyApi'
 
 class LocalCache {
   _values = {}
@@ -45,7 +45,7 @@ export class AppConfigApi {
     if (_cache.contains(key)) {
       return _cache.get(key)
     } else {
-      const cfg = await kyApi.client.get(key).json()
+      const cfg = await kyApi.ky.get(key).json()
       _cache.set(key, cfg)
       return cfg
     }

diff --git a/src/dataApi/DataQuery.js b/src/dataApi/DataQuery.js
@@ -0,0 +1,28 @@
+/* eslint-disable no-unused-vars */
+import _ from 'lodash'
+
+export default class DataQuery {
+  //the api endpoint key
+  dataApi = ""
+
+  // the q map or text
+  q
+
+  //qSearch if both using the map criteria in q and a text fuzzy search
+  qSearch
+
+  //initSearch is the initialSearch criteria
+  initSearch
+
+  // when grid is for child or detail data, restrictSearch is what to filter it by,
+  // for example is showing invoices for customer then restrictSearch might be set to {custId:123}
+  restrictSearch
+
+  //sort map
+  sort
+
+  //page info
+  max = '20'
+
+  page = '1'
+}