Skip to content

Commit 44e7c65

Browse files
john-bintz-sonarsourcegregaubert
authored andcommitted
SCA-1091 Implement Rescan Settings (#3448)
Co-authored-by: Greg Aubert <gregoire.aubert@sonarsource.com> GitOrigin-RevId: a5174f42db793164b385b652743980ecf382e2ce
1 parent a4796fb commit 44e7c65

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+569
-171
lines changed

apps/sq-server/src/main/js/apps/settings/__tests__/utils-test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
2020

21-
import { hasMessage } from '~sq-server-commons/helpers/l10n';
22-
import { mockComponent } from '~sq-server-commons/helpers/mocks/component';
23-
import { mockDefinition, mockSettingValue } from '~sq-server-commons/helpers/mocks/settings';
2421
import {
2522
ExtendedSettingDefinition,
26-
Setting,
2723
SettingFieldDefinition,
2824
SettingType,
29-
} from '~sq-server-commons/types/settings';
25+
} from '~shared/types/settings';
26+
import { hasMessage } from '~sq-server-commons/helpers/l10n';
27+
import { mockComponent } from '~sq-server-commons/helpers/mocks/component';
28+
import { mockDefinition, mockSettingValue } from '~sq-server-commons/helpers/mocks/settings';
29+
import { Setting } from '~sq-server-commons/types/settings';
3030
import {
3131
buildSettingLink,
3232
getDefaultValue,

apps/sq-server/src/main/js/apps/settings/components/AdditionalCategories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020

2121
import * as React from 'react';
22+
import { ExtendedSettingDefinition } from '~shared/types/settings';
2223
import { NEW_CODE_PERIOD_CATEGORY } from '~sq-server-commons/constants/settings';
2324
import { translate } from '~sq-server-commons/helpers/l10n';
24-
import { ExtendedSettingDefinition } from '~sq-server-commons/types/settings';
2525
import { Component } from '~sq-server-commons/types/types';
2626
import {
2727
ADVANCED_SECURITY_CATEGORY,

apps/sq-server/src/main/js/apps/settings/components/CategoryDefinitionsList.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020

2121
import { keyBy } from 'lodash';
2222
import * as React from 'react';
23+
import { ExtendedSettingDefinition } from '~shared/types/settings';
2324
import { getValues } from '~sq-server-commons/api/settings';
24-
import {
25-
ExtendedSettingDefinition,
26-
SettingDefinitionAndValue,
27-
} from '~sq-server-commons/types/settings';
25+
import { SettingDefinitionAndValue } from '~sq-server-commons/types/settings';
2826
import { Component } from '~sq-server-commons/types/types';
2927
import { SETTING_CONFIRMATION_MESSAGE_IDS } from '../constants';
3028
import SubCategoryDefinitionsList from './SubCategoryDefinitionsList';

apps/sq-server/src/main/js/apps/settings/components/Definition.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,15 @@ import {
3030
} from '@sonarsource/echoes-react';
3131
import * as React from 'react';
3232
import { FormattedMessage, useIntl } from 'react-intl';
33+
import { ExtendedSettingDefinition, SettingType, SettingValue } from '~shared/types/settings';
3334
import { translate, translateWithParameters } from '~sq-server-commons/helpers/l10n';
3435
import { parseError } from '~sq-server-commons/helpers/request';
3536
import {
3637
useGetValueQuery,
3738
useResetSettingsMutation,
3839
useSaveValueMutation,
3940
} from '~sq-server-commons/queries/settings';
40-
import {
41-
ExtendedSettingDefinition,
42-
SettingDefinitionAndValue,
43-
SettingType,
44-
SettingValue,
45-
} from '~sq-server-commons/types/settings';
41+
import { SettingDefinitionAndValue } from '~sq-server-commons/types/settings';
4642
import { Component } from '~sq-server-commons/types/types';
4743
import {
4844
combineDefinitionAndSettingValue,

apps/sq-server/src/main/js/apps/settings/components/DefinitionActions.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
import { Button, ButtonGroup, ButtonVariety, Text } from '@sonarsource/echoes-react';
2222
import * as React from 'react';
2323
import { Modal } from '~design-system';
24+
import { ExtendedSettingDefinition } from '~shared/types/settings';
2425
import { translate, translateWithParameters } from '~sq-server-commons/helpers/l10n';
25-
import { ExtendedSettingDefinition, Setting } from '~sq-server-commons/types/settings';
26+
import { Setting } from '~sq-server-commons/types/settings';
2627
import { getDefaultValue, getPropertyName, isEmptyValue } from '../utils';
2728

2829
type Props = {

apps/sq-server/src/main/js/apps/settings/components/DefinitionDescription.tsx

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,32 @@
1818
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
2020

21-
import { Heading, Text, Tooltip } from '@sonarsource/echoes-react';
22-
import { SafeHTMLInjection, SanitizeLevel } from '~shared/helpers/sanitize';
23-
import { translateWithParameters } from '~sq-server-commons/helpers/l10n';
24-
import { ExtendedSettingDefinition } from '~sq-server-commons/types/settings';
25-
import { getPropertyDescription, getPropertyName } from '../utils';
21+
import { Text, Tooltip } from '@sonarsource/echoes-react';
22+
import { FormattedMessage, useIntl } from 'react-intl';
23+
import DefinitionDescriptionBase from '~shared/components/configuration/DefinitionDescriptionBase';
24+
import { ExtendedSettingDefinition } from '~shared/types/settings';
2625

2726
interface Props {
2827
definition: ExtendedSettingDefinition;
2928
}
3029

3130
export default function DefinitionDescription({ definition }: Readonly<Props>) {
32-
const propertyName = getPropertyName(definition);
33-
const description = getPropertyDescription(definition);
31+
const intl = useIntl();
3432

3533
return (
36-
<div className="sw-w-abs-300">
37-
<Heading as="h4" className="sw-text-ellipsis sw-overflow-hidden">
38-
{propertyName}
39-
</Heading>
40-
41-
{description && (
42-
<SafeHTMLInjection htmlAsString={description} sanitizeLevel={SanitizeLevel.RESTRICTED}>
43-
<div className="markdown sw-mt-1" />
44-
</SafeHTMLInjection>
45-
)}
46-
47-
<Tooltip content={translateWithParameters('settings.key_x', definition.key)}>
34+
<DefinitionDescriptionBase definition={definition}>
35+
<Tooltip
36+
content={intl.formatMessage(
37+
{
38+
id: 'settings.key_x',
39+
},
40+
{ 0: definition.key },
41+
)}
42+
>
4843
<Text as="div" className="sw-mt-4" isSubtle>
49-
{translateWithParameters('settings.key_x', definition.key)}
44+
<FormattedMessage id="settings.key_x" values={{ 0: definition.key }} />
5045
</Text>
5146
</Tooltip>
52-
</div>
47+
</DefinitionDescriptionBase>
5348
);
5449
}

apps/sq-server/src/main/js/apps/settings/components/PageHeader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
import { useIntl } from 'react-intl';
2222
import { Title } from '~design-system';
23+
import { ExtendedSettingDefinition } from '~shared/types/settings';
2324
import InstanceMessage from '~sq-server-commons/components/common/InstanceMessage';
2425
import { getInstance } from '~sq-server-commons/helpers/system';
2526
import { Feature } from '~sq-server-commons/types/features';
26-
import { ExtendedSettingDefinition } from '~sq-server-commons/types/settings';
2727
import { Component } from '~sq-server-commons/types/types';
2828
import { usePurchasableFeature } from '../utils';
2929
import SettingsSearch from './SettingsSearch';

apps/sq-server/src/main/js/apps/settings/components/SettingsApp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020

2121
import * as React from 'react';
22+
import { ExtendedSettingDefinition } from '~shared/types/settings';
2223
import { getDefinitions } from '~sq-server-commons/api/settings';
2324
import withComponentContext from '~sq-server-commons/context/componentContext/withComponentContext';
24-
import { ExtendedSettingDefinition } from '~sq-server-commons/types/settings';
2525
import { Component } from '~sq-server-commons/types/types';
2626
import '../styles.css';
2727
import SettingsAppRenderer from './SettingsAppRenderer';

apps/sq-server/src/main/js/apps/settings/components/SettingsAppRenderer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import { Helmet } from 'react-helmet-async';
2525
import { LargeCenteredLayout, themeBorder } from '~design-system';
2626
import { withRouter } from '~shared/components/hoc/withRouter';
2727
import { Location } from '~shared/types/router';
28+
import { ExtendedSettingDefinition } from '~shared/types/settings';
2829
import ModeBanner from '~sq-server-commons/components/common/ModeBanner';
2930
import { translate } from '~sq-server-commons/helpers/l10n';
30-
import { ExtendedSettingDefinition } from '~sq-server-commons/types/settings';
3131
import { Component } from '~sq-server-commons/types/types';
3232
import { CATEGORY_OVERRIDES } from '../constants';
3333
import { getDefaultCategory } from '../utils';

apps/sq-server/src/main/js/apps/settings/components/SettingsSearch.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import lunr, { LunrIndex } from 'lunr';
2323
import * as React from 'react';
2424
import { withRouter } from '~shared/components/hoc/withRouter';
2525
import { Router } from '~shared/types/router';
26+
import { ExtendedSettingDefinition } from '~shared/types/settings';
2627
import withAvailableFeatures, {
2728
WithAvailableFeaturesProps,
2829
} from '~sq-server-commons/context/available-features/withAvailableFeatures';
2930
import { KeyboardKeys } from '~sq-server-commons/helpers/keycodes';
30-
import { ExtendedSettingDefinition } from '~sq-server-commons/types/settings';
3131
import { Component } from '~sq-server-commons/types/types';
3232
import {
3333
ADDITIONAL_PROJECT_SETTING_DEFINITIONS,

0 commit comments

Comments
 (0)