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

release version 10.7.4 #1958

Merged
merged 38 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
52ed766
Update cypress to version 13.14.2
depfu[bot] Sep 6, 2024
eeb8937
Update @eslint/js to version 9.10.0
depfu[bot] Sep 7, 2024
ba3425c
Update eslint to version 9.10.0
depfu[bot] Sep 11, 2024
f3546c3
Y24-263 - replacing the static json workflow file by API response
sabrine33 Sep 12, 2024
bfbf8cd
fixing import injection for cypress tests
sabrine33 Sep 12, 2024
9505ab8
Update tailwindcss to version 3.4.11
depfu[bot] Sep 12, 2024
348c526
Replace api v1 by v2
sabrine33 Sep 13, 2024
836da6c
Merge branch 'develop' of github.com:sanger/traction-ui into Y24-263-…
sabrine33 Sep 13, 2024
9a9d4a7
run prettier
sabrine33 Sep 13, 2024
820fb0e
update LabelPrintingHelpers spec tests accordingly
sabrine33 Sep 13, 2024
2283320
Update vue-router to version 4.4.5
depfu[bot] Sep 14, 2024
a76aafc
Merge pull request #1922 from sanger/depfu/update/npm/cypress-13.14.2
stevieing Sep 16, 2024
1f70606
Merge pull request #1924 from sanger/depfu/update/npm/@eslint/js-9.10.0
stevieing Sep 16, 2024
c90dd6f
Update postcss to version 8.4.47
depfu[bot] Sep 16, 2024
a3398a1
Update vitest to version 2.1.1
depfu[bot] Sep 16, 2024
0ce03ee
Merge branch 'develop' of github.com:sanger/traction-ui into Y24-263-…
sabrine33 Sep 17, 2024
d4c4d7a
update LabelPrintingHelpers accordingly to some suggestions
sabrine33 Sep 17, 2024
70198ea
linttig the code
sabrine33 Sep 17, 2024
451f573
update tests
sabrine33 Sep 17, 2024
c57db77
Merge pull request #1929 from sanger/depfu/update/npm/eslint-9.10.0
stevieing Sep 18, 2024
a7a2f55
Merge pull request #1935 from sanger/depfu/update/npm/tailwindcss-3.4.11
stevieing Sep 18, 2024
0640a70
Update tailwindcss to version 3.4.12
depfu[bot] Sep 18, 2024
33644a8
Merge pull request #1938 from sanger/depfu/update/npm/vue-router-4.4.5
stevieing Sep 19, 2024
1735a45
Merge pull request #1941 from sanger/depfu/update/npm/postcss-8.4.47
stevieing Sep 23, 2024
f37ed31
Merge pull request #1942 from sanger/depfu/update/npm/vitest-2.1.1
stevieing Sep 23, 2024
8317331
Merge pull request #1933 from sanger/Y24-263-getting-workflows-from-api
sabrine33 Sep 23, 2024
cab2ad4
Merge pull request #1946 from sanger/depfu/update/npm/tailwindcss-3.4.12
stevieing Sep 23, 2024
0ccb2df
build(deps): bump vite from 5.4.3 to 5.4.7
dependabot[bot] Sep 23, 2024
95e9622
Merge pull request #1953 from sanger/dependabot/npm_and_yarn/vite-5.4.7
sabrine33 Sep 23, 2024
8765f37
Update vue to version 3.5.8
depfu[bot] Sep 23, 2024
1a40f8d
Merge pull request #1952 from sanger/depfu/update/npm/vue-3.5.8
sabrine33 Sep 23, 2024
ccdf4d9
Update @eslint/js to version 9.11.0
depfu[bot] Sep 23, 2024
6cd94b2
Merge pull request #1951 from sanger/depfu/update/npm/@eslint/js-9.11.0
sabrine33 Sep 23, 2024
32865fb
Update @vitejs/plugin-vue to version 5.1.4
depfu[bot] Sep 23, 2024
efbf691
Merge pull request #1947 from sanger/depfu/update/npm/@vitejs/plugin-…
sabrine33 Sep 23, 2024
f631114
Update .env file
stevieing Sep 23, 2024
865a6af
Update .release-version
sabrine33 Sep 24, 2024
712e97d
Merge pull request #1954 from sanger/remove-vite-tube-label-template-…
stevieing Sep 24, 2024
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
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ VITE_SAMPLEEXTRACTION_BASE_URL=http://sampleextraction
VITE_SEQUENCESCAPE_BASE_URL=http://sequencescape
VITE_SEQUENCESCAPE_API_KEY=development
VITE_LOG=false
VITE_TUBE_LABEL_TEMPLATE_NAME=traction_tube_label_template
VITE_ENVIRONMENT=development
2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.7.3
10.7.4
550 changes: 234 additions & 316 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,32 @@
},
"dependencies": {
"@sanger/ui-styling": "^4.1.0",
"@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue": "^5.1.4",
"autoprefixer": "^10.4.20",
"axios": "^1.7.7",
"csv-parse": "^5.5.6",
"global": "^4.4.0",
"lodash-es": "^4.17.21",
"pinia": "^2.2.2",
"postcss": "^8.4.41",
"postcss": "^8.4.47",
"swrv": "^1.0.4",
"tailwindcss": "3.4.9",
"vite": "^5.4.3",
"vue": "^3.4.38",
"vue-router": "^4.4.3",
"tailwindcss": "3.4.12",
"vite": "^5.4.7",
"vue": "^3.5.8",
"vue-router": "^4.4.5",
"vue3-selecto": "^1.12.3",
"vuex": "^4.1.0"
},
"devDependencies": {
"@eslint/js": "^9.9.0",
"@eslint/js": "^9.11.0",
"@pinia/testing": "^0.1.5",
"@vue/test-utils": "^2.4.6",
"better-docs": "^2.7.3",
"clean-jsdoc-theme": "^4.3.0",
"cypress": "^13.14.1",
"cypress": "^13.14.2",
"cypress-file-upload": "^5.0.8",
"dotenv": "^16.4.5",
"eslint": "^9.9.1",
"eslint": "^9.10.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-cypress": "^3.5.0",
"eslint-plugin-vue": "^9.28.0",
Expand All @@ -61,6 +61,6 @@
"postcss-cli": "^11.0.0",
"prettier": "3.3.3",
"rollup-plugin-visualizer": "^5.12.0",
"vitest": "^2.0.5"
"vitest": "^2.1.1"
}
}
3 changes: 3 additions & 0 deletions src/api/Config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ const config = [
{
name: 'printers',
},
{
name: 'workflows',
},
],
pipelines: [
{
Expand Down
37 changes: 24 additions & 13 deletions src/components/labelPrinting/LabelPrintingForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</div>
</fieldset>

<DataFetcher :fetcher="fetchPrinters">
<DataFetcher :fetcher="fetchResources">
<fieldset>
<traction-heading level="3" show-border>Choice of Printer</traction-heading>
<traction-heading level="5">Select label type</traction-heading>
Expand Down Expand Up @@ -131,7 +131,6 @@ import {
createWorkflowPlateBarcodeLabel,
NullWorkflowItem,
} from '@/lib/LabelPrintingHelpers.js'
import WorkflowList from '@/config/WorkflowList.json'
import { nextTick } from 'vue'
import LabelTypes from '@/config/LabelTypes.json'

Expand All @@ -149,9 +148,15 @@ const labelOptions = reactive({ suffix: '', labelTypeKey: 'tube2d' }) // label o

let printJob = reactive(PrintJobType()) // Create a reactive for the print job

const workflowOptions = reactive(createWorkflowOptions(WorkflowList)) // Create a reactive for the workflow options
//Create a review for the barcode to be printed
const workflowOptions = computed(() => {
return createWorkflowOptions(Object.values(printingStore.pipelines.steps))
})

const workflowDropdownOptions = reactive(createWorkflowDropdownOptions(WorkflowList)) // Create a reactive for the workflow dropdown options
//Create the workflow dropdown options
const workflowDropdownOptions = computed(() => {
return createWorkflowDropdownOptions(printingStore.pipelines)
})

/**
* Creates a map of functions to create labels
Expand Down Expand Up @@ -200,7 +205,7 @@ const labelType = computed(() => {
const workflowBarcodeItems = computed(() => {
const date = getCurrentDate()
// without this we get an undefined error
const workflowItem = workflowOptions[labelOptions.suffix] || NullWorkflowItem
const workflowItem = workflowOptions.value[labelOptions.suffix] || NullWorkflowItem

// it is possible for there to be no barcodes so we need to add a guard
// we filter to remove any nulls
Expand Down Expand Up @@ -250,15 +255,21 @@ const onReset = () => {
})
}

// fetch printers
// if no printers are in the store, fetch them
// if no printers or workflows in the store, fetch them
// if there are printers in the store, return success prevents error in DataFetcher
// @returns {Promise} - Promise
const fetchPrinters = async () => {
if (printingStore.printers().length === 0) {
return await printingStore.fetchPrinters()
} else {
return { success: true }
}
const fetchResources = async () => {
const { printers, fetchPrinters, fetchWorkflows, pipelines } = printingStore
const responses = await Promise.all([
Object.keys(printers).length === 0 ? fetchPrinters() : { success: true, errors: [] },
pipelines.workflows.length === 0 || pipelines.steps.length === 0
? fetchWorkflows()
: { success: true, errors: [] },
])

const success = responses.every((response) => response.success)
const errors = responses.flatMap((response) => response.errors)

return { success, errors }
}
</script>
Loading
Loading