@strapi/admin 4.5.0-beta.0 → 4.5.1

package/admin/src/pages/MarketplacePage/components/SortSelect/index.js

@@ -0,0 +1,70 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Select, Option } from '@strapi/design-system/Select';
+import { Box } from '@strapi/design-system/Box';
+import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+
+const SelectWrapper = styled(Box)`
+  font-weight: ${({ theme }) => theme.fontWeights.semiBold};
+
+  span {
+    font-size: ${({ theme }) => theme.fontSizes[1]};
+  }
+`;
+
+const SortSelect = ({ sortQuery, handleSelectChange }) => {
+  const { formatMessage } = useIntl();
+
+  const sortTypes = {
+    'name:asc': {
+      selected: {
+        id: 'admin.pages.MarketPlacePage.sort.alphabetical.selected',
+        defaultMessage: 'Sort by alphabetical order',
+      },
+      option: {
+        id: 'admin.pages.MarketPlacePage.sort.alphabetical',
+        defaultMessage: 'Alphabetical order',
+      },
+    },
+    'submissionDate:desc': {
+      selected: {
+        id: 'admin.pages.MarketPlacePage.sort.newest.selected',
+        defaultMessage: 'Sort by newest',
+      },
+      option: {
+        id: 'admin.pages.MarketPlacePage.sort.newest',
+        defaultMessage: 'Newest',
+      },
+    },
+  };
+
+  return (
+    <SelectWrapper>
+      <Select
+        size="S"
+        id="sort-by-select"
+        value={sortQuery}
+        customizeContent={() => formatMessage(sortTypes[sortQuery].selected)}
+        onChange={(sortName) => {
+          handleSelectChange({ sort: sortName });
+        }}
+      >
+        {Object.entries(sortTypes).map(([sortName, messages]) => {
+          return (
+            <Option key={sortName} value={sortName}>
+              {formatMessage(messages.option)}
+            </Option>
+          );
+        })}
+      </Select>
+    </SelectWrapper>
+  );
+};
+
+SortSelect.propTypes = {
+  sortQuery: PropTypes.string.isRequired,
+  handleSelectChange: PropTypes.func.isRequired,
+};
+
+export default SortSelect;

package/admin/src/pages/MarketplacePage/index.js

@@ -10,6 +10,7 @@ import {
   LoadingIndicatorPage,
   useNotification,
   useAppInfos,
+  useQueryParams,
 } from '@strapi/helper-plugin';
 import { Layout, ContentLayout } from '@strapi/design-system/Layout';
 import { Main } from '@strapi/design-system/Main';
@@ -29,6 +30,8 @@ import offlineCloud from '../../assets/images/icon_offline-cloud.svg';
 import useNavigatorOnLine from '../../hooks/useNavigatorOnLine';
 import MissingPluginBanner from './components/MissingPluginBanner';
 import NpmPackagesGrid from './components/NpmPackagesGrid';
+import SortSelect from './components/SortSelect';
+import NpmPackagesFilters from './components/NpmPackagesFilters';
 
 const matchSearch = (npmPackages, search) => {
   return matchSorter(npmPackages, search, {
@@ -39,6 +42,7 @@ const matchSearch = (npmPackages, search) => {
       },
       { threshold: matchSorter.rankings.WORD_STARTS_WITH, key: 'attributes.description' },
     ],
+    baseSort: (a, b) => (a.index < b.index ? -1 : 1),
   });
 };
 
@@ -49,10 +53,18 @@ const MarketPlacePage = () => {
   const trackUsageRef = useRef(trackUsage);
   const toggleNotification = useNotification();
   const [searchQuery, setSearchQuery] = useState('');
-  const [npmPackageType, setNpmPackageType] = useState('plugin');
-  const { autoReload: isInDevelopmentMode, dependencies, useYarn } = useAppInfos();
+  const [{ query }, setQuery] = useQueryParams();
+
+  const { autoReload: isInDevelopmentMode, dependencies, useYarn, strapiVersion } = useAppInfos();
   const isOnline = useNavigatorOnLine();
 
+  const npmPackageType = query?.npmPackageType || 'plugin';
+
+  const [tabQuery, setTabQuery] = useState({
+    plugin: npmPackageType === 'plugin' ? { ...query } : {},
+    provider: npmPackageType === 'provider' ? { ...query } : {},
+  });
+
   useFocusWhenNavigate();
 
   const marketplaceTitle = formatMessage({
@@ -72,11 +84,11 @@ const MarketPlacePage = () => {
     );
   };
 
-  const { status: marketplacePluginsStatus, data: marketplacePluginsResponse } =
-    useFetchMarketplacePlugins(notifyMarketplaceLoad);
-
   const { status: marketplaceProvidersStatus, data: marketplaceProvidersResponse } =
-    useFetchMarketplaceProviders(notifyMarketplaceLoad);
+    useFetchMarketplaceProviders(notifyMarketplaceLoad, tabQuery.provider);
+
+  const { status: marketplacePluginsStatus, data: marketplacePluginsResponse } =
+    useFetchMarketplacePlugins(notifyMarketplaceLoad, tabQuery.plugin);
 
   const isLoading = [marketplacePluginsStatus, marketplaceProvidersStatus].includes('loading');
 
@@ -169,13 +181,44 @@ const MarketPlacePage = () => {
   );
 
   const handleTabChange = (selected) => {
-    const packageType = selected === 0 ? 'plugin' : 'provider';
-    setNpmPackageType(packageType);
+    const selectedTab = selected === 0 ? 'plugin' : 'provider';
+    const hasTabQuery = tabQuery[selectedTab] && Object.keys(tabQuery[selectedTab]).length;
+
+    if (hasTabQuery) {
+      setQuery({ ...tabQuery[selectedTab], npmPackageType: selectedTab });
+    } else {
+      setQuery({
+        npmPackageType: selectedTab,
+        // Clear filters
+        collections: [],
+        categories: [],
+        sort: 'name:asc',
+      });
+    }
+  };
+
+  const handleSelectChange = (update) => {
+    setQuery(update);
+    setTabQuery((prev) => ({
+      ...prev,
+      [npmPackageType]: { ...prev[npmPackageType], ...update },
+    }));
+  };
+
+  const handleSelectClear = (filterType) => {
+    setQuery({ [filterType]: [] }, 'remove');
+    setTabQuery((prev) => ({ ...prev, [npmPackageType]: {} }));
   };
 
   // Check if plugins and providers are installed already
   const installedPackageNames = Object.keys(dependencies);
 
+  const possibleCollections =
+    npmPackageType === 'plugin'
+      ? marketplacePluginsResponse.meta.collections
+      : marketplaceProvidersResponse.meta.collections;
+  const possibleCategories = marketplacePluginsResponse.meta.categories;
+
   return (
     <Layout>
       <Main>
@@ -215,6 +258,7 @@ const MarketPlacePage = () => {
             })}
             id="tabs"
             variant="simple"
+            initialSelectedTabIndex={['plugin', 'provider'].indexOf(npmPackageType)}
             onTabChange={handleTabChange}
           >
             <Box paddingBottom={4}>
@@ -235,6 +279,21 @@ const MarketPlacePage = () => {
                 </Tab>
               </Tabs>
             </Box>
+            <Flex paddingBottom={4} gap={2}>
+              <SortSelect
+                sortQuery={query?.sort || 'name:asc'}
+                handleSelectChange={handleSelectChange}
+              />
+              <NpmPackagesFilters
+                npmPackageType={npmPackageType}
+                possibleCollections={possibleCollections}
+                possibleCategories={possibleCategories}
+                query={query || {}}
+                handleSelectChange={handleSelectChange}
+                handleSelectClear={handleSelectClear}
+              />
+            </Flex>
+
             <TabPanels>
               {/* Plugins panel */}
               <TabPanel>
@@ -247,6 +306,7 @@ const MarketPlacePage = () => {
                     useYarn={useYarn}
                     isInDevelopmentMode={isInDevelopmentMode}
                     npmPackageType="plugin"
+                    strapiAppVersion={strapiVersion}
                   />
                 )}
               </TabPanel>

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormApiTokenContainer/index.js

@@ -111,7 +111,7 @@ const FormApiTokenContainer = ({
                 id: 'Settings.apiTokens.form.duration',
                 defaultMessage: 'Token duration',
               })}
-              value={values.lifespan}
+              value={values.lifespan !== null ? values.lifespan : '0'}
               error={
                 errors.lifespan
                   ? formatMessage(
@@ -146,7 +146,7 @@ const FormApiTokenContainer = ({
                   defaultMessage: '90 days',
                 })}
               </Option>
-              <Option value={null}>
+              <Option value="0">
                 {formatMessage({
                   id: 'Settings.apiTokens.duration.unlimited',
                   defaultMessage: 'Unlimited',
@@ -234,7 +234,7 @@ FormApiTokenContainer.propTypes = {
   }).isRequired,
   isCreating: PropTypes.bool.isRequired,
   apiToken: PropTypes.shape({
-    id: PropTypes.string,
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     type: PropTypes.string,
     lifespan: PropTypes.number,
     name: PropTypes.string,
@@ -242,13 +242,14 @@ FormApiTokenContainer.propTypes = {
     permissions: PropTypes.array,
     description: PropTypes.string,
     createdAt: PropTypes.string,
-  }).isRequired,
+  }),
   onDispatch: PropTypes.func.isRequired,
   setHasChangedPermissions: PropTypes.func.isRequired,
 };
 
 FormApiTokenContainer.defaultProps = {
   errors: {},
+  apiToken: {},
 };
 
 export default FormApiTokenContainer;

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormBody/index.js

@@ -19,7 +19,7 @@ const FormBody = ({
   return (
     <ContentLayout>
       <Stack spacing={6}>
-        {Boolean(apiToken?.name) && <HeaderContentBox apiToken={apiToken.accessKey} />}
+        {Boolean(apiToken?.name) && <HeaderContentBox apiToken={apiToken?.accessKey} />}
         <FormApiTokenContainer
           errors={errors}
           onChange={onChange}
@@ -48,7 +48,7 @@ FormBody.propTypes = {
     type: PropTypes.string,
   }),
   apiToken: PropTypes.shape({
-    id: PropTypes.string,
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     type: PropTypes.string,
     lifespan: PropTypes.number,
     name: PropTypes.string,
@@ -56,7 +56,7 @@ FormBody.propTypes = {
     permissions: PropTypes.array,
     description: PropTypes.string,
     createdAt: PropTypes.string,
-  }).isRequired,
+  }),
   onChange: PropTypes.func.isRequired,
   canEditInputs: PropTypes.bool.isRequired,
   isCreating: PropTypes.bool.isRequired,
@@ -72,6 +72,7 @@ FormBody.propTypes = {
 
 FormBody.defaultProps = {
   errors: {},
+  apiToken: {},
 };
 
 export default FormBody;

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormHead/index.js

@@ -67,7 +67,7 @@ const FormHead = ({ apiToken, setApiToken, canEditInputs, canRegenerate, isSubmi
 
 FormHead.propTypes = {
   apiToken: PropTypes.shape({
-    id: PropTypes.string,
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     type: PropTypes.string,
     lifespan: PropTypes.number,
     name: PropTypes.string,
@@ -75,11 +75,15 @@ FormHead.propTypes = {
     permissions: PropTypes.array,
     description: PropTypes.string,
     createdAt: PropTypes.string,
-  }).isRequired,
+  }),
   canEditInputs: PropTypes.bool.isRequired,
   canRegenerate: PropTypes.bool.isRequired,
   setApiToken: PropTypes.func.isRequired,
   isSubmitting: PropTypes.bool.isRequired,
 };
 
+FormHead.defaultProps = {
+  apiToken: undefined,
+};
+
 export default FormHead;

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Regenerate/index.js

@@ -62,7 +62,7 @@ Regenerate.defaultProps = { onRegenerate() {} };
 
 Regenerate.propTypes = {
   onRegenerate: PropTypes.func,
-  idToRegenerate: PropTypes.string.isRequired,
+  idToRegenerate: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
 };
 
 export default Regenerate;

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js

@@ -152,6 +152,10 @@ const ApiTokenCreateView = () => {
   const handleSubmit = async (body, actions) => {
     trackUsageRef.current(isCreating ? 'willCreateToken' : 'willEditToken');
     lockApp();
+    const lifespanVal =
+      body.lifespan && parseInt(body.lifespan, 10) && body.lifespan !== '0'
+        ? parseInt(body.lifespan, 10)
+        : null;
 
     try {
       const {
@@ -159,10 +163,7 @@ const ApiTokenCreateView = () => {
       } = isCreating
         ? await axiosInstance.post(`/admin/api-tokens`, {
             ...body,
-            lifespan:
-              body.lifespan && parseInt(body.lifespan, 10)
-                ? parseInt(body.lifespan, 10)
-                : body.lifespan,
+            lifespan: lifespanVal,
             permissions: body.type === 'custom' ? state.selectedActions : null,
           })
         : await axiosInstance.put(`/admin/api-tokens/${id}`, {

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js

@@ -8,7 +8,7 @@ const schema = yup.object().shape({
     .oneOf(['read-only', 'full-access', 'custom'])
     .required(translatedErrors.required),
   description: yup.string().nullable(),
-  lifespan: yup.number().integer().min(1).nullable().defined(translatedErrors.required),
+  lifespan: yup.number().integer().min(0).nullable().defined(translatedErrors.required),
 });
 
 export default schema;

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/index.js

@@ -5,14 +5,9 @@ import { Box } from '@strapi/design-system/Box';
 import { Flex } from '@strapi/design-system/Flex';
 import { Typography } from '@strapi/design-system/Typography';
 import { MultiSelectNested } from '@strapi/design-system/Select';
-import upperFirst from 'lodash/upperFirst';
 import { useIntl } from 'react-intl';
-import styled from 'styled-components';
-import { rowHeight } from '../../Permissions/utils/constants';
 
-const FlexWrapper = styled(Flex)`
-  height: ${rowHeight};
-`;
+import { getNestedOptions, getSelectedValues, getNewStateFromChangedValues } from './utils/options';
 
 const ActionRow = ({
   arrayOfOptionsGroupedByCategory,
@@ -24,40 +19,13 @@ const ActionRow = ({
   value,
 }) => {
   const { formatMessage } = useIntl();
-  const options = arrayOfOptionsGroupedByCategory.reduce((arr, curr) => {
-    const [label, children] = curr;
-    const obj = {
-      label: upperFirst(label),
-      children: children.map((child) => ({
-        label: child.displayName,
-        value: child.id,
-      })),
-    };
 
-    return [...arr, obj];
-  }, []);
-
-  // Output: ['value1', 'value2']
-  const values = Object.values(value)
-    .map((x) =>
-      Object.entries(x)
-        .filter(([, value]) => value)
-        .map(([key]) => key)
-    )
-    .flat();
-
-  // ! Only expects arrayOfOpt to be [['default', obj]] - might break in future changes
   const handleChange = (val) => {
-    const [[, values]] = arrayOfOptionsGroupedByCategory;
-    const formattedValues = values.reduce(
-      (acc, curr) => ({ [curr.id]: val.includes(curr.id), ...acc }),
-      {}
-    );
-    onChange(name, formattedValues);
+    onChange(name, getNewStateFromChangedValues(arrayOfOptionsGroupedByCategory, val));
   };
 
   return (
-    <FlexWrapper as="li" background={isGrey ? 'neutral100' : 'neutral0'}>
+    <Flex as="li" background={isGrey ? 'neutral100' : 'neutral0'} paddingBottom={3} paddingTop={3}>
       <Flex paddingLeft={6} style={{ width: 180 }}>
         <Typography variant="sigma" textColor="neutral600">
           {formatMessage({
@@ -85,12 +53,12 @@ const ActionRow = ({
           id={name}
           customizeContent={(values) => `${values.length} currently selected`}
           onChange={handleChange}
-          value={values}
-          options={options}
+          value={getSelectedValues(value)}
+          options={getNestedOptions(arrayOfOptionsGroupedByCategory)}
           disabled={isFormDisabled || IS_DISABLED}
         />
       </Box>
-    </FlexWrapper>
+    </Flex>
   );
 };
 
@@ -103,4 +71,5 @@ ActionRow.propTypes = {
   value: PropTypes.object.isRequired,
   onChange: PropTypes.func.isRequired,
 };
+
 export default ActionRow;

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/options.js

@@ -0,0 +1,31 @@
+import upperFirst from 'lodash/upperFirst';
+
+const getSelectedValues = (rawValue) =>
+  Object.values(rawValue)
+    .map((x) =>
+      Object.entries(x)
+        .filter(([, value]) => value)
+        .map(([key]) => key)
+    )
+    .flat();
+
+const getNestedOptions = (options) =>
+  options.reduce((acc, [label, children]) => {
+    acc.push({
+      label: upperFirst(label),
+      children: children.map((child) => ({
+        label: child.displayName,
+        value: child.id,
+      })),
+    });
+
+    return acc;
+  }, []);
+
+const getNewStateFromChangedValues = (options, changedValues) =>
+  options
+    .map(([, values]) => values)
+    .flat()
+    .reduce((acc, curr) => ({ [curr.id]: changedValues.includes(curr.id), ...acc }), {});
+
+export { getNestedOptions, getSelectedValues, getNewStateFromChangedValues };

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js

@@ -1,10 +1,12 @@
 import React, { useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
-import { Box } from '@strapi/design-system/Box';
 import { Button } from '@strapi/design-system/Button';
-import { Divider } from '@strapi/design-system/Divider';
-import { Stack } from '@strapi/design-system/Stack';
-import { ModalFooter, ModalHeader, ModalLayout } from '@strapi/design-system/ModalLayout';
+import {
+  ModalFooter,
+  ModalHeader,
+  ModalLayout,
+  ModalBody,
+} from '@strapi/design-system/ModalLayout';
 import { Breadcrumbs, Crumb } from '@strapi/design-system/Breadcrumbs';
 import { Typography } from '@strapi/design-system/Typography';
 import produce from 'immer';
@@ -88,48 +90,35 @@ const ConditionsModal = ({ actions, headerBreadCrumbs, isFormDisabled, onClosed,
           ))}
         </Breadcrumbs>
       </ModalHeader>
-      <Box padding={8}>
-        <Stack spacing={6}>
-          <Typography variant="beta" as="h2">
+      <ModalBody>
+        {actionsToDisplay.length === 0 && (
+          <Typography>
             {formatMessage({
-              id: 'Settings.permissions.conditions.define-conditions',
-              defaultMessage: 'Define conditions',
+              id: 'Settings.permissions.conditions.no-actions',
+              defaultMessage:
+                'You first need to select actions (create, read, update, ...) before defining conditions on them.',
             })}
           </Typography>
-          <Box>
-            <Divider />
-          </Box>
-          <Box>
-            {actionsToDisplay.length === 0 && (
-              <Typography>
-                {formatMessage({
-                  id: 'Settings.permissions.conditions.no-actions',
-                  defaultMessage:
-                    'You first need to select actions (create, read, update, ...) before defining conditions on them.',
-                })}
-              </Typography>
-            )}
-            <ul>
-              {actionsToDisplay.map(({ actionId, label, pathToConditionsObject }, index) => {
-                const name = pathToConditionsObject.join('..');
-
-                return (
-                  <ActionRow
-                    key={actionId}
-                    arrayOfOptionsGroupedByCategory={arrayOfOptionsGroupedByCategory}
-                    label={label}
-                    isFormDisabled={isFormDisabled}
-                    isGrey={index % 2 === 0}
-                    name={name}
-                    onChange={handleChange}
-                    value={get(state, name, {})}
-                  />
-                );
-              })}
-            </ul>
-          </Box>
-        </Stack>
-      </Box>
+        )}
+        <ul>
+          {actionsToDisplay.map(({ actionId, label, pathToConditionsObject }, index) => {
+            const name = pathToConditionsObject.join('..');
+
+            return (
+              <ActionRow
+                key={actionId}
+                arrayOfOptionsGroupedByCategory={arrayOfOptionsGroupedByCategory}
+                label={label}
+                isFormDisabled={isFormDisabled}
+                isGrey={index % 2 === 0}
+                name={name}
+                onChange={handleChange}
+                value={get(state, name, {})}
+              />
+            );
+          })}
+        </ul>
+      </ModalBody>
       <ModalFooter
         startActions={
           <Button variant="tertiary" onClick={onToggle}>

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js

@@ -232,7 +232,7 @@ const Collapse = ({
         </Flex>
         {isModalOpen && (
           <ConditionsModal
-            headerBreadCrumbs={[label, 'app.components.LeftMenuLinkContainer.settings']}
+            headerBreadCrumbs={[label, 'Settings.permissions.conditions.conditions']}
             actions={checkboxesActions}
             isFormDisabled={isFormDisabled}
             onClosed={handleModalClose}

package/admin/src/pages/SettingsPage/pages/Roles/ListPage/components/RoleRow/index.js

@@ -8,7 +8,7 @@ import { IconButton } from '@strapi/design-system/IconButton';
 import { stopPropagation, onRowClick, pxToRem } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 
-const RoleRow = ({ id, name, description, usersCount, icons }) => {
+const RoleRow = ({ id, name, description, usersCount, icons, rowIndex }) => {
   const { formatMessage } = useIntl();
 
   const usersCountText = formatMessage(
@@ -21,6 +21,7 @@ const RoleRow = ({ id, name, description, usersCount, icons }) => {
 
   return (
     <Tr
+      aria-rowindex={rowIndex}
       key={id}
       {...onRowClick({
         fn: icons[1].onClick,
@@ -60,6 +61,7 @@ RoleRow.propTypes = {
   description: PropTypes.string.isRequired,
   usersCount: PropTypes.number.isRequired,
   icons: PropTypes.array.isRequired,
+  rowIndex: PropTypes.number.isRequired,
 };
 
 export default RoleRow;

package/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js

@@ -168,7 +168,7 @@ const RoleListPage = () => {
             </Tr>
           </Thead>
           <Tbody>
-            {sortedRoles?.map((role) => (
+            {sortedRoles?.map((role, rowIndex) => (
               <RoleRow
                 key={role.id}
                 id={role.id}
@@ -176,6 +176,7 @@ const RoleListPage = () => {
                 description={role.description}
                 usersCount={role.usersCount}
                 icons={getIcons(role)}
+                rowIndex={rowIndex + 2}
               />
             ))}
           </Tbody>

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/EventInput/index.js

@@ -114,7 +114,7 @@ const EventInput = ({ isDraftAndPublish }) => {
               if (header === 'app.utils.publish' || header === 'app.utils.unpublish') {
                 return (
                   <td
-                    key={header}
+                    key={header.id}
                     title={formatMessage({
                       id: 'Settings.webhooks.event.publish-tooltip',
                       defaultMessage:
@@ -129,7 +129,7 @@ const EventInput = ({ isDraftAndPublish }) => {
               }
 
               return (
-                <td key={header}>
+                <td key={header.id}>
                   <Typography variant="sigma" textColor="neutral600">
                     {formatMessage(header)}
                   </Typography>

package/admin/src/translations/ca.json

@@ -107,7 +107,7 @@
   "Settings.permissions.conditions.anytime": "En qualsevol moment",
   "Settings.permissions.conditions.apply": "Aplicar",
   "Settings.permissions.conditions.can": "Poder",
-  "Settings.permissions.conditions.define-conditions": "Definir condicions",
+  "Settings.permissions.conditions.conditions": "Definir condicions",
   "Settings.permissions.conditions.links": "Enllaços",
   "Settings.permissions.conditions.no-actions": "No hi ha acció",
   "Settings.permissions.conditions.none-selected": "En qualsevol moment",

package/admin/src/translations/de.json

@@ -107,7 +107,7 @@
   "Settings.permissions.conditions.anytime": "Jederzeit",
   "Settings.permissions.conditions.apply": "Anwenden",
   "Settings.permissions.conditions.can": "Kann",
-  "Settings.permissions.conditions.define-conditions": "Bedingungen definieren",
+  "Settings.permissions.conditions.conditions": "Bedingungen definieren",
   "Settings.permissions.conditions.links": "Links",
   "Settings.permissions.conditions.no-actions": "Keine Aktionen",
   "Settings.permissions.conditions.none-selected": "Jederzeit",

package/admin/src/translations/dk.json

@@ -105,7 +105,7 @@
   "Settings.permissions.conditions.anytime": "Altid",
   "Settings.permissions.conditions.apply": "Godkend",
   "Settings.permissions.conditions.can": "Kan",
-  "Settings.permissions.conditions.define-conditions": "Definér betingelser",
+  "Settings.permissions.conditions.conditions": "Definér betingelser",
   "Settings.permissions.conditions.links": "Links",
   "Settings.permissions.conditions.no-actions": "Der er ingen handling",
   "Settings.permissions.conditions.none-selected": "Når som helst",