Remove tremor completely #3777
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,10 +1,10 @@ | ||||||
| import { Button, Position, Tooltip } from '@blueprintjs/core'; | ||||||
| import { IconNames } from '@blueprintjs/icons'; | ||||||
| import React, { useCallback } from 'react'; | ||||||
| import { useDispatch } from 'react-redux'; | ||||||
| import { Link } from 'react-router'; | ||||||
| import SessionActions from 'src/commons/application/actions/SessionActions'; | ||||||
| import GradingFlex from 'src/commons/grading/GradingFlex'; | ||||||
| import { showSimpleConfirmDialog } from 'src/commons/utils/DialogHelper'; | ||||||
| import { useSession } from 'src/commons/utils/Hooks'; | ||||||
|
|
||||||
|
|
@@ -33,15 +33,22 @@ const TeamFormationActions: React.FC<Props> = ({ teamId }) => { | |||||
| }, [dispatch, teamId]); | ||||||
|
|
||||||
| return ( | ||||||
| <GradingFlex> | ||||||
| <Tooltip placement={Position.TOP} content="Edit"> | ||||||
| <Link to={`/courses/${courseId}/teamformation/edit/${teamId}`}> | ||||||
| <Button intent="primary" icon={IconNames.EDIT} variant="minimal" /> | ||||||
|
Contributor
There was a problem hiding this comment. Blueprint's
Suggested change
|
||||||
| </Link> | ||||||
| </Tooltip> | ||||||
|
|
||||||
| <Tooltip placement={Position.TOP} content="Delete"> | ||||||
| <Button | ||||||
| intent="danger" | ||||||
| icon={IconNames.TRASH} | ||||||
| variant="minimal" | ||||||
|
Contributor
There was a problem hiding this comment. Blueprint's
Suggested change
|
||||||
| onClick={handleDeleteTeamClick} | ||||||
| /> | ||||||
| </Tooltip> | ||||||
| </GradingFlex> | ||||||
| ); | ||||||
| }; | ||||||
|
|
||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,23 @@ | ||
| import { Button, Intent } from '@blueprintjs/core'; | ||
| import { IconNames } from '@blueprintjs/icons'; | ||
| import { ColumnFilter } from '@tanstack/react-table'; | ||
| import React from 'react'; | ||
|
|
||
| import { getBadgeColorFromLabelLegacy } from '../../grading/subcomponents/GradingBadges'; | ||
|
|
||
| // TODO: Remove after migration is completed | ||
|
Contributor
There was a problem hiding this comment. Avoid using References
|
||
| const TREMOR_TO_BLUEPRINT_INTENT: Record<string, Intent> = { | ||
| indigo: Intent.PRIMARY, | ||
| emerald: Intent.SUCCESS, | ||
| sky: Intent.PRIMARY, | ||
| purple: Intent.PRIMARY, | ||
| gray: Intent.NONE, | ||
| red: Intent.DANGER, | ||
| yellow: Intent.WARNING, | ||
| green: Intent.SUCCESS, | ||
| blue: Intent.PRIMARY | ||
| }; | ||
|
|
||
| type Props = { | ||
| filter: ColumnFilter; | ||
| onRemove: (filter: ColumnFilter) => void; | ||
|
|
@@ -14,14 +26,13 @@ type Props = { | |
| const FilterBadge: React.FC<Props> = ({ filter, onRemove }) => { | ||
| let filterValue = filter.value as string; | ||
| filterValue = filterValue.charAt(0).toUpperCase() + filterValue.slice(1); | ||
| const legacyColor = getBadgeColorFromLabelLegacy(filterValue); | ||
| const intent = TREMOR_TO_BLUEPRINT_INTENT[legacyColor] || Intent.NONE; | ||
|
|
||
| return ( | ||
| <Button intent={intent} icon={IconNames.CROSS} onClick={() => onRemove(filter)}> | ||
| {filterValue} | ||
| </Button> | ||
| ); | ||
| }; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
| import { Button as BpButton, Card } from '@blueprintjs/core'; | ||
| import { useNavigate } from 'react-router'; | ||
| import GradingFlex from 'src/commons/grading/GradingFlex'; | ||
| import GradingText from 'src/commons/grading/GradingText'; | ||
| import { useSession } from 'src/commons/utils/Hooks'; | ||
| import { TeamFormationOverview } from 'src/features/teamFormation/TeamFormationTypes'; | ||
|
|
||
|
|
@@ -27,13 +26,17 @@ const TeamFormationDashboard: React.FC<TeamFormationDashboardProps> = ({ teams } | |
| const teamData = teams; | ||
| return ( | ||
| <Card> | ||
| <GradingFlex | ||
| justifyContent="space-between" | ||
| alignItems="center" | ||
| style={{ marginBottom: '1rem' }} | ||
| > | ||
| <GradingText style={{ fontSize: '1.125rem', opacity: 0.9, margin: 0 }}>Teams</GradingText> | ||
| <GradingFlex justifyContent="flex-end" style={{ columnGap: '0.5rem' }}> | ||
| <BpButton onClick={createTeam}>Create Team</BpButton> | ||
| <BpButton onClick={importTeam}>Import Team</BpButton> | ||
| </GradingFlex> | ||
| </GradingFlex> | ||
| <TeamFormationTable group={group} teams={teamData} /> | ||
| </Card> | ||
| ); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| import { ColumnFilter, ColumnFiltersState } from '@tanstack/react-table'; | ||
| import React from 'react'; | ||
| import GradingFlex from 'src/commons/grading/GradingFlex'; | ||
|
|
||
| import { FilterBadge } from './TeamFormationBadges'; | ||
|
|
||
|
|
@@ -10,11 +11,11 @@ type TeamFormationFiltersProps = { | |
|
|
||
| const TeamFormationFilters: React.FC<TeamFormationFiltersProps> = ({ filters, onFilterRemove }) => { | ||
| return ( | ||
| <GradingFlex justifyContent="flex-start" style={{ columnGap: '0.25rem' }}> | ||
| {filters.map(filter => ( | ||
| <FilterBadge filter={filter} onRemove={onFilterRemove} key={filter.id} /> | ||
| ))} | ||
| </GradingFlex> | ||
| ); | ||
| }; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| import { Button } from '@blueprintjs/core'; | ||
| import React, { useEffect, useState } from 'react'; | ||
| import { useDispatch } from 'react-redux'; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| import { Button } from '@blueprintjs/core'; | ||
| import { useState } from 'react'; | ||
| import { FileUploader } from 'react-drag-drop-files'; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,6 +1,4 @@ | ||||||
| import { Button, HTMLTable, Icon as BpIcon, InputGroup } from '@blueprintjs/core'; | ||||||
| import { IconNames } from '@blueprintjs/icons'; | ||||||
| import { | ||||||
| Column, | ||||||
|
|
@@ -14,20 +12,9 @@ import { | |||||
| Row, | ||||||
| useReactTable | ||||||
| } from '@tanstack/react-table'; | ||||||
| import React, { useState } from 'react'; | ||||||
| import GradingFlex from 'src/commons/grading/GradingFlex'; | ||||||
| import GradingText from 'src/commons/grading/GradingText'; | ||||||
| import { objectKeys } from 'src/commons/utils/TypeHelper'; | ||||||
| import { TeamFormationOverview } from 'src/features/teamFormation/TeamFormationTypes'; | ||||||
|
|
||||||
|
|
@@ -140,72 +127,72 @@ const TeamFormationTable: React.FC<TeamFormationTableProps> = ({ group, teams }) | |||||
|
|
||||||
| return ( | ||||||
| <> | ||||||
| <GradingFlex | ||||||
| justifyContent="space-between" | ||||||
| alignItems="center" | ||||||
| style={{ marginTop: '0.5rem' }} | ||||||
| > | ||||||
| <GradingFlex alignItems="center" style={{ columnGap: '0.5rem' }}> | ||||||
| <GradingFlex alignItems="center" style={{ columnGap: '0.5rem', height: '1.75rem' }}> | ||||||
| <BpIcon icon={IconNames.FILTER_LIST} /> | ||||||
| <GradingText> | ||||||
| {columnFilters.length > 0 | ||||||
| ? 'Filters: ' | ||||||
| : 'No filters applied. Click on any cell to filter by its value.'}{' '} | ||||||
| </GradingText> | ||||||
| </GradingFlex> | ||||||
| <TeamFormationFilters filters={columnFilters} onFilterRemove={handleFilterRemove} /> | ||||||
| </GradingFlex> | ||||||
|
|
||||||
| <InputGroup | ||||||
| style={{ maxWidth: '14rem' }} | ||||||
| leftIcon={IconNames.SEARCH} | ||||||
| placeholder="Search for any value here..." | ||||||
| onChange={e => setGlobalFilter(e.target.value)} | ||||||
| /> | ||||||
| </GradingFlex> | ||||||
| <HTMLTable style={{ marginTop: '0.5rem', width: '100%' }}> | ||||||
| <thead> | ||||||
| {table.getHeaderGroups().map(headerGroup => ( | ||||||
| <tr key={headerGroup.id}> | ||||||
| {headerGroup.headers.map(header => ( | ||||||
| <th key={header.id}> | ||||||
| {header.isPlaceholder | ||||||
| ? null | ||||||
| : flexRender(header.column.columnDef.header, header.getContext())} | ||||||
| </th> | ||||||
| ))} | ||||||
| </tr> | ||||||
| ))} | ||||||
| </thead> | ||||||
| <tbody> | ||||||
| {table.getRowModel().rows.map(row => ( | ||||||
| <tr key={row.id}> | ||||||
| {row.getVisibleCells().map(cell => ( | ||||||
| <td key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</td> | ||||||
| ))} | ||||||
| </tr> | ||||||
| ))} | ||||||
| </tbody> | ||||||
| </HTMLTable> | ||||||
| <div> | ||||||
| <GradingFlex justifyContent="center" style={{ columnGap: '0.75rem' }}> | ||||||
| <Button | ||||||
| variant="minimal" | ||||||
|
Contributor
There was a problem hiding this comment. Blueprint's
Suggested change
|
||||||
| icon={IconNames.ARROW_LEFT} | ||||||
| onClick={() => table.previousPage()} | ||||||
| disabled={!table.getCanPreviousPage()} | ||||||
| /> | ||||||
| <GradingText style={{ fontWeight: 'bold' }}> | ||||||
| Page {table.getState().pagination.pageIndex + 1} of {table.getPageCount()} | ||||||
| </GradingText> | ||||||
| <Button | ||||||
| variant="minimal" | ||||||
|
Contributor
There was a problem hiding this comment. Blueprint's
Suggested change
|
||||||
| icon={IconNames.ARROW_RIGHT} | ||||||
| onClick={() => table.nextPage()} | ||||||
| disabled={!table.getCanNextPage()} | ||||||
| /> | ||||||
| </GradingFlex> | ||||||
| </div> | ||||||
| </> | ||||||
| ); | ||||||
|
|
@@ -223,9 +210,9 @@ const Filterable: React.FC<FilterableProps> = ({ column, value, children }) => { | |||||
| }; | ||||||
|
|
||||||
| return ( | ||||||
| <Button variant="minimal" onClick={handleFilterChange} style={{ padding: 0 }}> | ||||||
|
Contributor
There was a problem hiding this comment. Blueprint's
Suggested change
References
|
||||||
| {children || value} | ||||||
| </Button> | ||||||
| ); | ||||||
| }; | ||||||
|
|
||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Blueprint
Buttoncomponent does not have avariantprop. To achieve the minimal style, use theminimalboolean prop instead.