Skip to content

Commit

Permalink
pkp/pkp-lib#7495 Move 'submissionSummaryModal' to own workflow folder…
Browse files Browse the repository at this point in the history
… + other renaming and moving around for better structure
  • Loading branch information
jardakotesovec committed Oct 8, 2024
1 parent ec6cb15 commit 6394638
Show file tree
Hide file tree
Showing 38 changed files with 548 additions and 641 deletions.
12 changes: 6 additions & 6 deletions src/components/Container/WorkflowPage.vue
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<script type="text/javascript">
import Page from './Page.vue';
import ContributorsListPanel from '@/components/ListPanel/contributors/ContributorsListPanel.vue';
import PublicationSectionJats from '@/pages/workflow/PublicationSectionJats.vue';
import WorkflowPublicationJats from '@/pages/workflow/components/publication/WorkflowPublicationJats.vue';
import Composer from '@/components/Composer/Composer.vue';
import Dropdown from '@/components/Dropdown/Dropdown.vue';
import Modal from '@/components/Modal/Modal.vue';
import PkpHeader from '@/components/Header/Header.vue';
import LocalizeSubmission from '@/mixins/localizeSubmission.js';
import ajaxError from '@/mixins/ajaxError';
import dialog from '@/mixins/dialog.js';
import ChangeSubmissionLanguage from '@/pages/workflow/ChangeSubmissionLanguage.vue';
import SelectRevisionDecisionModal from '@/pages/workflow/SelectRevisionDecisionModal.vue';
import WorkflowChangeSubmissionLanguage from '@/pages/workflow/components/publication/WorkflowChangeSubmissionLanguage.vue';
import SelectRevisionDecisionModal from '@/pages/workflow/modals/WorkflowSelectRevisionDecisionModalLegacyWorkflow.vue';
import {useModal} from '@/composables/useModal';
export default {
name: 'WorkflowPage',
components: {
ChangeSubmissionLanguage,
WorkflowChangeSubmissionLanguage,
ContributorsListPanel,
Composer,
Dropdown,
Modal,
PkpHeader,
PublicationSectionJats,
WorkflowPublicationJats,
},
extends: Page,
mixins: [LocalizeSubmission, dialog, ajaxError],
Expand Down Expand Up @@ -320,7 +320,7 @@ export default {
*/
openChangeSubmissionLanguageModal() {
const {openSideModal} = useModal();
openSideModal(ChangeSubmissionLanguage, {
openSideModal(WorkflowChangeSubmissionLanguage, {
form: this.components[
pkp.const.FORM_CHANGE_SUBMISSION_LANGUAGE_METADATA
],
Expand Down
8 changes: 4 additions & 4 deletions src/components/Form/fields/FieldSelectIssue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ export default {
// workaround to avoid circular dependencies in storybook
// There is chain if imports, and some of them imported form
// which seems to be causing circular dependency
const {useSubmissionSummaryStore} = await import(
'@/pages/dashboard/SubmissionSummaryModal/submissionSummaryStore.js'
const {useWorkflowStore} = await import(
'@/pages/workflow/workflowStore.js'
);
const summaryStore = useSubmissionSummaryStore();
const workflowSotre = useWorkflowStore();
summaryStore.workflowAssignToIssue({}, (finishedData) => {
workflowSotre.workflowAssignToIssue({}, (finishedData) => {
if (finishedData.data.issueId) {
this.currentValue = finishedData.data.issueId;
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/Modal/ModalManager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ import {storeToRefs} from 'pinia';
import SideModal from '@/components/Modal/SideModal.vue';
import LegacyAjax from '@/components/Modal/SideModalBodyLegacyAjax.vue';
import PkpDialog from '@/components/Modal/Dialog.vue';
import WorkflowLogResponseForModal from '@/pages/workflow/WorkflowLogResponseForModal.vue';
const GlobalModals = {LegacyAjax, WorkflowLogResponseForModal};
const GlobalModals = {LegacyAjax};
const modalStore = useModalStore();
const {
Expand Down
5 changes: 3 additions & 2 deletions src/pages/dashboard/DashboardPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
</div>
<div class="mt-4">
<ActiveFilters
<DashboardActiveFilters
:active-filters-list="store.filtersFormList"
@clear-filters="store.clearFiltersForm"
@remove-filter="store.clearFiltersFormField"
Expand All @@ -44,7 +44,7 @@
</template>
<script setup>
import PkpButton from '@/components/Button/Button.vue';
import ActiveFilters from './components/ActiveFilters.vue';
import DashboardActiveFilters from './components/DashboardActiveFilters.vue';
import DashboardTable from './components/DashboardTable/DashboardTable.vue';
import Search from '@/components/Search/Search.vue';
Expand Down Expand Up @@ -102,3 +102,4 @@ const store = useDashboardPageStore(props);
@apply bg-secondary p-0;
}
</style>
./components/DashboardActiveFilters.vue

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6394638

Please sign in to comment.