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.

Sign up for GitHub

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

CVE remediation #43

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

CVE remediation #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
222754a
Use https for github packages
alexabird Nov 19, 2024
09a2bdd
Resolve CVEs
alexabird Nov 20, 2024
4536d9e
Update version
alexabird Nov 25, 2024
3c339d9
use PR commit hash
alexabird Nov 26, 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
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@connexta/kanri",
"author": "connexta",
"description": "An administration UI for DDF",
"version": "0.0.14",
"version": "0.0.15",
"license": "LGPL-3.0",
"keywords": [],
"repository": {
Expand All @@ -29,8 +29,8 @@
"@types/socket.io": "2.1.3",
"@types/socket.io-client": "1.4.32",
"@types/styled-components": "4.0.3",
"@connexta/ace": "git://github.com/andrewkfiedler/ace.git#b9e2d582cee8b1e60be015785ec7ec01d4f12b68",
"@connexta/eslint-config-connexta": "git://github.com/connexta/eslint-config-connexta.git#3f0caece6210d25c16863d472026fbfa069521a6",
"@connexta/ace": "git+https://github.com/andrewkfiedler/ace.git#b9e2d582cee8b1e60be015785ec7ec01d4f12b68",
"@connexta/eslint-config-connexta": "git+https://github.com/connexta/eslint-config-connexta.git#3f0caece6210d25c16863d472026fbfa069521a6",
"chokidar": "3.0.2",
"cpx": "1.5.0",
"express": "4.17.1",
Expand Down Expand Up @@ -66,14 +66,14 @@
},
"dependencies": {
"dropzone": "5.5.1",
"formik": "1.5.8",
"formik": "2.3.3",
"fuse.js": "3.4.5",
"iframe-resizer": "4.1.1",
"lodash.throttle": "4.1.1",
"@connexta/logviewer": "git://github.com/connexta/logviewer.git#81784420e24eb19d7584e5ee9a73789518d3e6aa",
"@connexta/logviewer": "git+https://github.com/alexabird/logviewer.git#bd9c142a447dc67411262b1d2d19f3629b4154c0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update when logviewer PR is merged

"prop-types": "15.7.2",
"scroll-into-view-if-needed": "2.2.20",
"yup": "0.27.0"
"yup": "1.4.0"
},
"scripts": {
"copy:package": "cpx package.json dist && json -I -f dist/package.json -e 'this.private=false' && cpx \"src/**/!(*.tsx)\" \"dist/src\" && cpx \"dev/**/!(*.tsx)\" \"dist/dev\"",
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/components/app-root/app-root.pure.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ export type MetatypeType = {
optionLabels: string[]
optionValues: string[]
type: number
touched: boolean
initialTouched: boolean
}

export type ExistingConfigurationType = {
Expand Down
16 changes: 8 additions & 8 deletions src/main/webapp/components/configuration/edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import MenuItem from '@material-ui/core/MenuItem'
import InputLabel from '@material-ui/core/InputLabel'
import {
Formik,
FormikActions,
FormikHelpers as FormikActions,
FormikProps,
Form as FormikForm,
Field,
Expand Down Expand Up @@ -125,7 +125,7 @@ const FieldRender = ({
meta: MetatypeType
formikBag: FormikProps<MyFormValues>
loading: boolean
} & FieldProps<MyFormValues>) => {
} & FieldProps<string[], MyFormValues>) => {
const autoFocus = location.hash.split('?focus=')[1] === meta.id
if (meta.optionLabels.length > 0) {
return (
Expand Down Expand Up @@ -172,7 +172,7 @@ const FieldRender = ({
<Label meta={meta}>
<FocusableCheckbox
autoFocus={autoFocus}
checked={field.value}
checked={field.value as unknown as boolean}
onChange={(e: any) => {
// @ts-ignore
const newVal = e.target.checked
Expand All @@ -189,7 +189,7 @@ const FieldRender = ({
if (meta.cardinality > 0) {
if (field.value === undefined) {
}
const value = field.value as string[]
const value = field.value as unknown as string[]
return (
<div>
<Label meta={meta} />
Expand All @@ -212,7 +212,7 @@ const FieldRender = ({
onChange={e => {
// @ts-ignore
const newSubVal = e.target.value
const newVal = field.value.slice(0)
const newVal = (field.value as unknown as string[]).slice(0)
newVal.splice(index, 1, newSubVal)
formikBag.setFieldValue(field.name, newVal)
}}
Expand All @@ -224,7 +224,7 @@ const FieldRender = ({
variant="outlined"
color="secondary"
onClick={() => {
const newVal = field.value.slice(0)
const newVal = (field.value as unknown as string[]).slice(0)
newVal.splice(index, 1)
formikBag.setFieldValue(field.name, newVal)
}}
Expand All @@ -241,7 +241,7 @@ const FieldRender = ({
variant="outlined"
color="primary"
onClick={() => {
const newVal = field.value.slice(0)
const newVal = (field.value as unknown as string[]).slice(0)
newVal.push('')
formikBag.setFieldValue(field.name, newVal)
}}
Expand Down Expand Up @@ -564,7 +564,7 @@ const ConfigurationEditRender = ({
<Field
key={meta.id}
name={meta.id.split('.').join(DOT_REPLACEMENT)}
render={({ field, form }: FieldProps<MyFormValues>) => {
render={({ field, form }: FieldProps<string[], MyFormValues>) => {
return (
<div>
<FieldRender
Expand Down
Loading