From 6c53cf852f1b00fbcd5f641ebf4885f78cf1160c Mon Sep 17 00:00:00 2001 From: Michael Horstmann Date: Sat, 8 Oct 2022 03:53:42 +0000 Subject: [PATCH 01/12] Removed one extra whitespace in footer after "Template" (#21364) --- templates/base/footer_content.tmpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index 88dec014f615..89be60922589 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -12,8 +12,7 @@ {{end}} {{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}} {{.locale.Tr "page"}}: {{LoadTimes .PageStartTime}} - {{.locale.Tr "template"}} - {{if .TemplateName}} {{.TemplateName}}{{end}}: {{call .TemplateLoadTimes}} + {{.locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: {{call .TemplateLoadTimes}} {{end}}
From bbbf9a4b938a3616e08a854c4b2639863fc54013 Mon Sep 17 00:00:00 2001 From: eleith Date: Fri, 7 Oct 2022 22:24:44 -0700 Subject: [PATCH 02/12] npm package registry support for `bin` (#21372) Fix #21303 npm package.json supports binary packaging: https://docs.npmjs.com/cli/v8/configuring-npm/package-json#bin the npm registry documents that the binary references will be attached to the abbreviated version object: https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md#abbreviated-version-object unfortunately their api documentation leaves this out: https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md#abbreviated-version-objectdoc which is likely to be the reason this was left out in gitea's initial implementation this response is critical for npm to install the binary in the `.bin` folder so as to be included on the users default bin path, resulting in immediate access to any binaries provided by the package --- modules/packages/npm/creator.go | 5 ++++- modules/packages/npm/creator_test.go | 5 +++++ modules/packages/npm/metadata.go | 1 + routers/api/packages/npm/api.go | 1 + tests/integration/api_packages_npm_test.go | 6 ++++++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/packages/npm/creator.go b/modules/packages/npm/creator.go index 2ed4d262481d..16cadefb891b 100644 --- a/modules/packages/npm/creator.go +++ b/modules/packages/npm/creator.go @@ -66,7 +66,8 @@ type PackageMetadata struct { License string `json:"license,omitempty"` } -// PackageMetadataVersion https://github.com/npm/registry/blob/master/docs/REGISTRY-API.md#version +// PackageMetadataVersion documentation: https://github.com/npm/registry/blob/master/docs/REGISTRY-API.md#version +// PackageMetadataVersion response: https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md#abbreviated-version-object type PackageMetadataVersion struct { ID string `json:"_id"` Name string `json:"name"` @@ -80,6 +81,7 @@ type PackageMetadataVersion struct { Dependencies map[string]string `json:"dependencies,omitempty"` DevDependencies map[string]string `json:"devDependencies,omitempty"` PeerDependencies map[string]string `json:"peerDependencies,omitempty"` + Bin map[string]string `json:"bin,omitempty"` OptionalDependencies map[string]string `json:"optionalDependencies,omitempty"` Readme string `json:"readme,omitempty"` Dist PackageDistribution `json:"dist"` @@ -220,6 +222,7 @@ func ParsePackage(r io.Reader) (*Package, error) { DevelopmentDependencies: meta.DevDependencies, PeerDependencies: meta.PeerDependencies, OptionalDependencies: meta.OptionalDependencies, + Bin: meta.Bin, Readme: meta.Readme, }, } diff --git a/modules/packages/npm/creator_test.go b/modules/packages/npm/creator_test.go index 64ae6238f3ba..2b844f4b0e5f 100644 --- a/modules/packages/npm/creator_test.go +++ b/modules/packages/npm/creator_test.go @@ -23,6 +23,7 @@ func TestParsePackage(t *testing.T) { packageVersion := "1.0.1-pre" packageTag := "latest" packageAuthor := "KN4CK3R" + packageBin := "gitea" packageDescription := "Test Description" data := "H4sIAAAAAAAA/ytITM5OTE/VL4DQelnF+XkMVAYGBgZmJiYK2MRBwNDcSIHB2NTMwNDQzMwAqA7IMDUxA9LUdgg2UFpcklgEdAql5kD8ogCnhwio5lJQUMpLzE1VslJQcihOzi9I1S9JLS7RhSYIJR2QgrLUouLM/DyQGkM9Az1D3YIiqExKanFyUWZBCVQ2BKhVwQVJDKwosbQkI78IJO/tZ+LsbRykxFXLNdA+HwWjYBSMgpENACgAbtAACAAA" integrity := "sha512-yA4FJsVhetynGfOC1jFf79BuS+jrHbm0fhh+aHzCQkOaOBXKf9oBnC4a6DnLLnEsHQDRLYd00cwj8sCXpC+wIg==" @@ -236,6 +237,9 @@ func TestParsePackage(t *testing.T) { Dependencies: map[string]string{ "package": "1.2.0", }, + Bin: map[string]string{ + "bin": packageBin, + }, Dist: PackageDistribution{ Integrity: integrity, }, @@ -264,6 +268,7 @@ func TestParsePackage(t *testing.T) { assert.Equal(t, packageDescription, p.Metadata.Description) assert.Equal(t, packageDescription, p.Metadata.Readme) assert.Equal(t, packageAuthor, p.Metadata.Author) + assert.Equal(t, packageBin, p.Metadata.Bin["bin"]) assert.Equal(t, "MIT", p.Metadata.License) assert.Equal(t, "https://gitea.io/", p.Metadata.ProjectURL) assert.Contains(t, p.Metadata.Dependencies, "package") diff --git a/modules/packages/npm/metadata.go b/modules/packages/npm/metadata.go index 643a4d344b7d..44714cd6ea5d 100644 --- a/modules/packages/npm/metadata.go +++ b/modules/packages/npm/metadata.go @@ -20,5 +20,6 @@ type Metadata struct { DevelopmentDependencies map[string]string `json:"development_dependencies,omitempty"` PeerDependencies map[string]string `json:"peer_dependencies,omitempty"` OptionalDependencies map[string]string `json:"optional_dependencies,omitempty"` + Bin map[string]string `json:"bin,omitempty"` Readme string `json:"readme,omitempty"` } diff --git a/routers/api/packages/npm/api.go b/routers/api/packages/npm/api.go index d1027763a836..490387a0e4f8 100644 --- a/routers/api/packages/npm/api.go +++ b/routers/api/packages/npm/api.go @@ -67,6 +67,7 @@ func createPackageMetadataVersion(registryURL string, pd *packages_model.Package PeerDependencies: metadata.PeerDependencies, OptionalDependencies: metadata.OptionalDependencies, Readme: metadata.Readme, + Bin: metadata.Bin, Dist: npm_module.PackageDistribution{ Shasum: pd.Files[0].Blob.HashSHA1, Integrity: "sha512-" + base64.StdEncoding.EncodeToString(hashBytes), diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index 14ed681be3a7..4fdcf6682e93 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -35,6 +35,8 @@ func TestPackageNpm(t *testing.T) { packageTag2 := "release" packageAuthor := "KN4CK3R" packageDescription := "Test Description" + packageBinName := "cli" + packageBinPath := "./cli.sh" data := "H4sIAAAAAAAA/ytITM5OTE/VL4DQelnF+XkMVAYGBgZmJiYK2MRBwNDcSIHB2NTMwNDQzMwAqA7IMDUxA9LUdgg2UFpcklgEdAql5kD8ogCnhwio5lJQUMpLzE1VslJQcihOzi9I1S9JLS7RhSYIJR2QgrLUouLM/DyQGkM9Az1D3YIiqExKanFyUWZBCVQ2BKhVwQVJDKwosbQkI78IJO/tZ+LsbRykxFXLNdA+HwWjYBSMgpENACgAbtAACAAA" @@ -54,6 +56,9 @@ func TestPackageNpm(t *testing.T) { "author": { "name": "` + packageAuthor + `" }, + "bin": { + "` + packageBinName + `": "` + packageBinPath + `" + }, "dist": { "integrity": "sha512-yA4FJsVhetynGfOC1jFf79BuS+jrHbm0fhh+aHzCQkOaOBXKf9oBnC4a6DnLLnEsHQDRLYd00cwj8sCXpC+wIg==", "shasum": "aaa7eaf852a948b0aa05afeda35b1badca155d90" @@ -154,6 +159,7 @@ func TestPackageNpm(t *testing.T) { assert.Equal(t, packageName, pmv.Name) assert.Equal(t, packageDescription, pmv.Description) assert.Equal(t, packageAuthor, pmv.Author.Name) + assert.Equal(t, packageBinPath, pmv.Bin[packageBinName]) assert.Equal(t, "sha512-yA4FJsVhetynGfOC1jFf79BuS+jrHbm0fhh+aHzCQkOaOBXKf9oBnC4a6DnLLnEsHQDRLYd00cwj8sCXpC+wIg==", pmv.Dist.Integrity) assert.Equal(t, "aaa7eaf852a948b0aa05afeda35b1badca155d90", pmv.Dist.Shasum) assert.Equal(t, fmt.Sprintf("%s%s/-/%s/%s", setting.AppURL, root[1:], packageVersion, filename), pmv.Dist.Tarball) From 7bb12d7efa9fd01e15ddc14b3b8e40df4a4abd42 Mon Sep 17 00:00:00 2001 From: Kyle D Date: Sat, 8 Oct 2022 10:54:34 +0200 Subject: [PATCH 03/12] Bump playwright to 1.26.1 (#21357) --- .drone.yml | 2 +- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index 59cc4d8f7b92..de06aa4c1b3d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -571,7 +571,7 @@ steps: # TODO: We should probably build all dependencies into a test image - name: test-e2e - image: mcr.microsoft.com/playwright:v1.24.0-focal + image: mcr.microsoft.com/playwright:v1.26.1-focal commands: - curl -sLO https://go.dev/dl/go1.19.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.19.linux-amd64.tar.gz - groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea diff --git a/package-lock.json b/package-lock.json index 05d414c9aef9..c7081f436b3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "wrap-ansi": "8.0.1" }, "devDependencies": { - "@playwright/test": "1.25.2", + "@playwright/test": "1.26.1", "@stoplight/spectral-cli": "6.5.1", "eslint": "8.23.0", "eslint-plugin-import": "2.26.0", @@ -1378,13 +1378,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.25.2", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.25.2.tgz", - "integrity": "sha512-6qPznIR4Fw02OMbqXUPMG6bFFg1hDVNEdihKy0t9K0dmRbus1DyP5Q5XFQhGwEHQkLG5hrSfBuu9CW/foqhQHQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.26.1.tgz", + "integrity": "sha512-bNxyZASVt2adSZ9gbD7NCydzcb5JaI0OR9hc7s+nmPeH604gwp0zp17NNpwXY4c8nvuBGQQ9oGDx72LE+cUWvw==", "dev": true, "dependencies": { "@types/node": "*", - "playwright-core": "1.25.2" + "playwright-core": "1.26.1" }, "bin": { "playwright": "cli.js" @@ -9118,9 +9118,9 @@ } }, "node_modules/playwright-core": { - "version": "1.25.2", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.25.2.tgz", - "integrity": "sha512-0yTbUE9lIddkEpLHL3u8PoCL+pWiZtj5A/j3U7YoNjcmKKDGBnCrgHJMzwd2J5vy6l28q4ki3JIuz7McLHhl1A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.26.1.tgz", + "integrity": "sha512-hzFchhhxnEiPc4qVPs9q2ZR+5eKNifY2hQDHtg1HnTTUuphYCBP8ZRb2si+B1TR7BHirgXaPi48LIye5SgrLAA==", "dev": true, "bin": { "playwright": "cli.js" @@ -12762,13 +12762,13 @@ } }, "@playwright/test": { - "version": "1.25.2", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.25.2.tgz", - "integrity": "sha512-6qPznIR4Fw02OMbqXUPMG6bFFg1hDVNEdihKy0t9K0dmRbus1DyP5Q5XFQhGwEHQkLG5hrSfBuu9CW/foqhQHQ==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.26.1.tgz", + "integrity": "sha512-bNxyZASVt2adSZ9gbD7NCydzcb5JaI0OR9hc7s+nmPeH604gwp0zp17NNpwXY4c8nvuBGQQ9oGDx72LE+cUWvw==", "dev": true, "requires": { "@types/node": "*", - "playwright-core": "1.25.2" + "playwright-core": "1.26.1" } }, "@popperjs/core": { @@ -18660,9 +18660,9 @@ } }, "playwright-core": { - "version": "1.25.2", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.25.2.tgz", - "integrity": "sha512-0yTbUE9lIddkEpLHL3u8PoCL+pWiZtj5A/j3U7YoNjcmKKDGBnCrgHJMzwd2J5vy6l28q4ki3JIuz7McLHhl1A==", + "version": "1.26.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.26.1.tgz", + "integrity": "sha512-hzFchhhxnEiPc4qVPs9q2ZR+5eKNifY2hQDHtg1HnTTUuphYCBP8ZRb2si+B1TR7BHirgXaPi48LIye5SgrLAA==", "dev": true }, "pluralize": { diff --git a/package.json b/package.json index c7add76aae2e..46842483ad5b 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "wrap-ansi": "8.0.1" }, "devDependencies": { - "@playwright/test": "1.25.2", + "@playwright/test": "1.26.1", "@stoplight/spectral-cli": "6.5.1", "eslint": "8.23.0", "eslint-plugin-import": "2.26.0", From 768e16dad19e98e5a6090bd09a7662da6079eae0 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 8 Oct 2022 19:22:44 +0800 Subject: [PATCH 04/12] Use weighted algorithm for string matching when finding files in repo (#21370) This PR is for: * https://github.com/go-gitea/gitea/issues/20231 Now, when a user searches `word`, they always see `/{word}.txt` before `/{w}e-g{o}t-{r}esult.{d}at` Demo: When searching "a", "a.ext" comes first. Then when searching "at", the longer matched "template" comes first.
![image](https://user-images.githubusercontent.com/2114189/194588738-3644d891-956f-40e4-b79b-b97d34265456.png) ![image](https://user-images.githubusercontent.com/2114189/194588797-9b124670-4e1e-4510-a170-780295ed89b8.png)
This PR also makes the frontend tests could import feature JS files by introducing `jestSetup.js` Co-authored-by: delvh Co-authored-by: silverwind --- jest.config.js | 5 +- web_src/js/features/repo-findfile.js | 87 ++++++++++++++++++----- web_src/js/features/repo-findfile.test.js | 34 +++++++++ web_src/js/testUtils/jestSetup.js | 5 ++ web_src/js/utils.js | 30 -------- web_src/js/utils.test.js | 18 +---- 6 files changed, 113 insertions(+), 66 deletions(-) create mode 100644 web_src/js/features/repo-findfile.test.js create mode 100644 web_src/js/testUtils/jestSetup.js diff --git a/jest.config.js b/jest.config.js index 34d47acc433d..2767c1b7ae82 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,3 +1,4 @@ +// to run tests with ES6 module, node must run with "--experimental-vm-modules", or see Makefile's "test-frontend" for reference export default { rootDir: 'web_src', setupFilesAfterEnv: ['jest-extended/all'], @@ -7,6 +8,8 @@ export default { transform: { '\\.svg$': '/js/testUtils/jestRawLoader.js', }, + setupFiles: [ + './js/testUtils/jestSetup.js', // prepare global variables used by our code (eg: window.config) + ], verbose: false, }; - diff --git a/web_src/js/features/repo-findfile.js b/web_src/js/features/repo-findfile.js index 700a7fe69316..750b906cef7b 100644 --- a/web_src/js/features/repo-findfile.js +++ b/web_src/js/features/repo-findfile.js @@ -1,45 +1,96 @@ import $ from 'jquery'; import {svg} from '../svg.js'; -import {strSubMatch} from '../utils.js'; const {csrf} = window.config; const threshold = 50; let files = []; let $repoFindFileInput, $repoFindFileTableBody, $repoFindFileNoResult; -function filterRepoFiles(filter) { - const treeLink = $repoFindFileInput.attr('data-url-tree-link'); - $repoFindFileTableBody.empty(); - const fileRes = []; +// return the case-insensitive sub-match result as an array: [unmatched, matched, unmatched, matched, ...] +// res[even] is unmatched, res[odd] is matched, see unit tests for examples +// argument subLower must be a lower-cased string. +export function strSubMatch(full, subLower) { + const res = ['']; + let i = 0, j = 0; + const fullLower = full.toLowerCase(); + while (i < subLower.length && j < fullLower.length) { + if (subLower[i] === fullLower[j]) { + if (res.length % 2 !== 0) res.push(''); + res[res.length - 1] += full[j]; + j++; + i++; + } else { + if (res.length % 2 === 0) res.push(''); + res[res.length - 1] += full[j]; + j++; + } + } + if (i !== subLower.length) { + // if the sub string doesn't match the full, only return the full as unmatched. + return [full]; + } + if (j < full.length) { + // append remaining chars from full to result as unmatched + if (res.length % 2 === 0) res.push(''); + res[res.length - 1] += full.substring(j); + } + return res; +} + +export function calcMatchedWeight(matchResult) { + let weight = 0; + for (let i = 0; i < matchResult.length; i++) { + if (i % 2 === 1) { // matches are on odd indices, see strSubMatch + // use a function f(x+x) > f(x) + f(x) to make the longer matched string has higher weight. + weight += matchResult[i].length * matchResult[i].length; + } + } + return weight; +} + +export function filterRepoFilesWeighted(files, filter) { + let filterResult = []; if (filter) { - for (let i = 0; i < files.length && fileRes.length < threshold; i++) { - const subMatch = strSubMatch(files[i], filter); - if (subMatch.length > 1) { - fileRes.push(subMatch); + const filterLower = filter.toLowerCase(); + // TODO: for large repo, this loop could be slow, maybe there could be one more limit: + // ... && filterResult.length < threshold * 20, wait for more feedbacks + for (let i = 0; i < files.length; i++) { + const res = strSubMatch(files[i], filterLower); + if (res.length > 1) { // length==1 means unmatched, >1 means having matched sub strings + filterResult.push({matchResult: res, matchWeight: calcMatchedWeight(res)}); } } + filterResult.sort((a, b) => b.matchWeight - a.matchWeight); + filterResult = filterResult.slice(0, threshold); } else { for (let i = 0; i < files.length && i < threshold; i++) { - fileRes.push([files[i]]); + filterResult.push({matchResult: [files[i]], matchWeight: 0}); } } + return filterResult; +} + +function filterRepoFiles(filter) { + const treeLink = $repoFindFileInput.attr('data-url-tree-link'); + $repoFindFileTableBody.empty(); + const filterResult = filterRepoFilesWeighted(files, filter); const tmplRow = ``; - $repoFindFileNoResult.toggle(fileRes.length === 0); - for (const matchRes of fileRes) { + $repoFindFileNoResult.toggle(filterResult.length === 0); + for (const r of filterResult) { const $row = $(tmplRow); const $a = $row.find('a'); - $a.attr('href', `${treeLink}/${matchRes.join('')}`); + $a.attr('href', `${treeLink}/${r.matchResult.join('')}`); const $octiconFile = $(svg('octicon-file')).addClass('mr-3'); $a.append($octiconFile); - // if the target file path is "abc/xyz", to search "bx", then the matchRes is ['a', 'b', 'c/', 'x', 'yz'] - // the matchRes[odd] is matched and highlighted to red. - for (let j = 0; j < matchRes.length; j++) { - if (!matchRes[j]) continue; - const $span = $('').text(matchRes[j]); + // if the target file path is "abc/xyz", to search "bx", then the matchResult is ['a', 'b', 'c/', 'x', 'yz'] + // the matchResult[odd] is matched and highlighted to red. + for (let j = 0; j < r.matchResult.length; j++) { + if (!r.matchResult[j]) continue; + const $span = $('').text(r.matchResult[j]); if (j % 2 === 1) $span.addClass('ui text red'); $a.append($span); } diff --git a/web_src/js/features/repo-findfile.test.js b/web_src/js/features/repo-findfile.test.js new file mode 100644 index 000000000000..2d96ed4463ee --- /dev/null +++ b/web_src/js/features/repo-findfile.test.js @@ -0,0 +1,34 @@ +import {strSubMatch, calcMatchedWeight, filterRepoFilesWeighted} from './repo-findfile.js'; + +describe('Repo Find Files', () => { + test('strSubMatch', () => { + expect(strSubMatch('abc', '')).toEqual(['abc']); + expect(strSubMatch('abc', 'a')).toEqual(['', 'a', 'bc']); + expect(strSubMatch('abc', 'b')).toEqual(['a', 'b', 'c']); + expect(strSubMatch('abc', 'c')).toEqual(['ab', 'c']); + expect(strSubMatch('abc', 'ac')).toEqual(['', 'a', 'b', 'c']); + expect(strSubMatch('abc', 'z')).toEqual(['abc']); + expect(strSubMatch('abc', 'az')).toEqual(['abc']); + + expect(strSubMatch('ABc', 'ac')).toEqual(['', 'A', 'B', 'c']); + expect(strSubMatch('abC', 'ac')).toEqual(['', 'a', 'b', 'C']); + + expect(strSubMatch('aabbcc', 'abc')).toEqual(['', 'a', 'a', 'b', 'b', 'c', 'c']); + expect(strSubMatch('the/directory', 'hedir')).toEqual(['t', 'he', '/', 'dir', 'ectory']); + }); + + test('calcMatchedWeight', () => { + expect(calcMatchedWeight(['a', 'b', 'c', 'd']) < calcMatchedWeight(['a', 'bc', 'c'])).toBeTruthy(); + }); + + test('filterRepoFilesWeighted', () => { + // the first matched result should always be the "word.txt" + let res = filterRepoFilesWeighted(['word.txt', 'we-got-result.dat'], 'word'); + expect(res).toHaveLength(2); + expect(res[0].matchResult).toEqual(['', 'word', '.txt']); + + res = filterRepoFilesWeighted(['we-got-result.dat', 'word.txt'], 'word'); + expect(res).toHaveLength(2); + expect(res[0].matchResult).toEqual(['', 'word', '.txt']); + }); +}); diff --git a/web_src/js/testUtils/jestSetup.js b/web_src/js/testUtils/jestSetup.js new file mode 100644 index 000000000000..779be9f0c740 --- /dev/null +++ b/web_src/js/testUtils/jestSetup.js @@ -0,0 +1,5 @@ +window.config = { + csrfToken: 'jest-test-csrf-token-123456', + pageData: {}, + i18n: {}, +}; diff --git a/web_src/js/utils.js b/web_src/js/utils.js index 8e8dc01be18e..4020b7a7f487 100644 --- a/web_src/js/utils.js +++ b/web_src/js/utils.js @@ -59,36 +59,6 @@ export function parseIssueHref(href) { return {owner, repo, type, index}; } -// return the sub-match result as an array: [unmatched, matched, unmatched, matched, ...] -// res[even] is unmatched, res[odd] is matched, see unit tests for examples -export function strSubMatch(full, sub) { - const res = ['']; - let i = 0, j = 0; - const subLower = sub.toLowerCase(), fullLower = full.toLowerCase(); - while (i < subLower.length && j < fullLower.length) { - if (subLower[i] === fullLower[j]) { - if (res.length % 2 !== 0) res.push(''); - res[res.length - 1] += full[j]; - j++; - i++; - } else { - if (res.length % 2 === 0) res.push(''); - res[res.length - 1] += full[j]; - j++; - } - } - if (i !== sub.length) { - // if the sub string doesn't match the full, only return the full as unmatched. - return [full]; - } - if (j < full.length) { - // append remaining chars from full to result as unmatched - if (res.length % 2 === 0) res.push(''); - res[res.length - 1] += full.substring(j); - } - return res; -} - // pretty-print a number using locale-specific separators, e.g. 1200 -> 1,200 export function prettyNumber(num, locale = 'en-US') { if (typeof num !== 'number') return ''; diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js index 5c17c162aff0..762f29f6fe06 100644 --- a/web_src/js/utils.test.js +++ b/web_src/js/utils.test.js @@ -1,5 +1,5 @@ import { - basename, extname, isObject, uniq, stripTags, joinPaths, parseIssueHref, strSubMatch, + basename, extname, isObject, uniq, stripTags, joinPaths, parseIssueHref, prettyNumber, parseUrl, } from './utils.js'; @@ -86,22 +86,6 @@ test('parseIssueHref', () => { expect(parseIssueHref('')).toEqual({owner: undefined, repo: undefined, type: undefined, index: undefined}); }); -test('strSubMatch', () => { - expect(strSubMatch('abc', '')).toEqual(['abc']); - expect(strSubMatch('abc', 'a')).toEqual(['', 'a', 'bc']); - expect(strSubMatch('abc', 'b')).toEqual(['a', 'b', 'c']); - expect(strSubMatch('abc', 'c')).toEqual(['ab', 'c']); - expect(strSubMatch('abc', 'ac')).toEqual(['', 'a', 'b', 'c']); - expect(strSubMatch('abc', 'z')).toEqual(['abc']); - expect(strSubMatch('abc', 'az')).toEqual(['abc']); - - expect(strSubMatch('abc', 'aC')).toEqual(['', 'a', 'b', 'c']); - expect(strSubMatch('abC', 'ac')).toEqual(['', 'a', 'b', 'C']); - - expect(strSubMatch('aabbcc', 'abc')).toEqual(['', 'a', 'a', 'b', 'b', 'c', 'c']); - expect(strSubMatch('the/directory', 'hedir')).toEqual(['t', 'he', '/', 'dir', 'ectory']); -}); - test('prettyNumber', () => { expect(prettyNumber()).toEqual(''); expect(prettyNumber(null)).toEqual(''); From 97f3f1988b2b544350f58aa8b49cb958bb4da5b5 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sun, 9 Oct 2022 10:17:01 +0300 Subject: [PATCH 05/12] Fix typos in PullRequestMergeForm.vue header comment (#21378) Signed-off-by: Yarden Shoham --- web_src/js/components/PullRequestMergeForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index 64ba98728e6a..bfe05628e84a 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -1,7 +1,7 @@