Merge pull request #702 from AppQuality/develop

release 20231123

Author: marcbon

src/app/store.ts

@@ -8,6 +8,7 @@ import filterReducer from '../features/campaignsFilter/campaignsFilterSlice';
 import expressReducer from '../features/express/expressSlice';
 import { strapiSlice } from '../features/backoffice/strapi';
 import bugsPageReducer from '../features/bugsPage/bugsPageSlice';
+import uxFilterReducer from '../features/uxFilters';
 
 export const store = configureStore({
   reducer: {
@@ -17,6 +18,7 @@ export const store = configureStore({
     filters: filterReducer,
     express: expressReducer,
     bugsPage: bugsPageReducer,
+    uxFilters: uxFilterReducer,
     [unguessApiSlice.reducerPath]: unguessApiSlice.reducer,
     [strapiSlice.reducerPath]: strapiSlice.reducer,
   },

src/assets/not_found/404_desktop.svg

@@ -15,7 +15,8 @@ import CampaignPreview from 'src/pages/Campaign/preview';
 import Dashboard from 'src/pages/Dashboard';
 import Project from 'src/pages/Dashboard/Project';
 import LoginPage from 'src/pages/LoginPage';
-import NotFound from 'src/pages/NotFound';
+import NotFound from 'src/pages/NotFound/NotFound';
+import MediaNotFound from 'src/pages/NotFound/MediaNotFound';
 import Service from 'src/pages/Service';
 import Catalog from 'src/pages/Services';
 import Manual from 'src/pages/Manual';
@@ -72,6 +73,10 @@ const Pages = () => {
                   element={<Service />}
                 />
                 {/* No route found */}
+                <Route
+                  path={`/${langPrefix}/media/oops`}
+                  element={<MediaNotFound />}
+                />
                 <Route path={`/${langPrefix}/oops`} element={<NotFound />} />
                 <Route index element={<Dashboard />} />
               </Route>

src/assets/not_found/404_media_desktop.svg

@@ -238,9 +238,9 @@ const BugStateDropdown = ({ bug }: { bug: Bug }) => {
               content={t('__BUGS_PAGE_BUG_DETAIL_NEED_REVIEW_TOOLTIP')}
             >
               <Select isCompact disabled>
-                <StyledItem>
+                <SelectedItem>
                   {t('__BUGS_PAGE_BUG_DETAIL_NEED_REVIEW')}
-                </StyledItem>
+                </SelectedItem>
               </Select>
             </Tooltip>
           ) : (

src/assets/not_found/404_media_mobile.svg

@@ -1,5 +1,6 @@
 import * as Yup from 'yup';
 import { BugCustomStatus } from 'src/features/api';
+import { t } from 'i18next';
 
 export interface CustomStatusFormProps {
   custom_statuses: BugCustomStatus[];
@@ -10,8 +11,8 @@ export const validationSchema = Yup.object().shape({
     Yup.object().shape({
       id: Yup.number(),
       name: Yup.string()
-        .max(17, '__BUGS_PAGE_CUSTOM_STATUS_DRAWER_CUSTOM_STATUS_MAX')
-        .required('__BUGS_PAGE_CUSTOM_STATUS_DRAWER_CUSTOM_STATUS_REQUIRED'),
+        .max(17, t('__BUGS_PAGE_CUSTOM_STATUS_DRAWER_CUSTOM_STATUS_MAX'))
+        .required(t('__BUGS_PAGE_CUSTOM_STATUS_DRAWER_CUSTOM_STATUS_REQUIRED')),
       color: Yup.string(),
       phase: Yup.object().shape({
         id: Yup.number().required(),

src/assets/not_found/404_mobile.svg

@@ -35,7 +35,11 @@ const ErrorBoundaryPage = () => {
                 </Paragraph>
 
                 <Paragraph style={{ marginTop: theme.space.lg }}>
-                  <Button isPrimary onClick={() => window.location.reload()}>
+                  <Button
+                    isPrimary
+                    isAccent
+                    onClick={() => window.location.reload()}
+                  >
                     {t('__ERROR_PAGE_BUTTON')}
                   </Button>
                 </Paragraph>

src/common/Pages.tsx

@@ -77,6 +77,14 @@ export interface paths {
       };
     };
   };
+  '/campaigns/{cid}/clusters': {
+    get: operations['get-campaigns-cid-clusters'];
+    parameters: {
+      path: {
+        cid: string;
+      };
+    };
+  };
   '/campaigns/{cid}/custom_statuses': {
     get: operations['get-campaigns-cid-custom-statuses'];
     delete: operations['delete-campaigns-cid-custom_statuses'];
@@ -521,6 +529,11 @@ export interface components {
     CampaignWithOutput: components['schemas']['Campaign'] & {
       outputs?: components['schemas']['Output'][];
     };
+    /** Cluster */
+    Cluster: {
+      id?: number;
+      name?: string;
+    };
     /**
      * Coin
      * @description A coin package is a set of coins (free or paid).
@@ -1247,6 +1260,26 @@ export interface operations {
       500: components['responses']['Error'];
     };
   };
+  'get-campaigns-cid-clusters': {
+    parameters: {
+      path: {
+        cid: string;
+      };
+    };
+    responses: {
+      /** OK */
+      200: {
+        content: {
+          'application/json': {
+            items?: components['schemas']['Cluster'][];
+          };
+        };
+      };
+      400: components['responses']['Error'];
+      403: components['responses']['Error'];
+      500: components['responses']['Error'];
+    };
+  };
   'get-campaigns-cid-custom-statuses': {
     parameters: {
       path: {
@@ -1636,6 +1669,8 @@ export interface operations {
       };
       query: {
         showAsCustomer?: boolean;
+        /** filterBy[<fieldName>]=<fieldValue> */
+        filterBy?: components['parameters']['filterBy'];
       };
     };
     responses: {