Skip to content

Commit

Permalink
Inaccurate modified time in Provenance Domain
Browse files Browse the repository at this point in the history
Fix #112
Changes to be committed:
	modified:   client/src/components/builder/descriptionDomain.js
	modified:   client/src/components/builder/executionDomain.js
	modified:   client/src/components/builder/extensionDomain.js
	modified:   client/src/components/builder/index.js
	modified:   client/src/components/builder/ioDomain.js
	modified:   client/src/components/builder/parametricDomain.js
	modified:   client/src/components/builder/provenanceDomain.js
	modified:   client/src/components/builder/rawJson.js
	renamed:    client/src/components/builder/preview.js -> client/src/components/builder/treeView.js
	modified:   client/src/components/builder/usabilityDomain.js
	modified:   client/src/slices/bcoSlice.js
  • Loading branch information
HadleyKing committed Jun 14, 2023
1 parent 2df1835 commit d5d8ffc
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 13 deletions.
3 changes: 2 additions & 1 deletion client/src/components/builder/descriptionDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import {Autocomplete } from "@material-ui/lab";
import { Formik, Form, FieldArray } from "formik";
import { useSelector, useDispatch } from "react-redux"
import { updateDescription } from "../../slices/bcoSlice"
import { updateDescription, updateModified } from "../../slices/bcoSlice"
import { LargeTextField, MyTextField } from "./specialFeilds";
import { Uri } from "./components"

Expand All @@ -30,6 +30,7 @@ export const DescriptionDomain = ({onSave}) => {
onSubmit={
(myData, {setSubmitting}) => {
setSubmitting(true);
dispatch(updateModified())
dispatch(updateDescription(myData));
setSubmitting(false);
onSave()
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/builder/executionDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Card, Typography, CardContent, Grid, Button, TextField} from "@material-
import { Formik, Form, FieldArray } from "formik";

import { useSelector, useDispatch } from "react-redux"
import { updateExecutionDomain } from "../../slices/bcoSlice"
import { updateExecutionDomain, updateModified } from "../../slices/bcoSlice"

import { MyTextField } from "./specialFeilds"
import { Uri } from "./components"
Expand Down Expand Up @@ -50,6 +50,7 @@ export const ExecutionDomain = ({onSave}) => {
setSubmitting(true);
dispatch(updateExecutionDomain({formData, envars}));
setSubmitting(false);
dispatch(updateModified())
onSave()
}
}
Expand Down
4 changes: 3 additions & 1 deletion client/src/components/builder/extensionDomain.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from "react";
import { useSelector, useDispatch } from "react-redux"
import { Card, CardContent, TextField, Typography, Grid, Button, Paper } from "@material-ui/core";
import { addExtensionDomain, deleteExtensionDomain } from "../../slices/bcoSlice"
import { addExtensionDomain, deleteExtensionDomain, updateModified } from "../../slices/bcoSlice"
import { Extension } from "./extension";

export const ExtensionDomain = ({onSave}) => {
Expand All @@ -21,11 +21,13 @@ export const ExtensionDomain = ({onSave}) => {
console.log(`ERROR: ${error}`);
global.window.alert(`Fetch schema from '${newSchema}' FAILED: ${error}`);
});
dispatch(updateModified())
setNewSchema("");
};

const removeRows = (index) => {
dispatch(deleteExtensionDomain({index}))
dispatch(updateModified())
};

return (
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { UsabilityDomain } from "./usabilityDomain";
import { ParametricDomain } from "./parametricDomain";
import { IODomain } from "./ioDomain";
import { ExecutionDomain } from "./executionDomain";
import { TreeView } from "./preview";
import { TreeView } from "./treeView";
import { ExtensionDomain } from "./extensionDomain";
import { RawJson } from "./rawJson";
import { useDispatch, useSelector } from "react-redux"
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/builder/ioDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Card, Typography, CardContent, Grid, Button} from "@material-ui/core";
import { Formik, Form, FieldArray } from "formik";

import { useSelector, useDispatch } from "react-redux"
import { updateIODomain } from "../../slices/bcoSlice"
import { updateIODomain, updateModified } from "../../slices/bcoSlice"

import { MyTextField } from "./specialFeilds"
import { Uri } from "./components"
Expand Down Expand Up @@ -33,6 +33,7 @@ export const IODomain = ({onSave}) => {
(myData, {setSubmitting}) => {
setSubmitting(true);
dispatch(updateIODomain(myData));
dispatch(updateModified());
setSubmitting(false);
onSave()
}
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/builder/parametricDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Card, Typography, CardContent, Grid, Button} from "@material-ui/core";
import { Formik, Form, FieldArray } from "formik";

import { useSelector, useDispatch } from "react-redux"
import { updateParametricDomain } from "../../slices/bcoSlice"
import { updateParametricDomain, updateModified } from "../../slices/bcoSlice"

import { MyTextField } from "./specialFeilds"

Expand All @@ -28,6 +28,7 @@ export const ParametricDomain = ({onSave}) => {
(myData, {setSubmitting}) => {
setSubmitting(true);
dispatch(updateParametricDomain(myData["parametric_domain"]));
dispatch(updateModified());
setSubmitting(false);
onSave()
}
Expand Down
5 changes: 2 additions & 3 deletions client/src/components/builder/provenanceDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Reviewer } from "./reviewer";

import { useSelector, useDispatch } from "react-redux"
import { BaisicDateTimePicker, MyTextField } from "./specialFeilds";
import { updateProvenanceDomain } from "../../slices/bcoSlice"
import { updateProvenanceDomain, updateModified } from "../../slices/bcoSlice"

export const ProvenanceDomain = ({onSave} ) => {
const dispatch = useDispatch();
Expand Down Expand Up @@ -43,7 +43,7 @@ export const ProvenanceDomain = ({onSave} ) => {
onSubmit={
(values, {setSubmitting, setValues}) => {
setSubmitting(true);
console.log("myData", values)
dispatch(updateModified());
if (obsolete === false) {
delete values["obsolete_after"]
}
Expand All @@ -52,7 +52,6 @@ export const ProvenanceDomain = ({onSave} ) => {
}
dispatch(updateProvenanceDomain(values));
setSubmitting(false);
console.log(values.contributors.length)
onSave()
}
}
Expand Down
7 changes: 5 additions & 2 deletions client/src/components/builder/rawJson.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, Button, Card, CardContent, CardHeader, TextField } from "@material-ui/core";
import React, { useState } from "react";
import { useSelector, useDispatch } from "react-redux";
import { updateBco } from "../../slices/bcoSlice";
import { updateBco, updateModified } from "../../slices/bcoSlice";
export const RawJson = () => {
const dispatch = useDispatch()
const [bco, setBco] = useState(useSelector(state => state.bco.data))
Expand Down Expand Up @@ -50,7 +50,10 @@ export const RawJson = () => {
disabled={jsonErrors !== ""}
variant="contained"
color="primary"
onClick={() => dispatch(updateBco(bco))}
onClick={() => {
dispatch(updateBco(bco));
dispatch(updateModified());
}}
> Submit Changes </Button>
</CardContent>
</Card>)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion client/src/components/builder/usabilityDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const UsabilityDomain = ({onSave}) => {
}
>
{
({values, isSubmitting,errors}) => (
({values, isSubmitting, errors}) => (
<Form>
<FieldArray name='usability_domain'>
{arrayHelpers => (
Expand Down
2 changes: 1 addition & 1 deletion client/src/slices/bcoSlice.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export const updateDraftBco = createAsyncThunk(
try {
console.log("bcoURL: ", bcoURL);
const response = await BcoService.updateDraftBco(bcoURL, bcoObject);
thunkAPI.dispatch(setMessage(response.data.message))
thunkAPI.dispatch(setMessage(response.data[0].message))
return response.data;
} catch(error) {
const message =
Expand Down
Binary file added server/db.sqlite
Binary file not shown.

0 comments on commit d5d8ffc

Please sign in to comment.