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.

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

fix: change external black/whitelist names (#165) #171

Merged
merged 5 commits into from
Nov 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
uses: 'actions/checkout@v2'
with:
repository: '${{ github.repository }}'
- name: '[setup node]'
uses: 'actions/setup-node@v2'
with:
node-version: '16'
- name: '[lint]'
run: |
echo TBA some linting
Expand Down
4 changes: 2 additions & 2 deletions components/TagMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const TagMenu = (props: TagMenuProps) => {
}}
icon={blacklist ? <MinusIcon /> : <ViewOffIcon />}
>
{blacklist ? 'Remove from blacklist' : 'Add to blacklist'}
{blacklist ? 'Remove from blocklist' : 'Add to blocklist'}
</MenuItem>
)}
{!blacklist && (
Expand All @@ -131,7 +131,7 @@ export const TagMenu = (props: TagMenuProps) => {
}}
icon={whitelist ? <MinusIcon /> : <ViewIcon />}
>
{whitelist ? 'Remove from whitelist' : 'Add to whitelist'}
{whitelist ? 'Remove from allowlist' : 'Add to allowlist'}
</MenuItem>
)}
</>
Expand Down
3 changes: 2 additions & 1 deletion components/Tweaks/TagPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const TagPanel = (props: TagPanelProps) => {
})

const currentTags = mode === 'blacklist' ? 'tagsBlacklist' : 'tagsWhitelist'
const name = mode === 'blacklist' ? 'blocklist' : 'allowlist'
const [selectedItems, setSelectedItems] = useState<typeof tagArray>(
filter[currentTags].map((tag) => {
return { value: tag, label: tag }
Expand All @@ -27,7 +28,7 @@ export const TagPanel = (props: TagPanelProps) => {
<CUIAutoComplete
labelStyleProps={{ fontWeight: 300, fontSize: 14 }}
items={tagArray}
label={'Add tag to ' + mode}
label={`Add tag to ${name}`}
placeholder=" "
onCreateItem={(item) => null}
disableCreateItem={true}
Expand Down
Loading