@formio/reporting 2.0.0-rc.9 → 2.0.1-rc.1

package/lib/components/ReportingControls/ReportingControls.d.ts

@@ -9,21 +9,21 @@ export default class ReportingControls extends ReportingControls_base {
         clearFilters: string;
         performAction: string;
     };
-    get singleFilterOperators(): any;
+    get singleFilterOperators(): string[];
     get reportingConfig(): any;
     get reportingForms(): any;
     get reportingId(): any;
     get formioGrid(): any;
     get controlsSaveKey(): string;
     attach(element: any): any;
-    getFilterComponents(): any;
+    getFilterComponents(): any[];
     getFilterValueCompFromGridComp(gridComp: any, filter: any, ind: any): any;
     toggleFilterClass(filterInstance: any): void;
     getTabs(): any[];
     formatFilterValue(filterSettings: any, value: any): any;
     getActionComponents(applyActionFor: any): any;
     setGridFilters(filters?: {}): void;
-    getGridFilters(): any;
+    getGridFilters(): {} | Exclude<this["formioGrid.options.fetchProvider.defaultFilters"], undefined>;
     downloadPDF(action: any): Promise<void>;
     exportCSV(action: any): void;
     onApplyColumns(): void;

package/lib/components/ReportingGrid/ReportingGrid.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="lodash" />
+import { Utils } from '@formio/js';
 import ReportingUrlFetchProvider from '../../providers/ReportingUrlFetchProvider';
 declare const ReportingGrid_base: any;
 export default class ReportingGrid extends ReportingGrid_base {
@@ -12,13 +14,13 @@ export default class ReportingGrid extends ReportingGrid_base {
     get reportingConfig(): any;
     get reportingForms(): any;
     get reportingId(): any;
-    get visibility(): any;
+    get visibility(): {};
     get fetchProvider(): ReportingUrlFetchProvider;
     get iteratableRows(): any[];
     addReportingColumnProperties(comp: any, columnSettings: any): void;
     getCalculatedColumnSchema(columnSettings: any): any;
-    formatGridComponent(comp: any, columnSettings: any): any;
-    isDefaultColumn(columnReportingSettings: any): any;
+    formatGridComponent(comp: any, columnSettings: any): Utils._.Omit<any, "logic" | "prefix" | "suffix" | "action" | "defaultValue" | "conditional" | "hideLabel" | "calculateValue" | "validate" | "hidden" | "customConditional">;
+    isDefaultColumn(columnReportingSettings: any): boolean;
     addColumnsFromReportingForms(allColumns: any, fieldsGroupedByForm: any): void;
     checkDeconstructions(fieldSettings: any): void;
     checkDeconstructionRequirement(formId: any, compPath: any): void;
@@ -41,7 +43,7 @@ export default class ReportingGrid extends ReportingGrid_base {
         resetValue: () => void;
     };
     customFilters(component: any): any;
-    getGridColumns(): any;
+    getGridColumns(): any[];
     get preview(): any;
     initFormioGrid(FormioGrid: any): Promise<any>;
     transformFetchedData(responseData: any): any;

package/lib/index.d.ts

@@ -15,7 +15,16 @@ declare const _default: {
                 form: string;
             };
         };
-        semantic: {};
+        bootstrap4: {
+            reportingGrid: {
+                form: string;
+            };
+        };
+        semantic: {
+            reportingGrid: {
+                form: string;
+            };
+        };
     };
     utils: typeof ReportingConfigUtils;
     library: string;

package/lib/templates/index.d.ts

@@ -9,6 +9,15 @@ declare const _default: {
             form: string;
         };
     };
-    semantic: {};
+    bootstrap4: {
+        reportingGrid: {
+            form: string;
+        };
+    };
+    semantic: {
+        reportingGrid: {
+            form: string;
+        };
+    };
 };
 export default _default;

package/lib/utils/AggregationOperators/AggregationOperator.d.ts

@@ -9,7 +9,7 @@ export default class AggregationOperator implements IAggregationOperator {
     static getDisplayField(settings: any, reportingConfig?: any): {
         type: string;
     };
-    static getFieldArgs(settings: any): any;
+    static getFieldArgs(settings: any): any[];
     static get acceptedValueTypes(): any[];
     static get operatorTitle(): string;
     static get aggregatedGroupOperator(): boolean;

package/lib/utils/AggregationOperators/Concat.d.ts

@@ -4,13 +4,13 @@ export default class Concat extends AggregationOperator {
     static getDisplayField(settings: any): {
         type: string;
     };
-    static getFieldArgs(settings: any): any;
+    static getFieldArgs(settings: any): any[];
     static get operatorTitle(): string;
     static get acceptedValueTypes(): any[];
     static get aggregatedGroupOperator(): boolean;
     static get aggregatedCalculationOperator(): boolean;
     static get calculationArgs(): string[];
     getRequest(settings: any): {
-        $concat: any;
+        $concat: any[];
     };
 }

package/lib/utils/AggregationOperators/DateDiff.d.ts

@@ -4,7 +4,7 @@ export default class DateDiff extends AggregationOperator {
     static getDisplayField(settings: any, reportingConfig?: any): {
         type: string;
     };
-    static getFieldArgs(settings: any): any;
+    static getFieldArgs(settings: any): any[];
     static get operatorTitle(): string;
     static get acceptedValueTypes(): any[];
     static get aggregatedGroupOperator(): boolean;

package/lib/utils/AggregationOperators/Divide.d.ts

@@ -4,7 +4,7 @@ export default class Divide extends AggregationOperator {
     static getDisplayField(settings: any, reportingConfig?: any): {
         type: string;
     };
-    static getFieldArgs(settings: any): any;
+    static getFieldArgs(settings: any): any[];
     static get operatorTitle(): string;
     static get aggregatedGroupOperator(): boolean;
     static get acceptedValueTypes(): any[];

package/lib/utils/AggregationOperators/Multiply.d.ts

@@ -10,6 +10,6 @@ export default class Multiply extends AggregationOperator {
     static get aggregatedCalculationOperator(): boolean;
     static get calculationArgs(): string[];
     getRequest(settings: any): {
-        $multiply: any;
+        $multiply: string[];
     };
 }

package/lib/utils/AggregationOperators/Subtract.d.ts

@@ -8,7 +8,7 @@ export default class Subtract extends AggregationOperator {
     static get aggregatedGroupOperator(): boolean;
     static get acceptedValueTypes(): any[];
     static get aggregatedCalculationOperator(): boolean;
-    static getFieldArgs(settings: any): any;
+    static getFieldArgs(settings: any): any[];
     static get calculationArgs(): string[];
     getRequest(settings: any): {
         $subtract: string[];

package/lib/utils/AggregationOperators/Sum.d.ts

@@ -10,7 +10,7 @@ export default class Sum extends AggregationOperator {
     static get acceptedValueTypes(): any[];
     static get calculationArgs(): string[];
     getRequest(settings: any): {
-        $sum: any;
+        $sum: string[];
     };
     getGroupRequest(settings: any): {
         $sum: string;

package/lib/utils/AggregationOperators/index.d.ts

@@ -15,7 +15,8 @@ import DayOfMonth from './DayOfMonth';
 import DayOfWeek from './DayOfWeek';
 import DayOfYear from './DayOfYear';
 import Subtract from './Subtract';
+import Percentage from './Percentage';
 declare const AggregationOperators: {
-    [x: string]: typeof Year | typeof DateDiff | typeof Divide | typeof Multiply | typeof Sum | typeof Count | typeof Max | typeof Min | typeof Avg | typeof Concat | typeof Size | typeof Month | typeof Week | typeof DayOfMonth | typeof DayOfWeek | typeof DayOfYear | typeof Subtract;
+    [x: string]: typeof Year | typeof DateDiff | typeof Divide | typeof Multiply | typeof Sum | typeof Count | typeof Max | typeof Min | typeof Avg | typeof Concat | typeof Size | typeof Month | typeof Week | typeof DayOfMonth | typeof DayOfWeek | typeof DayOfYear | typeof Subtract | typeof Percentage;
 };
 export default AggregationOperators;

package/lib/utils/configurationFormUtils.d.ts

@@ -1,18 +1,36 @@
-export declare function getFilterOperatorOptions(operators?: any[]): any;
-export declare function getFilterOperatorsOptionsForCompType(compType: any): any;
-export declare function getControlsFilterOperators(columnSettings: any, reportingForms?: any[], calculatedColumnsSettings?: any[]): any;
-export declare function getUnselectedColumnsOptions(columnsOptions: any, selectedColumns: any): any;
+export declare function getFilterOperatorOptions(operators?: any[]): {
+    label: string;
+    value: string;
+}[];
+export declare function getFilterOperatorsOptionsForCompType(compType: any): {
+    label: string;
+    value: string;
+}[];
+export declare function getControlsFilterOperators(columnSettings: any, reportingForms?: any[], calculatedColumnsSettings?: any[]): {
+    label: string;
+    value: string;
+}[];
+export declare function getUnselectedColumnsOptions(columnsOptions: any, selectedColumns: any): any[];
 export declare function getReportingFormAsOption(form: any): {
     label: any;
     value: any;
 };
-export declare function getConnectionBaseFormOptions(reportingForms: any[], connections: any[], compRowIndex: any): any;
-export declare function getConnectionJoiningFormOptions(reportingForms: any[], connections: any[], compRowIndex: any): any;
+export declare function getConnectionBaseFormOptions(reportingForms: any[], connections: any[], compRowIndex: any): {
+    label: any;
+    value: any;
+}[];
+export declare function getConnectionJoiningFormOptions(reportingForms: any[], connections: any[], compRowIndex: any): {
+    label: any;
+    value: any;
+}[];
 export declare function getConnectionFormComponentsAsOptions(formId: any, reportingForms?: any[]): {
     label: string;
     value: string;
 }[];
-export declare function getAggregationOperatorsOptions(groupOperators?: boolean): any;
+export declare function getAggregationOperatorsOptions(groupOperators?: boolean): {
+    value: string;
+    label: string;
+}[];
 export declare function getReportingFormComponentAsOption(form: any, comp: any, compPath: any): {
     value: {
         path: any;
@@ -32,18 +50,21 @@ export declare function addCalculatedColumnsOptions({ calculatedColumns, options
     options: any;
     operator?: any;
 }): void;
-export declare function getCalculationArgsOptions(reportingForms: any[], calculatedColumns: any[], operator: any, calculatedValueIndex: any): any;
+export declare function getCalculationArgsOptions(reportingForms: any[], calculatedColumns: any[], operator: any, calculatedValueIndex: any): any[];
 export declare function getReportingFormsComponentsAndExtraComponentsAsOptions({ reportingForms, calculatedColumns, selectedItems, operator, }: {
     reportingForms?: any[];
     calculatedColumns?: any[];
     selectedItems?: any[];
     operator?: any;
-}): any;
+}): any[];
 export declare function getColumnsListOptions(reportingForms: any[], groupsSettings: any, calculatedColumns: any): any[];
-export declare function getAvailableColumnsAsOptions(availableColumns: any, columnsList: any): any;
+export declare function getAvailableColumnsAsOptions(availableColumns: any, columnsList: any): any[];
 export declare function getCustomScriptAvailableVarialbles(): string;
-export declare function getDateDiffUnitOptions(operator: any): any;
-export declare function showAggregationOperatorArg(compKey: any, operator: any): any;
+export declare function getDateDiffUnitOptions(operator: any): {
+    label: any;
+    value: any;
+}[];
+export declare function showAggregationOperatorArg(compKey: any, operator: any): boolean;
 export declare function showGroupOperatorArg(operator: any): boolean;
 export declare function getReportTypeInfo(data: any, instance: any): {
     grouping: boolean;

package/lib/utils/controlsUtils.d.ts

@@ -57,7 +57,7 @@ export declare function getColumnsTab(): {
         data?: undefined;
     })[];
 };
-export declare function getSingleFilterOperators(): any;
+export declare function getSingleFilterOperators(): string[];
 export declare function getSingleFilterOperatorValueComp(filter: any): {
     widget: string;
     data: {
@@ -143,7 +143,10 @@ export declare function getActionsTab(actions: any): {
         label: string;
         widget: string;
         data: {
-            values: any;
+            values: {
+                label: any;
+                value: string;
+            }[];
         };
         dataType: string;
         key: string;

package/lib/utils/index.d.ts

@@ -1,3 +1,16 @@
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
 declare const ReportingUtils: {
     FilterOperators: {
         [x: string]: typeof import("@formio/js/lib/cjs/utils/conditionOperators/IsEqualTo").default | typeof import("@formio/js/lib/cjs/utils/conditionOperators/DateGreaterThan").default;
@@ -68,7 +81,7 @@ declare const ReportingUtils: {
             data?: undefined;
         })[];
     };
-    getSingleFilterOperators(): any;
+    getSingleFilterOperators(): string[];
     getSingleFilterOperatorValueComp(filter: any): {
         widget: string;
         data: {
@@ -154,7 +167,10 @@ declare const ReportingUtils: {
             label: string;
             widget: string;
             data: {
-                values: any;
+                values: {
+                    label: any;
+                    value: string;
+                }[];
             };
             dataType: string;
             key: string;
@@ -277,7 +293,7 @@ declare const ReportingUtils: {
     reportingGridConfig: {
         gridKey: string;
     };
-    convertReportingFormCompIntoGridComp(comp: any, columnSettings: any): any;
+    convertReportingFormCompIntoGridComp(comp: any, columnSettings: any): import("lodash").Omit<any, "logic" | "prefix" | "suffix" | "action" | "defaultValue" | "conditional" | "hideLabel" | "calculateValue" | "validate" | "hidden" | "customConditional">;
     getCalcOperatorFieldArgs(columnSettings: any): any;
     convertReportingCalcSettingsIntoGridComp(columnSettings: any, reportingConfig?: any): any;
     getPropertyFromFormId(formId: any): string;
@@ -286,7 +302,7 @@ declare const ReportingUtils: {
     getAggrOperatorNumberField(settings: any, reportingConfig?: any): {
         type: string;
     };
-    _: any;
+    _: import("lodash").LoDashStatic;
     valueTypes: any;
     connectionByFullSubmissionObjectOptionValue: "submissionObject*";
     defaultColumns: {

package/lib/utils/utils.d.ts

@@ -1,6 +1,20 @@
-export declare const _: any;
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+/// <reference types="lodash" />
+import { Utils } from '@formio/js';
+export declare const _: Utils._.LoDashStatic;
 export declare const valueTypes: any;
-export declare function convertReportingFormCompIntoGridComp(comp: any, columnSettings: any): any;
+export declare function convertReportingFormCompIntoGridComp(comp: any, columnSettings: any): Utils._.Omit<any, "logic" | "prefix" | "suffix" | "action" | "defaultValue" | "conditional" | "hideLabel" | "calculateValue" | "validate" | "hidden" | "customConditional">;
 export declare function getCalcOperatorFieldArgs(columnSettings: any): any;
 export declare function convertReportingCalcSettingsIntoGridComp(columnSettings: any, reportingConfig?: any): any;
 export declare function getPropertyFromFormId(formId: any): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/reporting",
-  "version": "2.0.0-rc.9",
+  "version": "2.0.1-rc.1",
   "description": "Reporting components for form.io",
   "main": "reporting.js",
   "scripts": {
@@ -12,7 +12,7 @@
     "build:vm": "rm -rf lib && rm -f build/reporting.vm.js && gulp licenseCheck:noCheck && tsc && gulp templates && webpack --config=config/webpack.vm.js",
     "build": "yarn build:portal && yarn build:vm && yarn build:dist",
     "lint": "tslint -p .",
-    "release": "yarn build && yarn publish ./dist --access public"
+    "release": "yarn build && npm publish ./dist --access public"
   },
   "pre-commit": [
     "lint"
@@ -35,8 +35,8 @@
   "reportConfigVersion": 5,
   "homepage": "https://github.com/formio/reporting#readme",
   "devDependencies": {
-    "@formio/js": "^5.0.0-rc.47",
-    "@formio/license": "^2.0.0-rc.2",
+    "@formio/js": "^5.0.0",
+    "@formio/license": "^2.0.0-rc.9",
     "@types/file-saver": "^2.0.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.1.5",
@@ -45,6 +45,7 @@
     "ejsify": "^1.0.0",
     "esm": "^3.2.25",
     "gulp": "^4.0.2",
+    "gulp-cli": "^3.0.0",
     "gulp-insert": "^0.5.0",
     "gulp-rename": "^2.0.0",
     "gulp-template": "^5.0.0",
@@ -66,7 +67,8 @@
     "webpack-obfuscator": "^3.5.1"
   },
   "peerDependencies": {
-    "@formio/js": "^5.0.0-rc.47"
+    "@formio/js": "^5.0.0",
+    "lodash": "^4.17.21"
   },
   "dependencies": {
     "file-saver": "^2.0.5"