mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-10-31 05:05:42 +00:00 
			
		
		
		
	Merge branch 'pui-plugins' of github.com:SchrodingersGat/InvenTree into pui-plugins
This commit is contained in:
		| @@ -18,29 +18,29 @@ | ||||
|         "@codemirror/search": ">=6.0.0", | ||||
|         "@codemirror/state": "^6.0.0", | ||||
|         "@codemirror/theme-one-dark": ">=6.0.0", | ||||
|         "@codemirror/view": ">=6.30.0", | ||||
|         "@codemirror/view": ">=6.32.0", | ||||
|         "@emotion/react": "^11.13.0", | ||||
|         "@fortawesome/fontawesome-svg-core": "^6.6.0", | ||||
|         "@fortawesome/free-regular-svg-icons": "^6.6.0", | ||||
|         "@fortawesome/free-solid-svg-icons": "^6.6.0", | ||||
|         "@fortawesome/react-fontawesome": "^0.2.2", | ||||
|         "@lingui/core": "^4.11.2", | ||||
|         "@lingui/react": "^4.11.2", | ||||
|         "@mantine/carousel": "^7.12.0", | ||||
|         "@mantine/charts": "^7.12.0", | ||||
|         "@mantine/core": "^7.12.0", | ||||
|         "@mantine/dates": "^7.12.0", | ||||
|         "@mantine/dropzone": "^7.12.0", | ||||
|         "@mantine/form": "^7.12.0", | ||||
|         "@mantine/hooks": "^7.12.0", | ||||
|         "@mantine/modals": "^7.12.0", | ||||
|         "@mantine/notifications": "^7.12.0", | ||||
|         "@mantine/spotlight": "^7.12.0", | ||||
|         "@mantine/vanilla-extract": "^7.12.0", | ||||
|         "@mdxeditor/editor": "^3.10.1", | ||||
|         "@sentry/react": "^8.23.0", | ||||
|         "@tabler/icons-react": "^3.11.0", | ||||
|         "@tanstack/react-query": "^5.51.21", | ||||
|         "@lingui/core": "^4.11.3", | ||||
|         "@lingui/react": "^4.11.3", | ||||
|         "@mantine/carousel": "^7.12.1", | ||||
|         "@mantine/charts": "^7.12.1", | ||||
|         "@mantine/core": "^7.12.1", | ||||
|         "@mantine/dates": "^7.12.1", | ||||
|         "@mantine/dropzone": "^7.12.1", | ||||
|         "@mantine/form": "^7.12.1", | ||||
|         "@mantine/hooks": "^7.12.1", | ||||
|         "@mantine/modals": "^7.12.1", | ||||
|         "@mantine/notifications": "^7.12.1", | ||||
|         "@mantine/spotlight": "^7.12.1", | ||||
|         "@mantine/vanilla-extract": "^7.12.1", | ||||
|         "@mdxeditor/editor": "^3.11.0", | ||||
|         "@sentry/react": "^8.25.0", | ||||
|         "@tabler/icons-react": "^3.12.0", | ||||
|         "@tanstack/react-query": "^5.51.23", | ||||
|         "@uiw/codemirror-theme-vscode": "^4.23.0", | ||||
|         "@uiw/react-codemirror": "^4.23.0", | ||||
|         "@uiw/react-split": "^5.9.3", | ||||
| @@ -53,7 +53,7 @@ | ||||
|         "fuse.js": "^7.0.0", | ||||
|         "html5-qrcode": "^2.3.8", | ||||
|         "mantine-datatable": "^7.11.3", | ||||
|         "qrcode": "^1.5.3", | ||||
|         "qrcode": "^1.5.4", | ||||
|         "react": "^18.3.1", | ||||
|         "react-dom": "^18.3.1", | ||||
|         "react-grid-layout": "^1.4.4", | ||||
| @@ -70,10 +70,10 @@ | ||||
|         "@babel/core": "^7.25.2", | ||||
|         "@babel/preset-react": "^7.24.7", | ||||
|         "@babel/preset-typescript": "^7.24.7", | ||||
|         "@lingui/cli": "^4.11.2", | ||||
|         "@lingui/macro": "^4.11.2", | ||||
|         "@playwright/test": "^1.45.3", | ||||
|         "@types/node": "^22.1.0", | ||||
|         "@lingui/cli": "^4.11.3", | ||||
|         "@lingui/macro": "^4.11.3", | ||||
|         "@playwright/test": "^1.46.0", | ||||
|         "@types/node": "^22.2.0", | ||||
|         "@types/qrcode": "^1.5.5", | ||||
|         "@types/react": "^18.3.3", | ||||
|         "@types/react-dom": "^18.3.0", | ||||
| @@ -86,7 +86,7 @@ | ||||
|         "nyc": "^17.0.0", | ||||
|         "rollup-plugin-license": "^3.5.2", | ||||
|         "typescript": "^5.5.4", | ||||
|         "vite": "^5.3.5", | ||||
|         "vite": "^5.4.0", | ||||
|         "vite-plugin-babel-macros": "^1.0.6", | ||||
|         "vite-plugin-istanbul": "^6.0.2" | ||||
|     } | ||||
|   | ||||
| @@ -133,7 +133,11 @@ export function SearchDrawer({ | ||||
|     return [ | ||||
|       { | ||||
|         model: ModelType.part, | ||||
|         parameters: {}, | ||||
|         parameters: { | ||||
|           active: userSettings.isSet('SEARCH_HIDE_INACTIVE_PARTS') | ||||
|             ? true | ||||
|             : undefined | ||||
|         }, | ||||
|         enabled: | ||||
|           user.hasViewRole(UserRoles.part) && | ||||
|           userSettings.isSet('SEARCH_PREVIEW_SHOW_PARTS') | ||||
| @@ -173,7 +177,10 @@ export function SearchDrawer({ | ||||
|         model: ModelType.stockitem, | ||||
|         parameters: { | ||||
|           part_detail: true, | ||||
|           location_detail: true | ||||
|           location_detail: true, | ||||
|           in_stock: userSettings.isSet('SEARCH_PREVIEW_HIDE_UNAVAILABLE_STOCK') | ||||
|             ? true | ||||
|             : undefined | ||||
|         }, | ||||
|         enabled: | ||||
|           user.hasViewRole(UserRoles.stock) && | ||||
| @@ -206,7 +213,12 @@ export function SearchDrawer({ | ||||
|       { | ||||
|         model: ModelType.purchaseorder, | ||||
|         parameters: { | ||||
|           supplier_detail: true | ||||
|           supplier_detail: true, | ||||
|           outstanding: userSettings.isSet( | ||||
|             'SEARCH_PREVIEW_EXCLUDE_INACTIVE_PURCHASE_ORDERS' | ||||
|           ) | ||||
|             ? true | ||||
|             : undefined | ||||
|         }, | ||||
|         enabled: | ||||
|           user.hasViewRole(UserRoles.purchase_order) && | ||||
| @@ -215,7 +227,12 @@ export function SearchDrawer({ | ||||
|       { | ||||
|         model: ModelType.salesorder, | ||||
|         parameters: { | ||||
|           customer_detail: true | ||||
|           customer_detail: true, | ||||
|           outstanding: userSettings.isSet( | ||||
|             'SEARCH_PREVIEW_EXCLUDE_INACTIVE_SALES_ORDERS' | ||||
|           ) | ||||
|             ? true | ||||
|             : undefined | ||||
|         }, | ||||
|         enabled: | ||||
|           user.hasViewRole(UserRoles.sales_order) && | ||||
| @@ -224,7 +241,12 @@ export function SearchDrawer({ | ||||
|       { | ||||
|         model: ModelType.returnorder, | ||||
|         parameters: { | ||||
|           customer_detail: true | ||||
|           customer_detail: true, | ||||
|           outstanding: userSettings.isSet( | ||||
|             'SEARCH_PREVIEW_EXCLUDE_INACTIVE_RETURN_ORDERS' | ||||
|           ) | ||||
|             ? true | ||||
|             : undefined | ||||
|         }, | ||||
|         enabled: | ||||
|           user.hasViewRole(UserRoles.return_order) && | ||||
| @@ -250,7 +272,7 @@ export function SearchDrawer({ | ||||
|  | ||||
|     let params: any = { | ||||
|       offset: 0, | ||||
|       limit: 10, // TODO: Make this configurable (based on settings) | ||||
|       limit: userSettings.getSetting('SEARCH_PREVIEW_RESULTS', '10'), | ||||
|       search: searchText, | ||||
|       search_regex: searchRegex, | ||||
|       search_whole: searchWhole | ||||
|   | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user