Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent the user from requiring tags when there is no active tag #42004

Merged
merged 5 commits into from
May 24, 2024
Merged

Prevent the user from requiring tags when there is no active tag #42004

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b420eb
fix: when there is no active tags, prevent the user from requiring ta…
May 10, 2024
790466c
fix: delete the log statement
May 10, 2024
68c786b
Merge branch 'main' into hayata-do-not-allow-users-from-requiring-tag…
May 13, 2024
a6a3c05
fix: duplicate declarations
May 13, 2024
cf290b1
Merge branch 'main' into hayata-do-not-allow-users-from-requiring-tag…
May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import * as Policy from '@libs/actions/Policy';
import Navigation from '@libs/Navigation/Navigation';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as PolicyUtils from '@libs/PolicyUtils';
import type {SettingsNavigatorParamList} from '@navigation/types';
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
Expand All @@ -32,7 +33,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
const styles = useThemeStyles();
const {translate} = useLocalize();
const [policyTagLists, isMultiLevelTags] = useMemo(() => [PolicyUtils.getTagLists(policyTags), PolicyUtils.isMultiLevelTags(policyTags)], [policyTags]);

const hasEnabledOptions = OptionsListUtils.hasEnabledOptions(Object.values(policyTags ?? {}).flatMap(({tags}) => Object.values(tags)));
Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Jul 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these changes are partly the cause of this issue
But root cause related with this PR and these changes

Since in this PR we pass errors separately from tag objects, we can't retrieve tags from the error object

const updateWorkspaceRequiresTag = useCallback(
(value: boolean) => {
Policy.setPolicyRequiresTag(route.params.policyID, value);
Expand Down Expand Up @@ -66,6 +67,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
isOn={policy?.requiresTag ?? false}
accessibilityLabel={translate('workspace.tags.requiresTag')}
onToggle={updateWorkspaceRequiresTag}
disabled={!policy?.areTagsEnabled || !hasEnabledOptions}
/>
</View>
</View>
Expand Down
Loading