Skip to content

Commit

Permalink
Merge branch 'main' into update-issue-templates
Browse files Browse the repository at this point in the history
  • Loading branch information
CodyCBakerPhD authored Feb 13, 2024
2 parents 51d750a + 7dbdddb commit 230c601
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .codespellrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[codespell]
ignore-words-list= afterall
skip = .git,*.svg,package-lock.json,node_modules,*lotties*,nwb-guide.spec,prepare_pyinstaller_spec.py
4 changes: 2 additions & 2 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Chromatic

on:
workflow_dispatch:
#pull_request_review:
# types: [submitted]
pull_request_review:
types: [submitted]

jobs:
test:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Codespell

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
codespell:
name: Check for spelling errors
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Codespell
uses: codespell-project/actions-codespell@v1
2 changes: 1 addition & 1 deletion prepare_pyinstaller_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
with open(file=Path(__file__).parent / "nwb-guide.spec", mode="w") as io:
io.writelines(lines)

print("Sucessfully injected recursion depth extension and json paths!")
print("Successfully injected recursion depth extension and json paths!")
2 changes: 1 addition & 1 deletion src/renderer/assets/css/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
margin-top: 0px !important;
}

/* Notfy */
/* Notyf */
.notyf__toast {
max-width: 40vw !important;
}
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/assets/css/guided.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import url("https://fonts.googleapis.com/css?family=Poppins:400,500,600,700");

/* change the font to siblints of guided--body to Poppins except i elemenets */
/* change the font to siblints of guided--body to Poppins except i elements */

/*.guided--body *:not(i) {
font-family: "Poppins", sans-serif;
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/stories/JSONSchemaInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ export class JSONSchemaInput extends LitElement {
if (schema.transform) newValue = schema.transform(newValue, this.value, schema);
// // Do not check patter if value is empty
// // Do not check pattern if value is empty
// if (schema.pattern && !isBlank) {
// const regex = new RegExp(schema.pattern)
// if (!regex.test(isNaN(newValue) ? value : newValue)) newValue = this.value // revert to last value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export class GuidedMetadataPage extends ManagedPage {

ignore: propsToIgnore,
onOverride: (name) => {
this.notify(`<b>${header(name)}</b> has been overriden with a global value.`, "warning", 3000);
this.notify(`<b>${header(name)}</b> has been overridden with a global value.`, "warning", 3000);
},

transformErrors: (error) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export class GuidedSourceDataPage extends ManagedPage {
ignore: propsToIgnore,
globals: this.info.globalState.project.SourceData,
onOverride: (name) => {
this.notify(`<b>${header(name)}</b> has been overriden with a global value.`, "warning", 3000);
this.notify(`<b>${header(name)}</b> has been overridden with a global value.`, "warning", 3000);
},
// onlyRequired: true,
onUpdate: () => (this.unsavedUpdates = "conversions"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class GuidedStructurePage extends Page {
});
}

await this.save(undefined, false); // Interrim save, in case the schema request fails
await this.save(undefined, false); // Interim save, in case the schema request fails
await this.getSchema();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export class GuidedUploadPage extends Page {
if ("results" in globalUploadInfo) {
const result = await Swal.fire({
title: "This pipeline has already uploaded to DANDI",
html: "Would you like to reupload the lastest files?",
html: "Would you like to reupload the latest files?",
icon: "warning",
showCancelButton: true,
confirmButtonColor: "#3085d6",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class GuidedNewDatasetPage extends Page {
properties: ["createDirectory"],
},
onOverride: (name) => {
this.notify(`<b>${header(name)}</b> has been overriden with a global value.`, "warning", 3000);
this.notify(`<b>${header(name)}</b> has been overridden with a global value.`, "warning", 3000);
},
validateOnChange,
onUpdate: () => (this.unsavedUpdates = true),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export class GuidedSubjectsPage extends Page {
},
onThrow: (message, type) => this.notify(message, type),
onOverride: (name) => {
this.notify(`<b>${header(name)}</b> has been overriden with a global value.`, "warning", 3000);
this.notify(`<b>${header(name)}</b> has been overridden with a global value.`, "warning", 3000);
},
onUpdate: () => {
console.log("UPDATED!");
Expand Down
8 changes: 4 additions & 4 deletions src/renderer/src/stories/preview/inspector/InspectorList.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ const sortList = (items) => {
else return 1;
})
.sort((a, b) => {
const aLow = a.severity == "LOW";
const bLow = b.severity === "LOW";
if (aLow && bLow) return 0;
else if (aLow) return 1;
const lowA = a.severity == "LOW";
const lowB = b.severity === "LOW";
if (lowA && lowB) return 0;
else if (lowA) return 1;
else return -1;
});
};
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ describe('E2E Test', () => {
const dashboard = document.querySelector('nwb-dashboard')
dashboard.sidebar.select('settings')

// Genereate test data
// Generate test data
const page = dashboard.page
page.deleteTestData()
return await page.generateTestData()
Expand Down Expand Up @@ -319,7 +319,7 @@ describe('E2E Test', () => {

await toNextPage('sourcedata')

})
}, 10 * 1000)

test('Review source data information', async () => {

Expand All @@ -342,7 +342,7 @@ describe('E2E Test', () => {

await toNextPage('inspect')

}, 20 * 1000) // Wait for conversion to complete
}, 30 * 1000) // Wait for conversion to complete

test('Review NWB Inspector output', async () => {

Expand Down

0 comments on commit 230c601

Please sign in to comment.