Skip to content

Commit

Permalink
[frontend] fix EE button in organization edition is not clickable (#6378
Browse files Browse the repository at this point in the history
)
  • Loading branch information
SarahBocognano authored Apr 3, 2024
1 parent 2f84e00 commit 0067e4d
Show file tree
Hide file tree
Showing 10 changed files with 115 additions and 24 deletions.
12 changes: 10 additions & 2 deletions opencti-platform/opencti-front/lang/front/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -2675,5 +2675,13 @@
"Public dashboard": "Öffentliches Dashboard",
"Show left navigation submenu icons": "Symbole des linken Navigations-Untermenüs anzeigen",
"Auto collapse submenus in left navigation": "Untermenüs in der linken Navigation automatisch einklappen",
"Unless specific groups are selected, user will be created with default groups only.": "Wenn keine spezifischen Gruppen ausgewählt werden, wird der Benutzer nur mit den Standardgruppen erstellt."
}
"Unless specific groups are selected, user will be created with default groups only.": "Wenn keine spezifischen Gruppen ausgewählt werden, wird der Benutzer nur mit den Standardgruppen erstellt.",
"By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:": "Mit der Aktivierung der OpenCTI Enterprise Edition erklären Sie (und Ihre Organisation) sich mit den zusätzlichen Lizenz- und Nutzungsbedingungen der OpenCTI Enterprise Edition (EE) einverstanden:",
"OpenCTI EE is free-to-use for development, testing and research purposes as well as for non-profit organizations.": "OpenCTI EE ist für Entwicklungs-, Test- und Forschungszwecke sowie für gemeinnützige Organisationen frei nutzbar.",
"OpenCTI EE is included for all Filigran SaaS customers without additional fee.": "OpenCTI EE ist für alle Filigran SaaS-Kunden ohne zusätzliche Gebühr enthalten.",
"For all other usages, you (and your organization) should have entered in a": "Für alle anderen Verwendungen sollten Sie (und Ihre Organisation) eine",
"Most used filters": "Meist genutzte Filter",
"All other filters": "Alle anderen Filter",
"Testing csv mapper": "Testen des csv-Mappers",
"This operations will only apply on labels or markings added in the context of this playbook such as enrichment or other knowledge manipulations but not if the labels or markings are already written in the platform.": "Diese Operationen gelten nur für Labels oder Markierungen, die im Kontext dieses Playbooks hinzugefügt werden, wie z. B. Anreicherung oder andere Wissensmanipulationen, nicht aber, wenn die Labels oder Markierungen bereits in der Plattform geschrieben sind."
}
12 changes: 10 additions & 2 deletions opencti-platform/opencti-front/lang/front/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2675,5 +2675,13 @@
"Link created": "Link created",
"Show left navigation submenu icons": "Show left navigation submenu icons",
"Auto collapse submenus in left navigation": "Auto collapse submenus in left navigation",
"Public dashboard": "Public dashboard"
}
"Public dashboard": "Public dashboard",
"By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:": "By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:",
"OpenCTI EE is free-to-use for development, testing and research purposes as well as for non-profit organizations.": "OpenCTI EE is free-to-use for development, testing and research purposes as well as for non-profit organizations.",
"OpenCTI EE is included for all Filigran SaaS customers without additional fee.": "OpenCTI EE is included for all Filigran SaaS customers without additional fee.",
"For all other usages, you (and your organization) should have entered in a": "For all other usages, you (and your organization) should have entered in a",
"Most used filters": "Most used filters",
"All other filters": "All other filters",
"Testing csv mapper": "Testing csv mapper",
"This operations will only apply on labels or markings added in the context of this playbook such as enrichment or other knowledge manipulations but not if the labels or markings are already written in the platform.": "This operations will only apply on labels or markings added in the context of this playbook such as enrichment or other knowledge manipulations but not if the labels or markings are already written in the platform."
}
12 changes: 10 additions & 2 deletions opencti-platform/opencti-front/lang/front/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -2675,5 +2675,13 @@
"Public dashboard": "Cuadro de mandos público",
"Show left navigation submenu icons": "Mostrar iconos del submenú de navegación izquierdo",
"Auto collapse submenus in left navigation": "Submenús contraídos automáticamente en la navegación izquierda",
"Unless specific groups are selected, user will be created with default groups only.": "A menos que se seleccionen grupos específicos, el usuario se creará sólo con los grupos por defecto."
}
"Unless specific groups are selected, user will be created with default groups only.": "A menos que se seleccionen grupos específicos, el usuario se creará sólo con los grupos por defecto.",
"By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:": "Al activar OpenCTI Enterprise Edition, usted (y su organización) acepta los términos y condiciones de uso de la licencia complementaria de OpenCTI Enterprise Edition (EE):",
"OpenCTI EE is free-to-use for development, testing and research purposes as well as for non-profit organizations.": "OpenCTI EE es de uso gratuito para fines de desarrollo, pruebas e investigación, así como para organizaciones sin ánimo de lucro.",
"OpenCTI EE is included for all Filigran SaaS customers without additional fee.": "OpenCTI EE está incluido para todos los clientes de Filigran SaaS sin cargo adicional.",
"For all other usages, you (and your organization) should have entered in a": "Para todos los demás usos, usted (y su organización) deben haber introducido un",
"Most used filters": "Filtros más utilizados",
"All other filters": "Todos los demás filtros",
"Testing csv mapper": "Probando el mapeador csv",
"This operations will only apply on labels or markings added in the context of this playbook such as enrichment or other knowledge manipulations but not if the labels or markings are already written in the platform.": "Estas operaciones sólo se aplicarán a las etiquetas o marcas añadidas en el contexto de este libro de jugadas, como el enriquecimiento u otras manipulaciones del conocimiento, pero no si las etiquetas o marcas ya están escritas en la plataforma."
}
12 changes: 10 additions & 2 deletions opencti-platform/opencti-front/lang/front/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -2675,5 +2675,13 @@
"Public dashboard": "Tableau de bord public",
"Show left navigation submenu icons": "Afficher les icônes des sous-menus de la navigation de gauche",
"Auto collapse submenus in left navigation": "Fermer automatiquement les sous-menus de la navigation de gauche",
"Unless specific groups are selected, user will be created with default groups only.": "À moins que des groupes spécifiques ne soient sélectionnés, l'utilisateur sera créé avec les groupes par défaut uniquement."
}
"Unless specific groups are selected, user will be created with default groups only.": "À moins que des groupes spécifiques ne soient sélectionnés, l'utilisateur sera créé avec les groupes par défaut uniquement.",
"By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:": "En activant l'OpenCTI Enterprise Edition, vous (et votre organisation) acceptez les termes de la licence supplémentaire de l'OpenCTI Enterprise Edition (EE) et les conditions d'utilisation :",
"OpenCTI EE is free-to-use for development, testing and research purposes as well as for non-profit organizations.": "OpenCTI EE est libre d'utilisation à des fins de développement, de test et de recherche ainsi que pour les organisations à but non lucratif.",
"OpenCTI EE is included for all Filigran SaaS customers without additional fee.": "OpenCTI EE est inclus pour tous les clients SaaS de Filigran sans frais supplémentaires.",
"For all other usages, you (and your organization) should have entered in a": "Pour toutes les autres utilisations, vous (et votre organisation) devez avoir conclu un accord de licence avec Filigran",
"Most used filters": "Filtres les plus utilisés",
"All other filters": "Tous les autres filtres",
"Testing csv mapper": "Test du mappeur csv",
"This operations will only apply on labels or markings added in the context of this playbook such as enrichment or other knowledge manipulations but not if the labels or markings are already written in the platform.": "Ces opérations ne s'appliqueront qu'aux étiquettes ou marquages ajoutés dans le contexte de ce playbook, comme l'enrichissement ou d'autres manipulations de connaissances, mais pas si les étiquettes ou marquages sont déjà écrits dans la plateforme."
}
12 changes: 10 additions & 2 deletions opencti-platform/opencti-front/lang/front/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -2675,5 +2675,13 @@
"Public dashboard": "公開ダッシュボード",
"Show left navigation submenu icons": "左側のナビゲーション サブメニュー アイコンを表示する",
"Auto collapse submenus in left navigation": "左側のナビゲーションのサブメニューを自動的に折りたたむ",
"Unless specific groups are selected, user will be created with default groups only.": "特定のグループを選択しない限り、ユーザーはデフォルトのグループのみで作成されます。"
}
"Unless specific groups are selected, user will be created with default groups only.": "特定のグループを選択しない限り、ユーザーはデフォルトのグループのみで作成されます。",
"By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:": "OpenCTI Enterprise Editionを有効にすることで、あなた(およびあなたの組織)はOpenCTI Enterprise Edition (EE)の補足ライセンス条項と使用条件に同意することになります:",
"OpenCTI EE is free-to-use for development, testing and research purposes as well as for non-profit organizations.": "OpenCTI EEは、開発、テスト、研究目的、および非営利組織のために無料で使用できます。",
"OpenCTI EE is included for all Filigran SaaS customers without additional fee.": "OpenCTI EEは、Filigran SaaSのすべてのお客様に追加料金なしで含まれています。",
"For all other usages, you (and your organization) should have entered in a": "その他のすべての使用については、お客様(およびお客様の組織)が",
"Most used filters": "最も使用されるフィルター",
"All other filters": "その他のフィルター",
"Testing csv mapper": "csvマッパーのテスト",
"This operations will only apply on labels or markings added in the context of this playbook such as enrichment or other knowledge manipulations but not if the labels or markings are already written in the platform.": "この操作は、エンリッチメントやその他の知識操作など、このプレイブックのコンテキストで追加されたラベルやマーキングに対してのみ適用されます。"
}
12 changes: 10 additions & 2 deletions opencti-platform/opencti-front/lang/front/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -2675,5 +2675,13 @@
"Public dashboard": "公共仪表板",
"Show left navigation submenu icons": "显示左侧导航子菜单图标",
"Auto collapse submenus in left navigation": "自动折叠左侧导航中的子菜单",
"Unless specific groups are selected, user will be created with default groups only.": "除非选择了特定组,否则创建的用户将只包含默认组。"
}
"Unless specific groups are selected, user will be created with default groups only.": "除非选择了特定组,否则创建的用户将只包含默认组。",
"By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:": "启用 OpenCTI 企业版,即表示您(和您的组织)同意 OpenCTI 企业版 (EE) 补充许可条款和使用条件:",
"OpenCTI EE is free-to-use for development, testing and research purposes as well as for non-profit organizations.": "OpenCTI EE 可免费用于开发、测试和研究目的,也可用于非营利组织。",
"OpenCTI EE is included for all Filigran SaaS customers without additional fee.": "所有 Filigran SaaS 客户均可免费使用 OpenCTI EE。",
"For all other usages, you (and your organization) should have entered in a": "对于所有其他用途,您(和您的组织)应在 \"OpenCTI EE \"网站上注册。",
"Most used filters": "最常用的过滤器",
"All other filters": "所有其他筛选器",
"Testing csv mapper": "测试 csv 映射器",
"This operations will only apply on labels or markings added in the context of this playbook such as enrichment or other knowledge manipulations but not if the labels or markings are already written in the platform.": "此操作仅适用于在此播放列表中添加的标签或标记,如充实或其他知识操作,但不适用于平台中已写入的标签或标记。"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import makeStyles from '@mui/styles/makeStyles';
import React, { FunctionComponent } from 'react';
import EEChip from '@components/common/entreprise_edition/EEChip';
import { useFormatter } from '../../../../components/i18n';

const useStyles = makeStyles({
labelRoot: {
'& .MuiFormLabel-root': {
zIndex: 1,
},
},
});

interface EEFieldProps {
children: React.ReactElement;
featureLabel: string;
}

const EEField: FunctionComponent<EEFieldProps> = ({
children,
featureLabel,
}) => {
const classes = useStyles();
const { t_i18n } = useFormatter();
const component = React.cloneElement(children, {
label: <>{t_i18n(children.props.label)}<EEChip feature={featureLabel} /></>,
});
return (
<div className={classes.labelRoot}>
{component}
</div>
);
};

export default EEField;
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ EnterpriseEditionAgreementProps
control={
<Checkbox
checked={enterpriseEditionConsent}
onChange={(event) => setEnterpriseEditionConsent(event.target.checked)
}
disabled={false}
onChange={(event) => setEnterpriseEditionConsent(event.target.checked)}
/>
}
label={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { graphql } from 'react-relay';
import * as Yup from 'yup';
import Drawer, { DrawerVariant } from '@components/common/drawer/Drawer';
import GroupField from '@components/common/form/GroupField';
import EEChip from '@components/common/entreprise_edition/EEChip';
import { GenericContext } from '@components/common/model/GenericContextModel';
import OpenVocabField from '@components/common/form/OpenVocabField';
import EEField from '@components/common/entreprise_edition/EEField';
import { useFormatter } from '../../../../components/i18n';
import MarkdownField from '../../../../components/MarkdownField';
import { SubscriptionFocus } from '../../../../components/Subscription';
Expand Down Expand Up @@ -273,14 +273,16 @@ const SettingsOrganizationEdition = ({
context={context}
/>
<SettingsOrganizationHiddenTypesField organizationData={organization} />
<GroupField
name="grantable_groups"
label={<>{t_i18n('Grantable groups by Organization administrators')}<EEChip feature={t_i18n('Organization sharing')} /></>}
multiple={true}
onChange={editor.changeGrantableGroups}
style={{ marginTop: 20 }}
disabled={!isEnterpriseEdition}
/>
<EEField featureLabel={'Organization sharing'}>
<GroupField
name="grantable_groups"
label={'Grantable groups by Organization administrators'}
multiple={true}
onChange={editor.changeGrantableGroups}
style={{ marginTop: 20 }}
disabled={!isEnterpriseEdition}
/>
</EEField>
{enableReferences && (
<CommitMessage
submitForm={submitForm}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ const UserEdition: FunctionComponent<UserEditionProps> = ({
<Tab label={t_i18n('Overview')} />
<Tab disabled={external} label={t_i18n('Password')} />
<Tab label={t_i18n('Groups')} />
{hasSetAccess && <Tab label={<div>{t_i18n('Organizations admin')}<EEChip /></div>} />}
{hasSetAccess
&& <Tab label={
<div style={{ alignItems: 'center', display: 'flex' }}>
{t_i18n('Organizations admin')}<EEChip />
</div>}
/>
}
</Tabs>
</Box>
{currentTab === 0 && (
Expand Down

0 comments on commit 0067e4d

Please sign in to comment.