@onehat/ui 0.4.77 → 0.4.78

package/src/Components/index.js

@@ -2,7 +2,6 @@ import {
 	HStackNative,
 	VStackNative,
 } from '@project-components/Gluestack';
-import clsx from 'clsx';
 import AddressBook from './Icons/AddressBook.js';
 import Alt from './Icons/Alt.js';
 import AngleLeft from './Icons/AngleLeft.js';
@@ -191,6 +190,52 @@ import Video from './Icons/Video.js';
 import X from './Icons/X.js';
 import Xmark from './Icons/Xmark.js';
 
+// import AttachmentsCombo from './Form/Field/Combo/AttachmentsCombo.js';
+// import AttachmentsComboEditor from './Form/Field/Combo/AttachmentsComboEditor.js';
+// import AttachmentsTag from './Form/Field/Tag/AttachmentsTag.js';
+// import AttachmentsTagEditor from './Form/Field/Tag/AttachmentsTagEditor.js';
+// import AttachmentsGrid from './Grid/AttachmentsGrid.js';
+// import AttachmentsGridEditor from './Grid/AttachmentsGridEditor.js';
+// import AttachmentsSideGridEditor from './Grid/AttachmentsSideGridEditor.js';
+// import AttachmentsInlineGridEditor from './Grid/AttachmentsInlineGridEditor.js';
+// import AttachmentsFilteredGrid from './Grid/AttachmentsFilteredGrid.js';
+// import AttachmentsFilteredGridEditor from './Grid/AttachmentsFilteredGridEditor.js';
+// import AttachmentsFilteredSideGridEditor from './Grid/AttachmentsFilteredSideGridEditor.js';
+// import AttachmentsFilteredInlineGridEditor from './Grid/AttachmentsFilteredInlineGridEditor.js';
+// import AttachmentsGridPanel from './Panel/Grid/AttachmentsGrid.js';
+// import AttachmentsGridEditorPanel from './Panel/Grid/AttachmentsGridEditor.js';
+// import AttachmentsSideGridEditorPanel from './Panel/Grid/AttachmentsSideGridEditor.js';
+// import AttachmentsInlineGridEditorPanel from './Panel/Grid/AttachmentsInlineGridEditor.js';
+// import AttachmentsFilteredGridPanel from './Panel/Grid/AttachmentsFilteredGrid.js';
+// import AttachmentsFilteredGridEditorPanel from './Panel/Grid/AttachmentsFilteredGridEditor.js';
+// import AttachmentsFilteredSideGridEditorPanel from './Panel/Grid/AttachmentsFilteredSideGridEditor.js';
+// import AttachmentsFilteredInlineGridEditorPanel from './Panel/Grid/AttachmentsFilteredInlineGridEditor.js';
+// import AttachmentsEditor from './Editor/AttachmentsEditor.js';
+// import AttachmentsEditorWindow from './Window/AttachmentsEditorWindow.js';
+
+// import AttachmentDirectoriesCombo from './Form/Field/Combo/AttachmentDirectoriesCombo.js';
+// import AttachmentDirectoriesComboEditor from './Form/Field/Combo/AttachmentDirectoriesComboEditor.js';
+// import AttachmentDirectoriesTag from './Form/Field/Tag/AttachmentDirectoriesTag.js';
+// import AttachmentDirectoriesTagEditor from './Form/Field/Tag/AttachmentDirectoriesTagEditor.js';
+// import AttachmentDirectoriesGrid from './Grid/AttachmentDirectoriesGrid.js';
+// import AttachmentDirectoriesGridEditor from './Grid/AttachmentDirectoriesGridEditor.js';
+// import AttachmentDirectoriesSideGridEditor from './Grid/AttachmentDirectoriesSideGridEditor.js';
+// import AttachmentDirectoriesInlineGridEditor from './Grid/AttachmentDirectoriesInlineGridEditor.js';
+// import AttachmentDirectoriesFilteredGrid from './Grid/AttachmentDirectoriesFilteredGrid.js';
+// import AttachmentDirectoriesFilteredGridEditor from './Grid/AttachmentDirectoriesFilteredGridEditor.js';
+// import AttachmentDirectoriesFilteredSideGridEditor from './Grid/AttachmentDirectoriesFilteredSideGridEditor.js';
+// import AttachmentDirectoriesFilteredInlineGridEditor from './Grid/AttachmentDirectoriesFilteredInlineGridEditor.js';
+// import AttachmentDirectoriesGridPanel from './Panel/Grid/AttachmentDirectoriesGrid.js';
+// import AttachmentDirectoriesGridEditorPanel from './Panel/Grid/AttachmentDirectoriesGridEditor.js';
+// import AttachmentDirectoriesSideGridEditorPanel from './Panel/Grid/AttachmentDirectoriesSideGridEditor.js';
+// import AttachmentDirectoriesInlineGridEditorPanel from './Panel/Grid/AttachmentDirectoriesInlineGridEditor.js';
+// import AttachmentDirectoriesFilteredGridPanel from './Panel/Grid/AttachmentDirectoriesFilteredGrid.js';
+// import AttachmentDirectoriesFilteredGridEditorPanel from './Panel/Grid/AttachmentDirectoriesFilteredGridEditor.js';
+// import AttachmentDirectoriesFilteredSideGridEditorPanel from './Panel/Grid/AttachmentDirectoriesFilteredSideGridEditor.js';
+// import AttachmentDirectoriesFilteredInlineGridEditorPanel from './Panel/Grid/AttachmentDirectoriesFilteredInlineGridEditor.js';
+// import AttachmentDirectoriesEditor from './Editor/AttachmentDirectoriesEditor.js';
+// import AttachmentDirectoriesEditorWindow from './Window/AttachmentDirectoriesEditorWindow.js';
+
 // import AccordionGridPanel from './Panel/AccordionGridPanel.js';
 import ArrayCheckboxGroup from './Form/Field/Checkbox/ArrayCheckboxGroup.js';
 import ArrayCombo from './Form/Field/Combo/ArrayCombo.js';
@@ -439,6 +484,52 @@ const components = {
 	X,
 	Xmark,
 
+	// AttachmentsCombo,
+	// AttachmentsComboEditor,
+	// AttachmentsTag,
+	// AttachmentsTagEditor,
+	// AttachmentsGrid,
+	// AttachmentsGridEditor,
+	// AttachmentsSideGridEditor,
+	// AttachmentsInlineGridEditor,
+	// AttachmentsFilteredGrid,
+	// AttachmentsFilteredGridEditor,
+	// AttachmentsFilteredSideGridEditor,
+	// AttachmentsFilteredInlineGridEditor,
+	// AttachmentsGridPanel,
+	// AttachmentsGridEditorPanel,
+	// AttachmentsSideGridEditorPanel,
+	// AttachmentsInlineGridEditorPanel,
+	// AttachmentsFilteredGridPanel,
+	// AttachmentsFilteredGridEditorPanel,
+	// AttachmentsFilteredSideGridEditorPanel,
+	// AttachmentsFilteredInlineGridEditorPanel,
+	// AttachmentsEditor,
+	// AttachmentsEditorWindow,
+
+	// AttachmentDirectoriesCombo,
+	// AttachmentDirectoriesComboEditor,
+	// AttachmentDirectoriesTag,
+	// AttachmentDirectoriesTagEditor,
+	// AttachmentDirectoriesGrid,
+	// AttachmentDirectoriesGridEditor,
+	// AttachmentDirectoriesSideGridEditor,
+	// AttachmentDirectoriesInlineGridEditor,
+	// AttachmentDirectoriesFilteredGrid,
+	// AttachmentDirectoriesFilteredGridEditor,
+	// AttachmentDirectoriesFilteredSideGridEditor,
+	// AttachmentDirectoriesFilteredInlineGridEditor,
+	// AttachmentDirectoriesGridPanel,
+	// AttachmentDirectoriesGridEditorPanel,
+	// AttachmentDirectoriesSideGridEditorPanel,
+	// AttachmentDirectoriesInlineGridEditorPanel,
+	// AttachmentDirectoriesFilteredGridPanel,
+	// AttachmentDirectoriesFilteredGridEditorPanel,
+	// AttachmentDirectoriesFilteredSideGridEditorPanel,
+	// AttachmentDirectoriesFilteredInlineGridEditorPanel,
+	// AttachmentDirectoriesEditor,
+	// AttachmentDirectoriesEditorWindow,
+
 	// AccordionGridPanel,
 	ArrayCheckboxGroup,
 	ArrayCombo,

package/src/Constants/Attachments.js

@@ -0,0 +1,2 @@
+export const ATTACHMENTS_VIEW_MODES__ICON = 'ATTACHMENTS_VIEW_MODES__ICON';
+export const ATTACHMENTS_VIEW_MODES__LIST = 'ATTACHMENTS_VIEW_MODES__LIST';

package/src/Constants/Dates.js

@@ -14,7 +14,7 @@ export const START_OF_THIS_MONTH = moment().startOf('months');
 export const END_OF_LAST_MONTH = moment().subtract(1, 'months').endOf('month');
 export const ONE_YEAR_AGO = moment().add(-1, 'years');
 export const MOMENT_DATE_FORMAT_1 = 'YYYY-MM-DD HH:mm:ss';
-export const MOMENT_DATE_FORMAT_2 = 'MMMM Do YYYY, h:mm:ss a'; // pretty datetime
-export const MOMENT_DATE_FORMAT_3 = 'h:mm A'; // pretty time
+export const MOMENT_DATE_FORMAT_2 = 'MMM D YYYY, h:mm:ssa'; // pretty datetime
+export const MOMENT_DATE_FORMAT_3 = 'h:mma'; // pretty time
 export const MOMENT_DATE_FORMAT_4 = 'YYYY-MM-DD';
 export const MOMENT_DATE_FORMAT_5 = 'HH:mm:ss';

package/src/Constants/Progress.js

@@ -1 +1,5 @@
-export const PROGRESS_COMPLETED = 'Completed';
+export const PROGRESS__NONE_FOUND = 'NONE_FOUND';
+export const PROGRESS__IN_PROCESS = 'IN_PROCESS';
+export const PROGRESS__COMPLETED = 'COMPLETED';
+export const PROGRESS__FAILED = 'FAILED';
+export const PROGRESS__STUCK = 'STUCK';

package/src/Models/Schemas/AttachmentDirectories.js

@@ -0,0 +1,66 @@
+import * as yup from 'yup'; // https://github.com/jquense/yup#string
+
+const AttachmentDirectories = {
+	
+	name: 'AttachmentDirectories',
+	
+	model: {
+
+		idProperty: 'attachment_directories__id',
+		displayProperty: 'attachment_directories__name',
+		sortProperty: 'attachment_directories__name',
+		
+		sorters: null,
+
+		validator: yup.object({
+			attachment_directories__name: yup.string().required(),
+			attachment_directories__model: yup.string().max(50).required(),
+			attachment_directories__modelid: yup.number().integer().required()
+		}),
+		
+		properties: [
+			{ name: 'attachment_directories__id', mapping: 'id', title: 'Id', type: 'int', isFilteringDisabled: true, fieldGroup: 'General', },
+			{ name: 'attachment_directories__name', mapping: 'name', title: 'Name', isFilteringDisabled: true, editorType: {"type":"Input"}, fieldGroup: 'General', },
+			{ name: 'attachment_directories__model', mapping: 'model', title: 'Model', isFilteringDisabled: true, editorType: {"type":"Input"}, fieldGroup: 'General', },
+			{ name: 'attachment_directories__modelid', mapping: 'modelid', title: 'Modelid', type: 'int', filterType: {"type":"NumberRange"}, editorType: {"type":"Number"}, fieldGroup: 'General', }
+		],
+
+		associations: {
+			hasMany: [
+				'Attachments'
+			],
+
+		},
+
+		ancillaryFilters: [],
+
+		defaultFilters: [
+			// 'attachment_directories__modelid'
+		],
+
+	},
+
+	entity: {
+		methods: {
+
+			getAttachments: function() {
+				const Attachments = this.getAssociatedRepository('Attachments');
+				return Attachments.getBy((entity) => {
+					return entity.attachments__attachment_directory_id === this.attachment_directories__id;
+				});
+			},
+
+		},
+	},
+
+
+	repository: {
+		type: 'tree',
+		isRemotePhantomMode: false,
+		isAutoLoad: true,
+		isAutoSave: true,
+	},
+
+};
+
+export default AttachmentDirectories;

package/src/Models/Schemas/Attachments.js

@@ -0,0 +1,88 @@
+import * as yup from 'yup'; // https://github.com/jquense/yup#string
+
+const Attachments = {
+	
+	name: 'Attachments',
+	
+	model: {
+
+		idProperty: 'attachments__id',
+		displayProperty: 'attachments__id',
+		sortProperty: 'attachments__filename',
+		
+		sorters: null,
+
+		validator: yup.object({
+			attachments__attachment_directory_id: yup.number().integer().nullable(),
+			attachments__model: yup.string().oneOf([]).required(),
+			attachments__modelid: yup.number().integer().required(),
+			attachments__uuid: yup.string().max(40).required(),
+			attachments__path: yup.string().nullable(),
+			attachments__filename: yup.string().max(100).required(),
+			attachments__mimetype: yup.string().max(100).required(),
+			attachments__size: yup.number().integer().nullable()
+		}),
+		
+		properties: [
+			{ name: 'attachments__model_display', mapping: 'model_display', title: 'Model Display', isVirtual: true, isFilteringDisabled: true, isEditingDisabled: true, fieldGroup: 'General', },
+			{ name: 'attachments__size_formatted', mapping: 'size_formatted', title: 'Size Formatted', isVirtual: true, isFilteringDisabled: true, isEditingDisabled: true, fieldGroup: 'General', },
+			{ name: 'attachments__info', mapping: 'info', title: 'Info', isVirtual: true, isFilteringDisabled: true, isEditingDisabled: true, fieldGroup: 'General', },
+			{ name: 'attachments__uri', mapping: 'uri', title: 'Uri', isVirtual: true, isFilteringDisabled: true, isEditingDisabled: true, fieldGroup: 'General', },
+			{ name: 'attachments__attachment_directory_id', mapping: 'attachment_directory_id', title: 'Attachment Directory', type: 'int', isFk: true, fkIdField: 'attachment_directories__id', fkDisplayField: 'attachment_directories__name', filterType: {"type":"AttachmentDirectoriesCombo","loadAfterRender":!1}, editorType: {"type":"AttachmentDirectoriesComboEditor","loadAfterRender":!1}, fieldGroup: 'General', },
+			{ name: 'attachments__abs_path', mapping: 'abs_path', title: 'Abs Path', isVirtual: true, isFilteringDisabled: true, isEditingDisabled: true, fieldGroup: 'General', },
+			{ name: 'attachments__id', mapping: 'id', title: 'Id', type: 'int', isFilteringDisabled: true, fieldGroup: 'General', },
+			{ name: 'attachments__model', mapping: 'model', title: 'Model', isFilteringDisabled: true, editorType: {"type":"ArrayCombo"}, fieldGroup: 'General', defaultValue: 'INSPECTIONS', },
+			{ name: 'attachments__modelid', mapping: 'modelid', title: 'Modelid', type: 'int', filterType: {"type":"NumberRange"}, editorType: {"type":"Number"}, fieldGroup: 'General', },
+			{ name: 'attachments__uuid', mapping: 'uuid', title: 'Uuid', isFilteringDisabled: true, editorType: {"type":"Input"}, fieldGroup: 'General', },
+			{ name: 'attachments__path', mapping: 'path', title: 'Path', isFilteringDisabled: true, editorType: {"type":"TextArea"}, fieldGroup: 'General', },
+			{ name: 'attachments__filename', mapping: 'filename', title: 'Filename', isFilteringDisabled: true, editorType: {"type":"Input"}, fieldGroup: 'General', },
+			{ name: 'attachments__mimetype', mapping: 'mimetype', title: 'Mimetype', isFilteringDisabled: true, editorType: {"type":"Input"}, fieldGroup: 'General', },
+			{ name: 'attachments__size', mapping: 'size', title: 'Size', type: 'int', filterType: {"type":"NumberRange"}, editorType: {"type":"Number"}, fieldGroup: 'General', },
+			{ name: 'attachment_directories__id', mapping: 'attachment_directory.id', title: 'Id', type: 'int', isForeignModel: true, isEditingDisabled: true, isFilteringDisabled: true, },
+			{ name: 'attachment_directories__name', mapping: 'attachment_directory.name', title: 'Name', isForeignModel: true, isEditingDisabled: true, isFilteringDisabled: true, },
+			{ name: 'attachment_directories__model', mapping: 'attachment_directory.model', title: 'Model', isForeignModel: true, isEditingDisabled: true, isFilteringDisabled: true, },
+			{ name: 'attachment_directories__modelid', mapping: 'attachment_directory.modelid', title: 'Modelid', type: 'int', isForeignModel: true, isEditingDisabled: true, isFilteringDisabled: true, }
+		],
+
+		associations: {
+			belongsTo: [
+				'AttachmentDirectories'
+			],
+
+		},
+
+		ancillaryFilters: [],
+
+		defaultFilters: [
+			// 'attachments__attachment_directory_id',
+			// 'attachments__modelid',
+			// 'attachments__size'
+		],
+
+	},
+
+	entity: {
+		methods: {
+
+			getAttachmentDirectory: async function() {
+				const AttachmentDirectories = this.getAssociatedRepository('AttachmentDirectories');
+				let entity = AttachmentDirectories.getById(this.attachments__attachment_directory_id);
+				if (!entity) {
+					entity = await AttachmentDirectories.getSingleEntityFromServer(this.attachments__attachment_directory_id);
+				}
+				return entity;
+			},
+
+		},
+	},
+
+
+	repository: {
+	    "type": "onebuild",
+	    "isRemotePhantomMode": false,
+	    "isAutoLoad": false
+	},
+
+};
+
+export default Attachments;

package/src/Models/Slices/SystemSlice.js

@@ -0,0 +1,220 @@
+import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
+import _ from 'lodash';
+
+
+// synchronous thunks
+export function setIsWaitModalShown(bool, name = 'default') {
+	return (dispatch, getState) => {
+		// NOTE: the waitStack is a dictionary of processes and their counts.
+		// Normally, this just uses the 'default' name.
+		// Optionally, the user can tell us which name is to be shown.
+		// If not using the default, the name name is added as the waitMessage.
+		// If multiple processes are being awaited, the most recently added name 
+		// controls the waitMessage, even if other earlier added namees have been
+		// incremented.
+
+		const stack = _.clone(selectWaitStack(getState()));
+		if (bool) {
+			// Show it
+			if (_.isEmpty(stack)) {
+				dispatch(setIsWaitModalShownAction(true));
+			}
+			if (stack[name]) {
+				stack[name]++;
+			} else {
+				stack[name] = 1;
+			}
+		} else {
+			// Hide it
+			if (stack[name] !== 1) {
+				stack[name]--;
+			} else {
+				delete stack[name];
+			}
+			if (_.isEmpty(stack)) {
+				dispatch(setIsWaitModalShownAction(false));
+			}
+
+			const
+				keys = Object.keys(stack),
+				lastKey = keys[keys.length - 1];
+			name = lastKey;
+		}
+		dispatch(setWaitStack(stack));
+		dispatch(setWaitMessage(name === 'default' ? null : name));
+	};
+}
+export function startOperation(name, totalItems = 0) {
+	return (dispatch) => {
+		dispatch(_setOperationInProgress({
+			name,
+			currentItem: 0,
+			totalItems,
+			progressPercentage: 0,
+		}));
+	};
+}
+export function updateOperation(name, args = {}) {
+	return (dispatch, getState) => {
+		let {
+				currentItem,
+				totalItems,
+				progressPercentage,
+			} = args;
+		const
+			state = getState().system,
+			operations = selectOperationsInProgress(getState()),
+			operation = _.clone(operations.find(op => op.name === name)); // clone so we don't mutate state directly
+
+		if (!operation) {
+			console.warn(`Operation "${name}" not found. Use startOperation() first.`);
+			return;
+		}
+
+		// if totalItems is set, use it
+		if (totalItems) {
+			operation.totalItems = totalItems;
+		} else {
+			totalItems = operation.totalItems;
+		}
+		if (progressPercentage) {
+			operation.progressPercentage = progressPercentage;
+			operation.currentItem = totalItems > 0 ? Math.round((progressPercentage / 100) * totalItems) : 0;
+		}
+		if (currentItem) {
+			operation.currentItem = currentItem;
+			operation.progressPercentage = totalItems > 0 ? Math.round((currentItem / totalItems) * 100) : 0;
+		}
+
+		dispatch(_setOperationInProgress(operation));
+	};
+}
+export function completeOperation(name) {
+	return (dispatch) => {
+		dispatch(_setOperationInProgress({
+			name,
+			progressPercentage: 100,
+		}));
+	};
+}
+
+
+// slice
+export const systemSlice = createSlice({
+	name: 'system',
+	initialState: {
+		debugMessage: null,
+		debugStack: [],
+		alertMessage: null,
+		infoMessage: null,
+		isWaitModalShown: false,
+		waitMessage: null,
+		waitStack: {},
+		progressMessage: null,
+		progressPercentage: 100,
+		operationsInProgress: [], // array of { name, totalItems, currentItem, progressPercentage }
+	},
+	reducers: {
+		setDebugMessage: (state, action) => {
+			state.debugMessage = action.payload;
+		},
+		setDebugStack: (state, action) => {
+			state.debugStack = action.payload;
+		},
+		setAlertMessage: (state, action) => {
+			state.alertMessage = action.payload;
+		},
+		setInfoMessage: (state, action) => {
+			state.infoMessage = action.payload;
+		},
+		setIsWaitModalShownAction: (state, action) => {
+			state.isWaitModalShown = action.payload;
+		},
+		setWaitMessage: (state, action) => {
+			state.waitMessage = action.payload;
+		},
+		setWaitStack: (state, action) => {
+			state.waitStack = action.payload;
+		},
+		setProgressMessage: (state, action) => {
+			state.progressMessage = action.payload;
+		},
+		setProgressPercentage: (state, action) => {
+			state.progressPercentage = action.payload;
+		},
+		_setOperationInProgress: (state, action) => {
+			// This method sets or updates one particular operation in progress.
+			// This is a private function and should not be used directly;
+			// use helper thunks (startOperation, updateOperation, completeOperation) instead.
+
+			const {
+					name,
+					totalItems,
+					currentItem,
+					progressPercentage,
+				} = action.payload;
+
+			if (progressPercentage < 100) {
+				// Add or update operation
+				const
+					existingIndex = state.operationsInProgress.findIndex(op => op.name === name),
+					operation = {
+						name,
+						totalItems: totalItems || 0,
+						currentItem: currentItem || 0,
+						progressPercentage: progressPercentage || 0
+					};
+				
+				if (existingIndex >= 0) {
+					state.operationsInProgress[existingIndex] = operation;
+				} else {
+					state.operationsInProgress.push(operation);
+				}
+			} else {
+				// Remove operation
+				state.operationsInProgress = state.operationsInProgress.filter(op => op.name !== name);
+			}
+		},
+		clearAllOperations: (state) => {
+			state.operationsInProgress = [];
+		},
+	}
+});
+
+
+// action definitions
+export const {
+	setDebugMessage,
+	setDebugStack,
+	setAlertMessage,
+	setInfoMessage,
+	setIsWaitModalShownAction,
+	setWaitMessage,
+	setWaitStack,
+	setProgressMessage,
+	setProgressPercentage,
+	clearAllOperations,
+} = systemSlice.actions;
+const { // private, do not export
+	_setOperationInProgress
+} = systemSlice.actions;
+
+
+
+// selectors
+export const selectDebugMessage = state => state.system.debugMessage;
+export const selectDebugStack = state => state.system.debugStack;
+export const selectAlertMessage = state => state.system.alertMessage;
+export const selectInfoMessage = state => state.system.infoMessage;
+export const selectIsWaitModalShown = state => state.system.isWaitModalShown;
+export const selectWaitMessage = state => state.system.waitMessage;
+export const selectWaitStack = state => state.system.waitStack;
+export const selectProgressMessage = state => state.system.progressMessage;
+export const selectProgressPercentage = state => state.system.progressPercentage;
+export const selectOperationsInProgress = state => state.system.operationsInProgress;
+export const selectOperationByName = (name) => state => state.system.operationsInProgress.find(op => op.name === name);
+export const selectOperationCount = state => state.system.operationsInProgress.length;
+export const selectHasOperationsInProgress = state => state.system.operationsInProgress.length > 0;
+
+
+export default systemSlice.reducer;