Merge remote-tracking branch 'origin/feature/shibui-2393' into featur…

…e/shibui-2393
TIER · Dec 6, 2022 · cd4594b · cd4594b
2 parents 3915e86 + 6e803a6
commit cd4594b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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">
                                                 <option>Select Group</option>
                                                 {groups.map((g, ridx) => (

diff --git 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">
                                                                     <option>Select Group</option>
                                                                     {groups.map((g, ridx) => (

diff --git 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: () => ({