From b56801d413f5a26eb95f69337c61b1279ae991f0 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 6 Dec 2022 10:07:06 -0700 Subject: [PATCH] Disabled group change on dynamic reg when enabled --- .../dynamic-registration/component/DynamicRegistrationList.js | 2 +- .../app/dynamic-registration/view/DynamicRegistrationDetail.js | 2 +- .../app/store/dynamic-registration/DynamicRegistrationSlice.js | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/src/app/dynamic-registration/component/DynamicRegistrationList.js b/ui/src/app/dynamic-registration/component/DynamicRegistrationList.js index 5788018b0..39e0a9866 100644 --- a/ui/src/app/dynamic-registration/component/DynamicRegistrationList.js +++ b/ui/src/app/dynamic-registration/component/DynamicRegistrationList.js @@ -103,7 +103,7 @@ export function DynamicRegistrationList ({entities, children, onChangeGroup, onD className="form-control" onChange={(event) => onChangeGroup(reg, event.target.value)} value={reg.idOfOwner ? reg.idOfOwner : ''} - disabled={loadingGroups} + disabled={loadingGroups || reg.enabled} disablevalidation="true"> {groups.map((g, ridx) => ( diff --git a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js index ca6c93cbd..7d5d800ea 100644 --- a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js +++ b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js @@ -86,7 +86,7 @@ export function DynamicRegistrationDetail () { className="form-control form-control-sm" onChange={({target: {value}}) => changeGroup({ registration: detail, group: value })} value={detail.idOfOwner} - disabled={loadingGroups} + disabled={loadingGroups || detail.enabled} disablevalidation="true"> {groups.map((g, ridx) => ( diff --git a/ui/src/app/store/dynamic-registration/DynamicRegistrationSlice.js b/ui/src/app/store/dynamic-registration/DynamicRegistrationSlice.js index e39700294..eec39b071 100644 --- a/ui/src/app/store/dynamic-registration/DynamicRegistrationSlice.js +++ b/ui/src/app/store/dynamic-registration/DynamicRegistrationSlice.js @@ -13,12 +13,14 @@ export const DynamicRegistrationApi = createApi({ url: `/DynamicRegistrations` }), providesTags: ['DynamicRegistration'], + // transformResponse: (registrations) => [...registrations.map(r => ({...r, enabled: true}))] }), selectDynamicRegistration: builder.query({ query: ({id}) => ({ url: `/DynamicRegistration/${id}` }), providesTags: ['DynamicRegistration'], + // transformResponse: (reg) => ({...reg, enabled: true}) }), getDisabledRegistrations: builder.query({ query: () => ({