Skip to content

Commit

Permalink
commas in descriptions (#82)
Browse files Browse the repository at this point in the history
* #67 Result highlights are returned in an array and should be concatenated
* Lock react-icons version (some Go actions are not available anymore on latest version)
* Fix updated linter rules (import/order)
  • Loading branch information
gpailler authored May 5, 2024
1 parent 9aa747b commit 072dd6b
Show file tree
Hide file tree
Showing 9 changed files with 1,705 additions and 4,572 deletions.
6,249 changes: 1,691 additions & 4,558 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"react-bootstrap": "^2.1.1",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"react-icons": "^4.3.1",
"react-icons": "4.3.1",
"react-image": "^4.0.3",
"react-router-dom": "^6.2.1",
"react-syntax-highlighter": "^15.5.0",
"rollup-plugin-visualizer": "^5.8.3",
"spdx-license-ids": "^3.0.11",
"vite": "^4.5.3",
"rollup-plugin-visualizer": "^5.8.3",
"web-vitals": "^2.1.3"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Buckets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import Table from 'react-bootstrap/Table';
import { Helmet } from 'react-helmet';
import { Link } from 'react-router-dom';

import BucketsResultsJson from '../serialization/BucketsResultsJson';
import Utils from '../utils';
import BucketTypeIcon from './BucketTypeIcon';
import SearchStatus, { SearchStatusType } from './SearchStatus';
import BucketsResultsJson from '../serialization/BucketsResultsJson';
import Utils from '../utils';

type Bucket = {
bucket: string;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import powershell from 'react-syntax-highlighter/dist/esm/languages/prism/powers
import darkStyle from 'react-syntax-highlighter/dist/esm/styles/prism/a11y-dark';
import lightStyle from 'react-syntax-highlighter/dist/esm/styles/prism/ghcolors';

import { ColorSchemeContext } from '../colorscheme/ColorSchemeContext';
import AsciinemaCasts, { AsciinemaCastItem } from './AsciinemaCasts';
import SearchBar from './SearchBar';
import { ColorSchemeContext } from '../colorscheme/ColorSchemeContext';

SyntaxHighlighterBase.registerLanguage('powershell', powershell);
SyntaxHighlighterBase.registerLanguage('json', json);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Root.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { IconContext } from 'react-icons';
import { Outlet } from 'react-router-dom';

import ColorSchemeProvider from '../colorscheme/ColorSchemeProvider';
import Footer from './Footer';
import NavBar from './NavBar';
import ColorSchemeProvider from '../colorscheme/ColorSchemeProvider';

const Root = (): JSX.Element => {
return (
Expand Down
6 changes: 3 additions & 3 deletions src/components/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { Container, Row, Col, Modal } from 'react-bootstrap';
import { Helmet } from 'react-helmet';
import { useSearchParams } from 'react-router-dom';

import { requestIdleCallback } from '../request-idle-callback';
import ManifestJson from '../serialization/ManifestJson';
import SearchResultsJson from '../serialization/SearchResultsJson';
import SearchBar from './SearchBar';
import SearchPagination from './SearchPagination';
import SearchProcessor, { SortDirection, sortModes } from './SearchProcessor';
import SearchResult from './SearchResult';
import { requestIdleCallback } from '../request-idle-callback';
import ManifestJson from '../serialization/ManifestJson';
import SearchResultsJson from '../serialization/SearchResultsJson';

const RESULTS_PER_PAGE = 20;
const SEARCH_PARAM_QUERY = 'q';
Expand Down
2 changes: 1 addition & 1 deletion src/components/SearchProcessor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { IconBaseProps } from 'react-icons';
import { FaSortAmountDown, FaSortAmountUp } from 'react-icons/fa';
import { GoSettings } from 'react-icons/go';

import SearchResultsJson from '../serialization/SearchResultsJson';
import BucketTypeIcon from './BucketTypeIcon';
import SearchStatus, { SearchStatusType } from './SearchStatus';
import SearchResultsJson from '../serialization/SearchResultsJson';

export enum SortDirection {
Ascending,
Expand Down
4 changes: 2 additions & 2 deletions src/components/SearchResult.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { Img } from 'react-image';
import deprecatedSpdxLicenses from 'spdx-license-ids/deprecated.json';
import supportedSpdxLicenses from 'spdx-license-ids/index.json';

import ManifestJson from '../serialization/ManifestJson';
import Utils from '../utils';
import BucketTypeIcon from './BucketTypeIcon';
import CopyToClipboardButton from './CopyToClipboardButton';
import ManifestJson from '../serialization/ManifestJson';
import Utils from '../utils';

const spdxLicenses = supportedSpdxLicenses.concat(deprecatedSpdxLicenses);

Expand Down
4 changes: 2 additions & 2 deletions src/serialization/ManifestJson.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import MetadataJson from './MetadataJson';

type HighLight = string | undefined;

type HighLights = { [propertyName: string]: string } | undefined;
type HighLights = { [propertyName: string]: string[] } | undefined;

@JsonObject('ManifestJson')
class ManifestJson {
Expand Down Expand Up @@ -81,7 +81,7 @@ class ManifestJson {
return this.highlights && this.highlights[value];
});

return match && this.highlights ? this.highlights[match] : fallback;
return match && this.highlights ? this.highlights[match].join(' ') : fallback;
}
}

Expand Down

0 comments on commit 072dd6b

Please sign in to comment.