feat: add bg color to status

eea · Dec 14, 2023 · 1f432cf · 1f432cf
1 parent cc2cf3a
commit 1f432cf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/components/theme/AppExtras/RemoveSchema.jsx b/src/components/theme/AppExtras/RemoveSchema.jsx
@@ -1,23 +1,28 @@
 import { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { removeSchema } from '@eeacms/volto-eea-website-theme/actions';
+import { flattenToAppURL } from '@plone/volto/helpers';
 
-function RemoveSchema({ removeSchema, content, schema }) {
+function RemoveSchema({ removeSchema, contentLoading, content, schema }) {
   useEffect(() => {
     if (
+      !schema.loading &&
+      !contentLoading &&
       schema.schema &&
-      (!content || (content && schema.contentType !== content['@type']))
+      (!content ||
+        (content && schema.contentUrl !== flattenToAppURL(content['@id'])))
     ) {
       removeSchema();
     }
-  }, [removeSchema, content, schema]);
+  }, [removeSchema, content, contentLoading, schema]);
 
   return null;
 }
 
 export default connect(
   (state) => ({
     content: state.content.data,
+    contentLoading: state.content.get.loading,
     schema: state.schema,
   }),
   { removeSchema },

diff --git a/src/middleware/apiEnhancer.js b/src/middleware/apiEnhancer.js
@@ -1,4 +1,4 @@
-export default function apiEnhencar(middlewares) {
+export default function apiEnhencer(middlewares) {
   return [
     () => (next) => (action) => {
       if (action.request) {

diff --git a/src/reducers/schema.js b/src/reducers/schema.js
@@ -30,7 +30,7 @@ export default function schema(state = initialState, action = {}) {
       ...state,
       error: null,
       loading: false,
-      loaded: true,
+      loaded: false,
       schema: null,
     };
   }