Skip to content

pkp/pkp-lib#9295 continuous publication implementation update #683

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions public/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ window.pkp = {
STATUS_PUBLISHED: 3,
STATUS_DECLINED: 4,
STATUS_SCHEDULED: 5,
PUBLICATION_STATUS_QUEUED: 1,
PUBLICATION_STATUS_PUBLISHED: 3,
PUBLICATION_STATUS_DECLINED: 4,
PUBLICATION_STATUS_SCHEDULED: 5,
WORKFLOW_STAGE_ID_SUBMISSION: 1,
WORKFLOW_STAGE_ID_INTERNAL_REVIEW: 2,
WORKFLOW_STAGE_ID_EXTERNAL_REVIEW: 3,
Expand Down
55 changes: 44 additions & 11 deletions src/components/Form/Form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
type="hidden"
:name="name"
:value="value"
@change="fieldChanged"
/>
<FormLocales
v-if="availableLocales.length > 1"
Expand Down Expand Up @@ -70,6 +71,7 @@
@show-locale="showLocale"
@cancel="cancel"
@set-errors="setErrors"
@set-field-required="setFieldRequired"
/>
</div>
</form>
Expand Down Expand Up @@ -160,6 +162,7 @@ export default {
currentPage: '',
isSaving: false,
lastSaveTimestamp: -1,
fieldRequiredStates: {}, // track field required states for dynamic fields
};
},
computed: {
Expand Down Expand Up @@ -384,7 +387,19 @@ export default {
) {
return;
}

// Check if field has custom required state
if (field.name in this.fieldRequiredStates) {
const isFieldRequired = this.fieldRequiredStates[field.name];
// check if Field is required by dynamic update and return if not
// otherwise continue with default checks
if (!isFieldRequired) {
return;
}
}

let missingValue = false;

// Only require the primary locale by default for multilingual fields
let value = field.isMultilingual
? field.value[this.primaryLocale]
Expand Down Expand Up @@ -490,18 +505,29 @@ export default {
* @param {String} localeKey Optional locale key for multilingual props
*/
fieldChanged: function (name, prop, value, localeKey) {
const newFields = this.fields.map((field) => {
if (field.name === name) {
if (localeKey) {
field[prop][localeKey] = value;
} else {
field[prop] = value;
// Check if this is a hidden field or normal field
const isHiddenField = this.hiddenFields && name in this.hiddenFields;

if (isHiddenField) {
const newHiddenFields = {...this.hiddenFields};
newHiddenFields[name] = value;
this.$emit('set', this.id, {hiddenFields: newHiddenFields});
} else {
const newFields = this.fields.map((field) => {
if (field.name === name) {
if (localeKey) {
field[prop][localeKey] = value;
} else {
field[prop] = value;
}
}
}
return field;
});
this.$emit('set', this.id, {fields: newFields});
this.removeError(name, localeKey);
return field;
});
this.$emit('set', this.id, {fields: newFields});

// Remove any errors for this field
this.removeError(name, localeKey);
}
},

/**
Expand Down Expand Up @@ -631,6 +657,13 @@ export default {
setErrors: function (errors) {
this.$emit('set', this.id, {errors: errors});
},

/**
* Set the required state for a specific field
*/
setFieldRequired(fieldName, isRequired) {
this.fieldRequiredStates[fieldName] = isRequired;
},
},
};
</script>
Expand Down
13 changes: 11 additions & 2 deletions src/components/Form/FormGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
:locales="availableLocales"
@change="fieldChanged"
@set-errors="setFieldErrors"
@set-field-required="setFieldRequired"
></component>
</div>
</div>
Expand All @@ -60,6 +61,7 @@
:locales="availableLocales"
@change="fieldChanged"
@set-errors="setFieldErrors"
@set-field-required="setFieldRequired"
></component>
</template>
</template>
Expand Down Expand Up @@ -88,8 +90,8 @@ import FieldRadioInput from './fields/FieldRadioInput.vue';
import FieldRichTextarea from './fields/FieldRichTextarea.vue';
import FieldRichText from './fields/FieldRichText.vue';
import FieldSelect from './fields/FieldSelect.vue';
import FieldSelectIssue from './fields/FieldSelectIssue.vue';
import FieldSelectIssues from './fields/FieldSelectIssues.vue';
import FieldIssueSelection from './fields/FieldIssueSelection.vue';
import FieldSelectSubmissions from './fields/FieldSelectSubmissions.vue';
import FieldSelectUsers from './fields/FieldSelectUsers.vue';
import FieldShowEnsuringLink from './fields/FieldShowEnsuringLink.vue';
Expand Down Expand Up @@ -125,8 +127,8 @@ export default {
FieldRichTextarea,
FieldRichText,
FieldSelect,
FieldSelectIssue,
FieldSelectIssues,
FieldIssueSelection,
FieldSelectSubmissions,
FieldSelectUsers,
FieldShowEnsuringLink,
Expand Down Expand Up @@ -240,6 +242,13 @@ export default {
}
this.$emit('set-errors', {...newErrors});
},

/**
* Forward field required events to the form page
*/
setFieldRequired: function (fieldName, isRequired) {
this.$emit('set-field-required', fieldName, isRequired);
},
},
};
</script>
Expand Down
8 changes: 8 additions & 0 deletions src/components/Form/FormPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
:form-id="formId"
@change="fieldChanged"
@set-errors="setErrors"
@set-field-required="setFieldRequired"
/>
<ButtonRow
v-if="hasFooter"
Expand Down Expand Up @@ -234,6 +235,13 @@ export default {
setErrors: function (errors) {
this.$emit('set-errors', errors);
},

/**
* Forward field required events to the form
*/
setFieldRequired: function (fieldName, isRequired) {
this.$emit('set-field-required', fieldName, isRequired);
},
},
};
</script>
Expand Down
Loading