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

feat(resource-adm): move access package list into accordion to shrink policy rule height #14626

Merged
merged 4 commits into from
Feb 14, 2025
Merged

feat(resource-adm): move access package list into accordion to shrink policy rule height #14626

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6018a17
move access package list into accordion to shrink policy rule height
mgunnerud Feb 11, 2025
9e346ee
Merge branch 'main' into feat/14623-hideminify-access-package-list-in…
mgunnerud Feb 11, 2025
5115c5c
Merge branch 'main' into feat/14623-hideminify-access-package-list-in…
mgunnerud Feb 13, 2025
fa9ac26
Merge branch 'main' into feat/14623-hideminify-access-package-list-in…
mgunnerud Feb 13, 2025
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
3 changes: 2 additions & 1 deletion frontend/language/src/nb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"app_deployment.pipeline_deployment.build_result.partiallySucceeded": "Versjonen er publisert i miljøet, men har noen feil eller mangler.",
"app_deployment.pipeline_deployment.build_result.succeeded": "Versjonen er publisert i miljøet.",
"app_deployment.pipeline_undeploy.build_result.failed": "Kunne ikke avpublisere appen. Prøv på nytt nå, eller vent litt og prøv igjen.",
"app_deployment.pipeline_undeploy.build_result.none": "Avpubliserer\u2026",
"app_deployment.pipeline_undeploy.build_result.none": "Avpubliserer…",
"app_deployment.pipeline_undeploy.build_result.succeeded": "Appen er tatt bort fra miljøet",
"app_deployment.private_app_owner": "Som privatperson kan du ikke publisere denne appen til noe miljø.",
"app_deployment.private_app_owner_help": "Det er bare brukere i en organisasjon som kan publisere denne appen til et miljø. <a>Ta kontakt med oss</a> hvis du trenger hjelp.",
Expand Down Expand Up @@ -650,6 +650,7 @@
"overview.reset_repo_confirm_info": "Du sletter nå alle endringer du har gjort på <bold>{{repositoryName}}</bold>. Du kan ikke gjenopprette dem.",
"overview.reset_repo_confirm_repo_name": "Skriv inn navnet på appen for å bekrefte at du vil slette",
"overview.reset_repo_loading": "Sletter...",
"policy_editor.access_package_accordion_header": "Vis alle tilgangspakker",
"policy_editor.access_package_add": "Legg til tilgangspakke {{packageName}}",
"policy_editor.access_package_all_packages": "Alle tilgangspakker",
"policy_editor.access_package_chosen_packages": "Valgte tilgangspakker",
Expand Down
54 changes: 31 additions & 23 deletions ...r/src/components/PolicyCardRules/PolicyRule/PolicyAccessPackages/PolicyAccessPackages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ import {
import { ChosenAccessPackages } from './ChosenAccessPackages';
import { AllAccessPackages } from './AllAccessPackages';
import { PolicyAccessPackagesWarning } from './PolicyAccessPackagesWarning';
import { Accordion } from '@digdir/designsystemet-react';

export const PolicyAccessPackages = (): ReactElement => {
const { t } = useTranslation();
const [searchValue, setSearchValue] = useState<string>('');
const { policyRules, accessPackages, setPolicyRules, savePolicy } = usePolicyEditorContext();
const { policyRule } = usePolicyRuleContext();

const [searchValue, setSearchValue] = useState<string>('');
const [chosenAccessPackages, setChosenAccessPackages] = useState<string[]>(
policyRule.accessPackages,
);
Expand Down Expand Up @@ -77,33 +78,40 @@ export const PolicyAccessPackages = (): ReactElement => {
<StudioLabelAsParagraph size='md' spacing>
{t('policy_editor.access_package_header')}
</StudioLabelAsParagraph>
<PolicyAccessPackagesWarning />
<ChosenAccessPackages
chosenAccessPackages={chosenAccessPackages}
groupedAccessPackagesByArea={groupedAccessPackagesByArea}
handleSelectAccessPackage={handleSelectAccessPackage}
/>
<StudioLabelAsParagraph size='xs' spacing>
{t('policy_editor.access_package_all_packages')}
</StudioLabelAsParagraph>
<StudioTextfield
label={
<StudioLabelAsParagraph size='xs'>
{t('policy_editor.access_package_search')}
</StudioLabelAsParagraph>
}
hideLabel
placeholder={t('policy_editor.access_package_search')}
size='small'
value={searchValue}
onChange={handleSearch}
/>
<AllAccessPackages
chosenAccessPackages={chosenAccessPackages}
accessPackagesToRender={accessPackagesToRender}
searchValue={searchValue}
handleSelectAccessPackage={handleSelectAccessPackage}
/>
<Accordion>
<Accordion.Item>
<Accordion.Header>{t('policy_editor.access_package_accordion_header')}</Accordion.Header>
<Accordion.Content className={classes.accessPackages}>
<PolicyAccessPackagesWarning />
<StudioLabelAsParagraph size='xs' spacing>
{t('policy_editor.access_package_all_packages')}
</StudioLabelAsParagraph>
<StudioTextfield
label={
<StudioLabelAsParagraph size='xs'>
{t('policy_editor.access_package_search')}
</StudioLabelAsParagraph>
}
hideLabel
placeholder={t('policy_editor.access_package_search')}
size='small'
value={searchValue}
onChange={handleSearch}
/>
<AllAccessPackages
chosenAccessPackages={chosenAccessPackages}
accessPackagesToRender={accessPackagesToRender}
searchValue={searchValue}
handleSelectAccessPackage={handleSelectAccessPackage}
/>
</Accordion.Content>
</Accordion.Item>
</Accordion>
</div>
);
};