From 3aebda869be96166a4fa2ddabb4381e9cbd8e486 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 1 Dec 2022 12:18:10 -0700 Subject: [PATCH] Fixed status for enabled registrations --- .../dynamic-registration/component/DynamicRegistrationList.js | 4 ++-- .../dynamic-registration/view/DynamicRegistrationDetail.js | 4 +++- .../store/dynamic-registration/DynamicRegistrationSlice.js | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/src/app/dynamic-registration/component/DynamicRegistrationList.js b/ui/src/app/dynamic-registration/component/DynamicRegistrationList.js index 38f1cfa74..5788018b0 100644 --- a/ui/src/app/dynamic-registration/component/DynamicRegistrationList.js +++ b/ui/src/app/dynamic-registration/component/DynamicRegistrationList.js @@ -77,7 +77,7 @@ export function DynamicRegistrationList ({entities, children, onChangeGroup, onD - {onEnable && canEnable(reg.approved) ? + {!reg.enabled &&onEnable && canEnable(reg.approved) ? - A metadata source must be disabled before it can be deleted. + An enabled registration cannot be deleted. }> diff --git a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js index 2b96e2e86..1656c22cc 100644 --- a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js +++ b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js @@ -98,6 +98,7 @@ export function DynamicRegistrationDetail () { } + {!detail.enabled &&
{enable && (canEnable && detail?.approved) &&
+ }

@@ -134,7 +136,7 @@ export function DynamicRegistrationDetail () { {(schema) => {(config) => - edit()} /> + edit() : null} /> } } diff --git a/ui/src/app/store/dynamic-registration/DynamicRegistrationSlice.js b/ui/src/app/store/dynamic-registration/DynamicRegistrationSlice.js index 9f17cfb5a..e39700294 100644 --- a/ui/src/app/store/dynamic-registration/DynamicRegistrationSlice.js +++ b/ui/src/app/store/dynamic-registration/DynamicRegistrationSlice.js @@ -12,13 +12,13 @@ export const DynamicRegistrationApi = createApi({ query: () => ({ url: `/DynamicRegistrations` }), - providesTags: ['DynamicRegistration'] + providesTags: ['DynamicRegistration'], }), selectDynamicRegistration: builder.query({ query: ({id}) => ({ url: `/DynamicRegistration/${id}` }), - providesTags: ['DynamicRegistration'] + providesTags: ['DynamicRegistration'], }), getDisabledRegistrations: builder.query({ query: () => ({