ng-kinintel 0.0.358 → 0.0.388

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-kinintel",
-  "version": "0.0.358",
+  "version": "0.0.388",
   "peerDependencies": {
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9"

package/src/lib/components/alert-groups/alert-groups.component.html

@@ -9,7 +9,7 @@
             </div>
         </div>
         <div class="mt-6 flex flex-col-reverse justify-stretch">
-            <button type="button" [routerLink]="['/alert-groups', 0]"
+            <button type="button" [routerLink]="[routePath, 0]"
                     class="inline-flex items-center justify-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-primary focus:outline-none">
                 Create Alert Group
             </button>
@@ -18,7 +18,7 @@
 </div>
 
 <div class="p-4" *ngIf="!alertGroups.length && !loading">
-    <button type="button" [routerLink]="['/alert-groups', 0]"
+    <button type="button" [routerLink]="[routePath, 0]"
             class="relative block w-full border-2 border-gray-300 border-dashed rounded-lg p-12 text-center hover:border-gray-400 focus:outline-none">
 
         <div class="relative inline-block">
@@ -95,7 +95,7 @@
                         <td class="relative whitespace-nowrap border-gray-200 py-2 px-4 text-right text-sm"
                             [ngClass]="{'border-b-0': i === alertGroups.length - 1, 'border-b': i !== alertGroups.length - 1}">
                             <div class="align-center justify-end">
-                                <button mat-button color="primary" [routerLink]="['/alert-groups', element.id]"> Edit
+                                <button mat-button color="primary" [routerLink]="[routePath, element.id]"> Edit
                                 </button>
                                 <div class="divider"></div>
                                 <div class="divider"></div>

package/src/lib/components/alert-groups/alert-groups.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 import {BehaviorSubject, merge, Subject} from 'rxjs';
 import {debounceTime, map, switchMap} from 'rxjs/operators';
 import {ProjectService} from '../../../lib/services/project.service';
@@ -12,6 +12,8 @@ import moment from 'moment';
 })
 export class AlertGroupsComponent implements OnInit {
 
+    @Input() routePath = '/alert-groups';
+
     public alertGroups: any = [];
     public searchText = new BehaviorSubject('');
     public limit = new BehaviorSubject(10);

package/src/lib/components/alert-groups/edit-alert-group/edit-alert-group.component.html

@@ -81,7 +81,7 @@
 
     <div class="pt-5">
         <div class="flex justify-end">
-            <button type="button" [routerLink]="['/alert-groups']"
+            <button type="button" [routerLink]="[routePath]"
                     class="bg-white py-2 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none">Cancel</button>
             <button type="button" (click)="save()" [disabled]="!alertGroup.title || (!alertGroup.taskTimePeriods || !alertGroup.taskTimePeriods.length) || (!alertGroup.notificationGroups || !alertGroup.notificationGroups.length)"
                     class="disabled:opacity-50 ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-primary focus:outline-none">

package/src/lib/components/alert-groups/edit-alert-group/edit-alert-group.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 import {NotificationService} from '../../../../lib/services/notification.service';
 import {AlertService} from '../../../../lib/services/alert.service';
 import {MatLegacyDialog as MatDialog} from '@angular/material/legacy-dialog';
@@ -14,6 +14,8 @@ import {ActivatedRoute, Router} from '@angular/router';
 })
 export class EditAlertGroupComponent implements OnInit {
 
+    @Input() routePath = '/alert-groups';
+
     public alertGroup: any = {};
     public notificationGroups: any = [];
     public showNewTaskTimePeriod = false;
@@ -66,7 +68,7 @@ export class EditAlertGroupComponent implements OnInit {
 
     public save() {
         this.alertService.saveAlertGroup(this.alertGroup).then(() => {
-            this.router.navigate(['/alert-groups']);
+            this.router.navigate([this.routePath]);
         });
     }
 

package/src/lib/components/dashboards/dashboards.component.html

@@ -91,7 +91,7 @@
                                 [ngClass]="{'border-b-0': i === dashboards.length - 1, 'border-b': i !== dashboards.length - 1}">
                                 <div class="flex flex-col">
                                     <div class="item-title-select flex items-center font-medium cursor-pointer hover:underline"
-                                         [routerLink]="['/dashboards/view/' + element.id]">
+                                         [routerLink]="[viewURL + element.id]">
                                         {{element.title}}
                                     </div>
                                     <div (click)="element.viewDescription = !element.viewDescription"
@@ -110,7 +110,7 @@
                             <td class="relative whitespace-nowrap border-gray-200 py-2 px-4 text-right text-sm font-medium"
                                 [ngClass]="{'border-b-0': i === dashboards.length - 1, 'border-b': i !== dashboards.length - 1}">
                                 <div class="flex items-center justify-end">
-                                    <button mat-button color="primary" [routerLink]="['/dashboards/view/' + element.id]"> View</button>
+                                    <button mat-button color="primary" [routerLink]="[viewURL + element.id]"> View</button>
                                     <div class="divider"></div>
                                     <button color="primary" mat-icon-button [matMenuTriggerFor]="itemMenu">
                                         <mat-icon>more_vert</mat-icon>

package/src/lib/components/dashboards/dashboards.component.ts

@@ -23,6 +23,8 @@ export class DashboardsComponent implements OnInit {
     @Input() allowNew: boolean;
     @Input() admin: boolean;
     @Input() accountId: any;
+    @Input() viewURL = '/dashboards/view/';
+    @Input() editURL: string;
 
     public dashboards: any = [];
     public searchText = new BehaviorSubject('');
@@ -81,17 +83,17 @@ export class DashboardsComponent implements OnInit {
 
     public edit(id) {
         const route = _.filter(this.router.url.split('/'))[0];
-        this.router.navigateByUrl(`${route}/${id}${this.admin ? '?a=true' : ''}`);
+        this.router.navigateByUrl(`${this.editURL || route}/${id}${this.admin ? '?a=true' : ''}`);
     }
 
     public copy(id) {
         const route = _.filter(this.router.url.split('/'))[0];
-        this.router.navigateByUrl(`${route}/copy/${id}${this.admin ? '?a=true' : ''}`);
+        this.router.navigateByUrl(`${this.editURL || route}/copy/${id}${this.admin ? '?a=true' : ''}`);
     }
 
     public extend(id) {
         const route = _.filter(this.router.url.split('/'))[0];
-        this.router.navigateByUrl(`${route}/extend/${id}${this.admin ? '?a=true' : ''}`);
+        this.router.navigateByUrl(`${this.editURL || route}/extend/${id}${this.admin ? '?a=true' : ''}`);
     }
 
     public delete(id) {

package/src/lib/components/dataset/dataset-editor/dataset-add-join/dataset-add-join.component.ts

@@ -342,7 +342,7 @@ export class DatasetAddJoinComponent implements OnInit {
                 filters: [{
                     lhsExpression: '',
                     rhsExpression: '',
-                    filterType: ''
+                    filterType: 'eq'
                 }],
                 filterJunctions: []
             };

package/src/lib/components/dataset/dataset-editor/dataset-editor.component.html

@@ -320,7 +320,7 @@
         <div class="example-list flex flex-wrap" cdkDropListGroup>
             <ng-template ngFor let-transformation [ngForOf]="terminatingTransformations" let-i="index">
                 <div cdkDropList (cdkDropListDropped)="drop($event)" cdkDropListOrientation="horizontal"
-                     [cdkDropListData]="{item:transformation,index:i}">
+                     [cdkDropListData]="{item:transformation,index:i}" *ngIf="!transformation.hidden">
                     <div class="flex items-center">
                         <div class="new-transformation flex items-center justify-center w-6 h-6">
                             <a [matMenuTriggerFor]="addTransformation"

package/src/lib/components/datasource/create-datasource/advanced-settings/advanced-settings.component.ts

@@ -92,6 +92,10 @@ export class AdvancedSettingsComponent implements OnInit {
 
     public async saveChanges() {
         this.errorMessage = '';
+
+        // Map the importKey so it doesn't get wiped.
+        this.datasourceUpdate.importKey = this.datasourceUpdate.instanceImportKey;
+
         this.datasourceUpdate.indexes = _.filter(this.advancedSettings.indexes, index => {
             return index.fieldNames.length;
         });

package/src/lib/components/datasource/create-datasource/api-access/api-access.component.html

@@ -31,63 +31,108 @@
                 <div class="text-sm mb-2">
                     Return the data for this datasource.
                     <br><br>
-                    Filtering of the returned data can be effected by supplying parameters of the format <b>filter_COLUMNNAME</b>.  The parameter value can either be
-                    simply a value for exact match filtering or a value followed by a | and a match type which should be one of the following values:
+                    Filtering of the returned data can be effected by supplying parameters of the format <b>FIELD_MATCHTYPE</b>
+                    where FIELD matches one of
+                    the field names defined in the data source and MATCHTYPE should be one of the following values.
                     <br><br>
                     <table>
+                        <tr>
+                            <th>Match Type</th>
+                            <th>Description</th>
+                            <th>Example</th>
+                        </tr>
                         <tr>
                             <td>eq</td>
                             <td>for an equals match</td>
+                            <td>id_eq=3</td>
                         </tr>
                         <tr>
                             <td>neq</td>
                             <td>for a not equals match</td>
+                            <td>id_neq=7</td>
                         </tr>
                         <tr>
-                            <td>null</td>
+                            <td>isnull</td>
                             <td>for a null match</td>
+                            <td>id_isnull=1</td>
                         </tr>
                         <tr>
-                            <td>notnull</td>
+                            <td>isnotnull</td>
                             <td>for a not null match</td>
+                            <td>id_isnotnull=1</td>
                         </tr>
                         <tr>
                             <td>gt</td>
                             <td>for a greater than match</td>
+                            <td>id_gt=1</td>
                         </tr>
                         <tr>
                             <td>lt</td>
                             <td>for a less than match</td>
+                            <td>id_lt=1</td>
                         </tr>
                         <tr>
                             <td>gte</td>
                             <td>for a greater than or equals match</td>
+                            <td>id_gte=1</td>
                         </tr>
                         <tr>
                             <td>lte</td>
                             <td>for a less than or equals match</td>
+                            <td>id_lte=10</td>
                         </tr>
                         <tr>
                             <td>startswith</td>
                             <td>for a string starts with match</td>
+                            <td>name_startswith=app</td>
                         </tr>
                         <tr>
                             <td>endswith</td>
                             <td>for a string ends with match</td>
+                            <td>name_endswith=app</td>
                         </tr>
                         <tr>
                             <td>contains</td>
-                            <td>or a string contains match</td>
+                            <td>for a string contains match</td>
+                            <td>name_contains=app</td>
+                        </tr>
+                        <tr>
+                            <td>like</td>
+                            <td>for a wildcard or regular expression match. Simple wildcards can be supplied using * for
+                                one or more characters. Regular expressions
+                                can be supplied by surrounding the value with / delimiters.
+                            </td>
+                            <td>name_like=ap*, name_like=/^ap.*le$/</td>
+                        </tr>
+                        <tr>
+                            <td>in</td>
+                            <td>for where the value is one of a list supplied in comma separated format</td>
+                            <td>name_in="apple,pear,banana"</td>
+                        </tr>
+                        <tr>
+                            <td>notin</td>
+                            <td>for where the value is not one of a list supplied in comma separated format</td>
+                            <td>name_notin="apple,pear,banana"</td>
                         </tr>
                     </table>
                     <br><br>
-                    Results can be sorted by supplying a <b>sort</b> parameter which identifies columns to sort and directions (either asc or desc) using pipe separation
+                    Alternatively, advanced queries can be supplied using the built in Data Query Language passed as a <b>query</b> parameter which should be suitable URL encoded.
+                    <br><br>
+                    e.g.  <code>query=((id >= 5 && name like 'app*') || id < 3)</code>
+                    <br><br>
+                    Results can be sorted by supplying a <b>sort</b> parameter which identifies columns to sort and
+                    directions (either asc or desc) using pipe separation
                     <br><br>
-                    By default the first 100 rows will be returned.  Paging can be achieved by supplying
+                    By default the first 100 rows will be returned. Paging can be achieved by supplying
                     <b>limit</b> and <b>offset</b> parameters.
                 </div>
                 <div #list class=" bg-gray-800 border-2 border-gray-900 text-white rounded-md p-4">
-                    <pre class="whitespace-normal">curl -H <span class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre><pre class="whitespace-normal"> -X <b>GET</b> <span class="text-cta">{{backendURL}}/api/tabularData/{{datasourceUpdate.instanceImportKey}}?{{listQueryString}}&limit=50&offset=10</span></pre>
+                    <pre class="whitespace-normal">curl -H <span
+                        class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span
+                        class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre>
+                    <pre class="whitespace-normal"> -X <b>GET</b> <span class="text-cta">{{backendURL}}
+                        /api/tabularData/{{datasourceUpdate.instanceImportKey}}?{{listQueryString}}
+                        &limit=50&offset=10</span></pre>
                 </div>
                 <button mat-icon-button [cdkCopyToClipboard]="list.textContent" (cdkCopyToClipboardCopied)="copied()"
                         class="text-white absolute bottom-0 right-0">
@@ -102,7 +147,11 @@
                     Insert a set of new rows to the data source identified by the passed import key
                 </div>
                 <div #create class=" bg-gray-800 border-2 border-gray-900 text-white rounded-md p-4">
-            <pre class="whitespace-normal">curl -H <span class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre><pre class="whitespace-normal"> -X <b>POST</b> <span class="text-cta">{{backendURL}}/api/tabularData/{{datasourceUpdate.instanceImportKey}}</span></pre>
+                    <pre class="whitespace-normal">curl -H <span
+                        class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span
+                        class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre>
+                    <pre class="whitespace-normal"> -X <b>POST</b> <span class="text-cta">{{backendURL}}
+                        /api/tabularData/{{datasourceUpdate.instanceImportKey}}</span></pre>
                 </div>
                 <button mat-icon-button [cdkCopyToClipboard]="create.textContent" (cdkCopyToClipboardCopied)="copied()"
                         class="text-white absolute bottom-0 right-0">
@@ -118,11 +167,15 @@
             <div class="relative w-full">
                 <div class="text-base font-semibold">Replace</div>
                 <div class="text-sm mb-2">
-                    Replace a set of rows to the data source identified by the passed import key.  This will perform
+                    Replace a set of rows to the data source identified by the passed import key. This will perform
                     an insert or update depending on whether the row already exists according to the unique key.
                 </div>
                 <div #replace class="relative bg-gray-800 border-2 border-gray-900 text-white rounded-md p-4">
-            <pre class="whitespace-normal">curl -H <span class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre><pre class="whitespace-normal"> -X <b>PATCH</b> <span class="text-cta">{{backendURL}}/api/tabularData/{{datasourceUpdate.instanceImportKey}}</span></pre>
+                    <pre class="whitespace-normal">curl -H <span
+                        class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span
+                        class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre>
+                    <pre class="whitespace-normal"> -X <b>PATCH</b> <span class="text-cta">{{backendURL}}
+                        /api/tabularData/{{datasourceUpdate.instanceImportKey}}</span></pre>
                 </div>
                 <button mat-icon-button [cdkCopyToClipboard]="replace.textContent"
                         class="text-white absolute bottom-0 right-0">
@@ -137,11 +190,15 @@
             <div class="relative w-full">
                 <div class="text-base font-semibold">Update</div>
                 <div class="text-sm mb-2">
-                    Update a set of rows to the data source identified by the passed import key.  This will perform
+                    Update a set of rows to the data source identified by the passed import key. This will perform
                     an update based upon the unique key and will not add any new rows if they don't already exist.
                 </div>
                 <div #update class="relative bg-gray-800 border-2 border-gray-900 text-white rounded-md p-4">
-            <pre class="whitespace-normal">curl -H <span class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre><pre class="whitespace-normal"> -X <b>PUT</b> <span class="text-cta">{{backendURL}}/api/tabularData/{{datasourceUpdate.instanceImportKey}}</span></pre>
+                    <pre class="whitespace-normal">curl -H <span
+                        class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span
+                        class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre>
+                    <pre class="whitespace-normal"> -X <b>PUT</b> <span class="text-cta">{{backendURL}}
+                        /api/tabularData/{{datasourceUpdate.instanceImportKey}}</span></pre>
                 </div>
                 <button mat-icon-button [cdkCopyToClipboard]="update.textContent"
                         class="text-white absolute bottom-0 right-0">
@@ -156,10 +213,15 @@
             <div class="relative w-full">
                 <div class="text-base font-semibold">Delete</div>
                 <div class="text-sm mb-2">
-                    Delete a set of rows explicitly by unique key for the data source identified by the passed import key.
+                    Delete a set of rows explicitly by unique key for the data source identified by the passed import
+                    key.
                 </div>
                 <div #delete class="relative bg-gray-800 border-2 border-gray-900 text-white rounded-md p-4">
-            <pre class="whitespace-normal">curl -H <span class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre><pre class="whitespace-normal"> -X <b>DELETE</b> <span class="text-cta">{{backendURL}}/api/tabularData/{{datasourceUpdate.instanceImportKey}}</span></pre>
+                    <pre class="whitespace-normal">curl -H <span
+                        class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span
+                        class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre>
+                    <pre class="whitespace-normal"> -X <b>DELETE</b> <span class="text-cta">{{backendURL}}
+                        /api/tabularData/{{datasourceUpdate.instanceImportKey}}</span></pre>
                 </div>
                 <button mat-icon-button [cdkCopyToClipboard]="delete.textContent"
                         class="text-white absolute bottom-0 right-0">
@@ -175,9 +237,11 @@
             <div class="relative w-full">
                 <div class="text-base font-semibold">Filtered Delete</div>
                 <div class="text-sm mb-2">
-                    Delete a set of rows using one or more filter expressions additively to identify the rows for deletion for the data source identified by the passed import key.
+                    Delete a set of rows using one or more filter expressions additively to identify the rows for
+                    deletion for the data source identified by the passed import key.
                     <br><br>
-                    Filters are supplied as objects containing a column name supplied as the <b>column</b> property, a match value supplied as the <b>value</b> property and a match type supplied as
+                    Filters are supplied as objects containing a column name supplied as the <b>column</b> property, a
+                    match value supplied as the <b>value</b> property and a match type supplied as
                     the <b>matchType</b> property.
                     <br><br>
                     Possible values for the <b>matchType</b> are:<br><br>
@@ -231,7 +295,11 @@
 
                 </div>
                 <div #deleteFiltered class="relative bg-gray-800 border-2 border-gray-900 text-white rounded-md p-4">
-                    <pre class="whitespace-normal">curl -H <span class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre><pre class="whitespace-normal"> -X <b>DELETE</b> <span class="text-cta">{{backendURL}}/api/tabularData/filtered/{{datasourceUpdate.instanceImportKey}}</span></pre>
+                    <pre class="whitespace-normal">curl -H <span
+                        class="text-cta">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey : '[[apiKey]]'}}</b>"</span> -H <span
+                        class="text-cta">"API-SECRET:<b>{{apiKeys ? apiKeys.apiSecret : '[[apiSecret]]'}}</b>"</span></pre>
+                    <pre class="whitespace-normal"> -X <b>DELETE</b> <span class="text-cta">{{backendURL}}
+                        /api/tabularData/filtered/{{datasourceUpdate.instanceImportKey}}</span></pre>
                 </div>
                 <button mat-icon-button [cdkCopyToClipboard]="deleteFiltered.textContent"
                         class="text-white absolute bottom-0 right-0">

package/src/lib/components/datasource/create-datasource/api-access/api-access.component.ts

@@ -52,9 +52,9 @@ export class ApiAccessComponent implements OnInit {
                     example.push(', ');
                 }
             }
-            this.listQueryString += 'filter_' + column.name + '=VALUE&';
+            this.listQueryString += column.name + '_eq=VALUE&';
             if (index == this.columns.length - 1)
-                this.listQueryString += 'sort=' + column.name + '|desc';
+                this.listQueryString += 'query=' + column.name + '+isnotnull&sort=' + column.name + '|desc';
         });
         example.push('}]');
         this.createExample = example.join('');

package/src/lib/components/datasource/create-datasource/create-datasource.component.html

@@ -30,7 +30,7 @@
             <mat-icon class="text-xl">tune</mat-icon>
             advanced
         </button>
-        <button *ngIf="!editMode" (click)="apiAccess()" [disabled]="!datasourceInstanceKey"
+        <button *ngIf="!editMode && !hideAPIAccess" (click)="apiAccess()" [disabled]="!datasourceInstanceKey"
                 class="disabled:opacity-50 w-20 flex flex-col items-center justify-center py-1 px-2 text-xs text-gray-600 cursor-pointer hover:bg-gray-100">
             <mat-icon class="text-xl">api</mat-icon>
             api access

package/src/lib/components/datasource/create-datasource/create-datasource.component.ts

@@ -20,6 +20,7 @@ import {
 } from '../create-datasource/import-data/import-wizard/import-wizard.component';
 import {BehaviorSubject} from 'rxjs';
 import {CreateDatasetComponent} from '../../dataset/create-dataset/create-dataset.component';
+import shortHash from 'short-hash';
 
 
 declare var window: any;
@@ -37,6 +38,8 @@ export class CreateDatasourceComponent implements OnInit, AfterViewInit, OnDestr
     @Input() backendURL: string;
     @Input() namePrefix = '';
     @Input() readonly = false;
+    @Input() automaticImportKey: boolean = false;
+    @Input() hideAPIAccess: boolean = false;
     @Input() editColumns = true;
     @Input() filterJunction = {
         logic: 'AND',
@@ -144,7 +147,8 @@ export class CreateDatasourceComponent implements OnInit, AfterViewInit, OnDestr
                     rows: this.rows,
                     datasourceInstanceKey: this.datasourceInstanceKey,
                     reloadURL: this.reloadURL,
-                    namePrefix: this.namePrefix
+                    namePrefix: this.namePrefix,
+                    automaticImportKey: this.automaticImportKey
                 }
             });
             dialogRef.afterClosed().subscribe(res => {
@@ -506,7 +510,13 @@ export class CreateDatasourceComponent implements OnInit, AfterViewInit, OnDestr
         // Reset invalid items
         this.invalidItems = [];
 
+
         if (!this.datasourceInstanceKey) {
+
+            if (this.automaticImportKey){
+                this.datasourceUpdate.importKey = shortHash(Date.now().toString());
+            }
+
             await this.datasourceService.createCustomDatasource(this.datasourceUpdate).then(key => {
                 if (!exit) {
                     window.location.href = this.reloadURL + '/' + key;
@@ -530,9 +540,7 @@ export class CreateDatasourceComponent implements OnInit, AfterViewInit, OnDestr
 
                         const invalidAddRows = _.map(result.validationErrors.add || [], 'itemNumber');
                         for (let i = this.adds.length - 1; i >= 0; i--) {
-                            if (!invalidAddRows.includes(i)) {
-                                this.adds.splice(i, 1);
-                            } else {
+                            if (invalidAddRows.includes(i)) {
                                 this.invalidItems[this.adds[i]] = _.find(result.validationErrors.add, {itemNumber: i}).validationErrors;
                             }
                         }
@@ -540,9 +548,7 @@ export class CreateDatasourceComponent implements OnInit, AfterViewInit, OnDestr
 
                         const invalidUpdateRows = _.map(result.validationErrors.update || [], 'itemNumber');
                         for (let i = this.updates.length - 1; i >= 0; i--) {
-                            if (!invalidUpdateRows.includes(i)) {
-                                this.updates.splice(i, 1);
-                            } else {
+                            if (invalidUpdateRows.includes(i)) {
                                 this.invalidItems[this.updates[i]] = _.find(result.validationErrors.update, {itemNumber: i}).validationErrors;
                             }
                         }

package/src/lib/components/datasource/create-datasource/import-data/import-data.component.ts

@@ -152,7 +152,6 @@ export class ImportDataComponent implements OnInit {
 
         if (result && result.rejected > 0) {
            this.importErrors = Object.values(result.validationErrors)[0];
-           console.log(this.importErrors);
         } else {
            window.location.href = this.reloadURL + '/' + this.datasourceInstanceKey;
         }

package/src/lib/components/datasource/create-datasource/import-data/import-wizard/import-wizard.component.ts

@@ -12,6 +12,7 @@ import {DatasourceService} from '../../../../../services/datasource.service';
 import {HttpClient} from '@angular/common/http';
 import {MatLegacySnackBar as MatSnackBar} from '@angular/material/legacy-snack-bar';
 import {KinintelModuleConfig} from '../../../../../../lib/ng-kinintel.module';
+import shortHash from 'short-hash';
 
 const _ = lodash.default;
 
@@ -161,6 +162,9 @@ export class ImportWizardComponent implements OnInit {
             this.datasourceUpdate.fields.push(column);
         });
 
+        if (this.data.automaticImportKey)
+            this.datasourceUpdate.importKey = shortHash(Date.now().toString());
+
         const key = await this.datasourceService.createCustomDatasource(this.datasourceUpdate);
 
         if (this.importKey) {

package/src/lib/components/datasource/document-datasource/document-datasource.component.ts

@@ -292,6 +292,10 @@ export class DocumentDatasourceComponent implements OnInit {
                     {
                         title: 'WTSA',
                         value: 'wtsa'
+                    },
+                    {
+                        title: 'WTDC',
+                        value: 'wtdc'
                     }
                 ];
             })

package/src/lib/components/feeds/feed/feed.component.html

@@ -36,7 +36,8 @@
                                            [ngClass]="{'border-red-600': !!error}"
                                            placeholder="my-new-data-feed" [(ngModel)]="feed.path">
                                 </div>
-                                <small *ngIf="!error" class="font-normal">The path used to identify this API Connection</small>
+                                <small *ngIf="!error" class="font-normal">The path used to identify this API
+                                    Connection</small>
                                 <small *ngIf="error" class="font-normal text-red-600">{{error}}</small>
 
                             </div>
@@ -68,15 +69,17 @@
                             </label>
                             <div class="flex flex-col mt-1 sm:col-span-2 sm:mt-0">
                                 <mat-checkbox class="example-margin" [(ngModel)]="cacheEnabled"
-                                    (ngModelChange)="updateCacheEnabled($event)">
-                                    Enable API Caching</mat-checkbox>
+                                              (ngModelChange)="updateCacheEnabled($event)">
+                                    Enable API Caching
+                                </mat-checkbox>
 
                                 <div class="flex mt-4" *ngIf="cacheEnabled">
                                       <span
                                           class="inline-flex items-center px-3 rounded-l border border-r-0 border-gray-300 bg-gray-50 text-gray-500 text-sm">
                                         Cache time in seconds
                                       </span>
-                                    <input type="number" class="w-full rounded-l-none flex-1" placeholder="time in seconds"
+                                    <input type="number" class="w-full rounded-l-none flex-1"
+                                           placeholder="time in seconds"
                                            [(ngModel)]="feed.cacheTimeSeconds">
                                 </div>
                                 <small class="font-normal">Enable caching to reduce requests to the server. Setting
@@ -122,8 +125,48 @@
                                         {{param.title}}
                                     </mat-list-option>
                                 </mat-selection-list>
+                                <small class="font-normal">If selected, these parameters will be available to be
+                                    supplied as request parameters with names matching the parameter names.</small>
                             </div>
                         </div>
+
+                        <div *ngIf="feedDataset"
+                             class="sm:grid sm:grid-cols-3 sm:items-start sm:gap-4 sm:border-t sm:border-gray-200 sm:pt-5">
+                            <label class="block text-sm font-medium text-gray-700 sm:mt-px sm:pt-2">
+                                Advanced Querying
+                            </label>
+                            <div class="flex flex-col mt-1 sm:col-span-2 sm:mt-0">
+                                <mat-checkbox class="example-margin" [(ngModel)]="feed.adhocFiltering">
+                                    Enable Adhoc Filtering
+                                </mat-checkbox>
+                                <small class="font-normal">Adhoc filtering allows adhoc field filters to be supplied as
+                                    request parameters
+                                    in the format field_operator=value</small>
+
+
+                                <mat-checkbox class="example-margin mt-3" [(ngModel)]="feed.advancedQuerying">
+                                    Enable Advanced Querying
+                                </mat-checkbox>
+
+                                <div class="flex mt-4" *ngIf="feed.advancedQuerying">
+                                      <span
+                                          class="inline-flex items-center px-3 rounded-l border border-r-0 border-gray-300 bg-gray-50 text-gray-500 text-sm">
+                                       Request Parameter Name
+                                      </span>
+                                    <input type="text" class="w-full rounded-l-none flex-1"
+                                           placeholder="Parameter name"
+                                           [(ngModel)]="feed.advancedQueryParameterName">
+                                </div>
+
+                                <small class="font-normal">Advanced querying allows for advanced queries to be supplied as a query string with nested
+                                boolean logic.</small>
+                            </div>
+
+
+
+                        </div>
+
+
                     </div>
                 </div>
             </div>

package/src/lib/components/feeds/feeds.component.html

@@ -83,7 +83,7 @@
                         <tbody *ngFor="let feed of feeds" class="hover:bg-gray-50">
                         <tr class="hover:bg-gray-50">
                             <td [ngClass]="{'border-b': !feed._showExample, 'border-b-0': feed._showExample}"
-                                class="whitespace-nowrap border-gray-200 px-4 py-2 text-sm font-medium text-gray-900">
+                                class="border-gray-200 px-4 py-2 text-sm font-medium text-gray-900">
                                 <div class="flex items-center">
                                     {{feedUrl}}{{feed.path}}
                                     <mat-icon color="primary" class="ml-2 text-sm cursor-pointer"
@@ -92,13 +92,13 @@
                                 </div>
                             </td>
                             <td [ngClass]="{'border-b': !feed._showExample, 'border-b-0': feed._showExample}"
-                                class="whitespace-nowrap border-gray-200 px-4 py-2 text-sm text-gray-500">
+                                class="border-gray-200 px-4 py-2 text-sm text-gray-500">
                                 <a class="primary hover:underline font-medium"
                                    (click)="view(feed.datasetInstanceId)">
                                     {{feed.datasetLabel ? feed.datasetLabel.title : ''}}</a>
                             </td>
                             <td [ngClass]="{'border-b': !feed._showExample, 'border-b-0': feed._showExample}"
-                                class="whitespace-nowrap border-gray-200 px-4 py-2 text-sm text-gray-500">
+                                class="border-gray-200 px-4 py-2 text-sm text-gray-500">
                                 {{feed.exposedParameterNames.join(', ')}}
                             </td>
                             <td [ngClass]="{'border-b': !feed._showExample, 'border-b-0': feed._showExample}"

package/src/lib/components/shared-with-me/feed-api-modal/feed-api-modal.component.html

@@ -43,7 +43,67 @@ curl -H <span class="text-emerald-400">"API-KEY:<b>{{apiKeys ? apiKeys.apiKey :
             </button>
         </div>
 
+        <div class="text-sm my-4">
+            <div class="mb-4 font-medium text-base">
+                Example request parameters
+            </div>
 
+            <div class="mb-4">
+                Filtering of the returned data can be effected by supplying parameters of the format <b>filter_COLUMNNAME</b>.  The parameter value can either be
+                simply a value for exact match filtering or a value followed by a | and a match type which should be one of the following values:
+            </div>
+            <table>
+                <tr>
+                    <td>eq</td>
+                    <td>for an equals match</td>
+                </tr>
+                <tr>
+                    <td>neq</td>
+                    <td>for a not equals match</td>
+                </tr>
+                <tr>
+                    <td>null</td>
+                    <td>for a null match</td>
+                </tr>
+                <tr>
+                    <td>notnull</td>
+                    <td>for a not null match</td>
+                </tr>
+                <tr>
+                    <td>gt</td>
+                    <td>for a greater than match</td>
+                </tr>
+                <tr>
+                    <td>lt</td>
+                    <td>for a less than match</td>
+                </tr>
+                <tr>
+                    <td>gte</td>
+                    <td>for a greater than or equals match</td>
+                </tr>
+                <tr>
+                    <td>lte</td>
+                    <td>for a less than or equals match</td>
+                </tr>
+                <tr>
+                    <td>startswith</td>
+                    <td>for a string starts with match</td>
+                </tr>
+                <tr>
+                    <td>endswith</td>
+                    <td>for a string ends with match</td>
+                </tr>
+                <tr>
+                    <td>contains</td>
+                    <td>or a string contains match</td>
+                </tr>
+            </table>
+            <br><br>
+            Results can be sorted by supplying a <b>sort</b> parameter which identifies columns to sort and directions (either asc or desc) using pipe separation
+            <br><br>
+            By default the first 100 rows will be returned.  Paging can be achieved by supplying
+            <b>limit</b> and <b>offset</b> parameters.
+        </div>
 
     </div>
 

package/src/lib/components/shared-with-me/shared-with-me.component.html

@@ -59,17 +59,17 @@
                     </tr>
                     <ng-template [ngIf]="datasets.length">
                         <tbody *ngFor="let item of datasets" class="hover:bg-gray-50">
-                        <tr class="hover:bg-gray-50">
-                            <td class="border-b whitespace-nowrap border-gray-200 px-4 py-2 text-sm font-medium text-gray-900">
+                        <tr class="hover:bg-gray-50 cursor-pointer">
+                            <td (click)="extend(item.id)" class="border-b whitespace-nowrap border-gray-200 px-4 py-2 text-sm font-medium text-gray-900">
                                 {{ (item.title || '').replace((nameReplaceString || ''), '') }}
                             </td>
-                            <td class="border-b whitespace-nowrap border-gray-200 px-4 py-2 text-sm text-gray-500">
+                            <td (click)="extend(item.id)" class="border-b whitespace-nowrap border-gray-200 px-4 py-2 text-sm text-gray-500">
                                 {{ item.owningAccountName }}
                             </td>
                             <td class="border-b whitespace-nowrap border-gray-200 text-right px-4 py-2 text-sm text-gray-500">
                                 <div class="flex items-center justify-end">
                                     <button mat-button color="primary" (click)="apiAccess(item)" [disabled]="item._loadingAPI">
-                                        <span *ngIf="!item._loadingAPI">API Access</span>
+                                        <span *ngIf="!item._loadingAPI">API</span>
                                         <span *ngIf="item._loadingAPI" class="flex items-center">
                                             <svg class="animate-spin -ml-1 mr-2 h-4 w-4 text-gray-400"
                                                  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
@@ -84,7 +84,7 @@
 
                                     <div class="divider"></div>
                                     <button mat-button color="primary" (click)="extend(item.id)">
-                                        Create Query
+                                        View
                                     </button>
                                 </div>
                             </td>

package/src/lib/components/shared-with-me/shared-with-me.component.ts

@@ -30,6 +30,7 @@ export class SharedWithMeComponent implements OnInit {
     @Input() datasetEditorReadonly = false;
     @Input() nameReplaceString: string;
     @Input() feedUrl: string;
+    @Input() apiDocsUrl: string = '';
 
     public datasets: any = [];
     public searchText = new BehaviorSubject('');
@@ -98,7 +99,9 @@ export class SharedWithMeComponent implements OnInit {
                 path: hash,
                 datasetInstanceId: dataset.id,
                 datasetLabel: dataset,
-                exporterKey: 'json'
+                exporterKey: 'json',
+                advancedQuerying: true,
+                adhocFiltering: true
             };
 
             feedId = await this.feedService.saveFeed(feedData);
@@ -109,18 +112,23 @@ export class SharedWithMeComponent implements OnInit {
         const feed = await this.feedService.getFeed(feedId);
         dataset._loadingAPI = false;
 
-        const dialog = this.dialog.open(FeedApiModalComponent, {
-            width: '700px',
-            height: '450px',
-            data: {
-                feed,
-                feedUrl: this.feedUrl
-            }
-        });
+        if (this.apiDocsUrl) {
+            window.location.href = this.apiDocsUrl + "?sharedDatasetId=" + dataset.id;
+        } else {
+            const dialog = this.dialog.open(FeedApiModalComponent, {
+                width: '700px',
+                height: '650px',
+                data: {
+                    feed,
+                    feedUrl: this.feedUrl
+                }
+            });
+        }
     }
 
     public getDatasets() {
-        return this.datasetService.getAccountSharedDatasets(this.searchText.getValue(), this.limit, this.offset).toPromise();
+        const searchString = this.nameReplaceString + this.searchText.getValue();
+        return this.datasetService.getAccountSharedDatasets(searchString, this.limit, this.offset).toPromise();
     }
 
     // Create extended dataset from source id.

package/src/lib/services/datasource.service.ts

@@ -35,10 +35,9 @@ export class DatasourceService {
             .toPromise();
     }
 
-    public getDatasources(filterString = '', limit = '10', offset = '0', noProject = false) {
+    public getDatasources(filterString = '', limit = '10', offset = '0', noProject = false, projectKey = '') {
         const project = this.projectService.activeProject.getValue() ? this.projectService.activeProject.getValue().projectKey : '';
-        const projectKey = noProject ? '' : project;
-        return this.http.get(this.config.backendURL + '/datasource?projectKey=' + projectKey, {
+        return this.http.get(this.config.backendURL + '/datasource?projectKey=' + (noProject ? '' : projectKey || project), {
             params: {
                 filterString, limit, offset
             }