Merge pull request #4281 from mendersoftware/master

Align staging with master

.gitlab-ci.yml

@@ -274,7 +274,7 @@ build:docker:
 build:docker-multiplatform:
   # by default alvaldi-gui uses the unprivileged mode
   script:
-    - if [[ ! $CI_COMMIT_REF_NAME =~ "(main|master|staging|production|feature-.+)" ]]; then
+    - if [[ ! $CI_COMMIT_REF_NAME =~ "(main|master|staging|production|feature-.+|\d+\.\d+\..+)" ]]; then
     -   export MULTIPLATFORM_PLATFORMS='linux/amd64'
     - fi
     - echo "building ${CI_PROJECT_NAME} for ${DOCKER_BUILD_SERVICE_IMAGE}"

entrypoint.sh

@@ -31,7 +31,6 @@ cat >/var/www/mender-gui/dist/env.js <<EOF
     hostedAnnouncement: "$ANNOUNCEMENT",
     isDemoMode: "$DEMO",
     features: {
-      hasAddons: "$HAVE_ADDONS",
       hasAuditlogs: "$HAVE_AUDITLOGS",
       hasDeviceConfig: "$HAVE_DEVICECONFIG",
       hasDeviceConnect: "$HAVE_DEVICECONNECT",

src/js/actions/appActions.js

@@ -62,7 +62,6 @@ export const commonErrorHandler = (err, errorContext, dispatch, fallback, mightB
 const getComparisonCompatibleVersion = version => (isNaN(version.charAt(0)) && version !== 'next' ? 'master' : version);
 
 const featureFlags = [
-  'hasAddons',
   'hasAuditlogs',
   'hasMultitenancy',
   'hasDeltaProgress',

src/js/actions/organizationActions.test.js

@@ -260,7 +260,8 @@ describe('organization actions', () => {
         ...defaultState.app,
         features: {
           ...defaultState.app.features,
-          hasAuditlogs: true
+          hasAuditlogs: true,
+          isEnterprise: true
         }
       }
     });

src/js/components/auditlogs/auditlogs.test.js

@@ -30,15 +30,37 @@ import { TIMEOUTS } from '../../constants/appConstants';
 import { getConfiguredStore } from '../../reducers';
 import AuditLogs from './auditlogs';
 
-const preloadedState = { ...defaultState, app: { ...defaultState.app, features: { ...defaultState.app.features, hasAuditlogs: true } } };
+const preloadedState = {
+  ...defaultState,
+  app: {
+    ...defaultState.app,
+    features: {
+      ...defaultState.app.features,
+      hasAuditlogs: true,
+      isEnterprise: true
+    }
+  }
+};
+
+const preloadedStateNoAuditlogs = {
+  ...defaultState,
+  app: {
+    ...defaultState.app,
+    features: {
+      ...defaultState.app.features,
+      hasAuditlogs: true,
+      isEnterprise: false
+    }
+  }
+};
 
 describe('Auditlogs Component', () => {
   it('renders correctly', async () => {
     const { baseElement } = render(
       <LocalizationProvider dateAdapter={AdapterMoment}>
         <AuditLogs />
       </LocalizationProvider>,
-      { preloadedState }
+      { preloadedState: preloadedStateNoAuditlogs }
     );
     const view = prettyDOM(baseElement.firstChild, 100000, { highlight: false })
       .replace(/id="mui-[0-9]*"/g, '')
@@ -49,10 +71,13 @@ describe('Auditlogs Component', () => {
   });
 
   it('works as expected', async () => {
+    let store = getConfiguredStore({ preloadedState });
     const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
     render(
       <LocalizationProvider dateAdapter={AdapterMoment}>
-        <AuditLogs />
+        <Provider store={store}>
+          <AuditLogs />
+        </Provider>
       </LocalizationProvider>,
       { preloadedState }
     );

src/js/components/devices/authorized-devices.test.js

@@ -67,7 +67,7 @@ describe('AuthorizedDevices Component', () => {
         features: {
           ...defaultState.app.features,
           // hasReporting: true,
-          hasAddons: true,
+          hasMonitor: true,
           isEnterprise: true
         }
       },
@@ -81,6 +81,13 @@ describe('AuthorizedDevices Component', () => {
           rejected: { ...defaultState.devices.byStatus.rejected, total: 38 }
         }
       },
+      organization: {
+        ...defaultState.organization,
+        organization: {
+          ...defaultState.organization.organization,
+          addons: [{ enabled: true, name: 'monitor' }]
+        }
+      },
       users: {
         ...defaultState.users,
         customColumns: [{ attribute: { name: attributeNames.updateTime, scope: 'system' }, size: 220 }]