From 652efbbedf73f16f2dd665ff962a4a3451526766 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 18 Feb 2022 14:49:30 -0800 Subject: [PATCH] update storage provider interface add count of part matches to Inventory screen --- Binner/Binner.Web/ClientApp/src/pages/Inventory.js | 13 +++++++++---- .../StorageProviders/BinnerFileStorageProvider.cs | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Binner/Binner.Web/ClientApp/src/pages/Inventory.js b/Binner/Binner.Web/ClientApp/src/pages/Inventory.js index ed713ef8..081193f2 100644 --- a/Binner/Binner.Web/ClientApp/src/pages/Inventory.js +++ b/Binner/Binner.Web/ClientApp/src/pages/Inventory.js @@ -75,7 +75,7 @@ export class Inventory extends Component { manufacturer: '', manufacturerPartNumber: '', imageUrl: '', - projectId: viewPreferences.lastProjectId, + projectId: '', supplier: '', supplierPartNumber: '' }, @@ -317,6 +317,7 @@ export class Inventory extends Component { } async fetchProjects() { + const { part, viewPreferences } = this.state; this.setState({ loadingProjects: true }); const response = await fetch('project/list?orderBy=DateCreatedUtc&direction=Descending&results=999'); const data = await response.json(); @@ -328,7 +329,11 @@ export class Inventory extends Component { label: { ...(_.find(ProjectColors, c => c.value === item.color).name !== '' && { color: _.find(ProjectColors, c => c.value === item.color).name }), circular: true, content: item.parts, size: 'tiny' }, }; }), 'text'); - this.setState({ projects, loadingProjects: false }); + // ensure that the current part's projectId can't be set to an invalid project + if (!_.find(projects, p => p.value === viewPreferences.lastProjectId)) { + part.projectId = ''; + } + this.setState({ projects, part, loadingProjects: false }); } getMountingTypeById(mountingTypeId) { @@ -933,9 +938,9 @@ export class Inventory extends Component {
Part Metadata
- {metadataParts.length > 0 && + {metadataParts.length > 1 && Choose alternate part} + trigger={} open={partModalOpen} onClose={this.handlePartModalClose} > diff --git a/Binner/Library/Binner.Common/StorageProviders/BinnerFileStorageProvider.cs b/Binner/Library/Binner.Common/StorageProviders/BinnerFileStorageProvider.cs index 143f7571..409537b4 100644 --- a/Binner/Library/Binner.Common/StorageProviders/BinnerFileStorageProvider.cs +++ b/Binner/Library/Binner.Common/StorageProviders/BinnerFileStorageProvider.cs @@ -59,7 +59,7 @@ private void ValidateBinnerConfiguration(BinnerFileStorageConfiguration config) } } - public async Task GetDatabaseAsync() + public async Task GetDatabaseAsync(IUserContext userContext) { await _dataLock.WaitAsync(); try