Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AppBuilder/ABFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { nanoid } from "nanoid";
import { v4 as uuidv4 } from "uuid";
import performance from "../utils/performance";
import FilterComplex from "./platform/FilterComplex";
import SortPopup from "./platform/views/ABViewGridPopupSortFields";
import SortPopup from "./platform/views/ABViewPopupSortFields";
import Papa from "papaparse";

//
Expand Down
3 changes: 3 additions & 0 deletions AppBuilder/platform/ABClassManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import ABViewEditorPlugin from "./plugins/ABViewEditorPlugin.js";
import ABViewContainer from "./views/ABViewContainer.js";
import ABViewContainerComponent from "./views/viewComponent/ABViewContainerComponent.js";

import ABViewPopupSortFields from "./views/ABViewPopupSortFields.js";

// view property helpers used by plugins
import ABViewPropertyFilterData from "./views/viewProperties/ABViewPropertyFilterData";
import ABViewPropertyLinkPage from "./views/viewProperties/ABViewPropertyLinkPage";
Expand Down Expand Up @@ -74,6 +76,7 @@ export function getPluginAPI() {
ABViewPropertyLinkPage,
ABViewRuleListFormRecordRules,
ABViewRuleListFormSubmitRules,
ABViewPopupSortFields,
// ABFieldPlugin,
// ABViewPlugin,
};
Expand Down
3 changes: 2 additions & 1 deletion AppBuilder/platform/dataFields/ABFieldList.js
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ function _getSelectedOptions(field, rowData = {}) {
result = rowData[field.columnName];

try {
if (typeof result == "string") result = JSON.parse(result);
if (typeof result == "string" && result !== "") result = JSON.parse(result);
else if (typeof result == "string" && result === "") result = [];
} catch (e) {
console.error(`Error JSON.pars()ing result [${result}]: `, e);
// just go with what is there
Expand Down
3 changes: 3 additions & 0 deletions AppBuilder/platform/plugins/included/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import viewGrid from "./view_grid/FNAbviewgrid.js";
import viewCarousel from "./view_carousel/FNAbviewcarousel.js";
import viewChart from "./view_chart/FNAbviewchart.js";
import viewComment from "./view_comment/FNAbviewcomment.js";
Expand Down Expand Up @@ -36,6 +37,8 @@ const AllPlugins = [
viewPivot,
viewTab,
viewText,
viewDataview,
viewGrid
];

export default {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* formats.
*/

import ClassUI from "../../../ui/ClassUI";
import ClassUI from "../../../../../ui/ClassUI";

export default class ABWorkObjectPopupExport extends ClassUI {
constructor(idBase) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*
*/

import ClassUI from "../../../ui/ClassUI";
import RowUpdater from "../RowUpdater";
import ClassUI from "../../../../../ui/ClassUI";
import RowUpdater from "../../../RowUpdater";

var L = null;

Expand Down
Loading
Loading