Skip to content

Commit

Permalink
AMP-3377
Browse files Browse the repository at this point in the history
- fix vue-pathify sync issue
- label unused view pacakge
  • Loading branch information
yingfeng-iu committed Sep 19, 2024
1 parent 8fa2518 commit cd94f62
Show file tree
Hide file tree
Showing 48 changed files with 84 additions and 79 deletions.
2 changes: 1 addition & 1 deletion src/components/account/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<script>
import AmpHeader from "@/components/shared/AmpHeader.vue";
import { accountService } from "@/service/account-service";
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import AccessControlService from "@/service/access-control-service";
import SharedService from "@/service/shared-service";
import Loader from "@/components/shared/Loader.vue";
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Sidebar from "@/components/navigation/Sidebar.vue";
import DashboardTable from "@/components/dashboard/DashboardTable.vue";
import DateFilter from "@/components/dashboard/DashboardFilters/DateFilter";
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/DashboardFilters/DateFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>
</template>
<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Datepicker from "vuejs3-datepicker";
import ClickOutside from "vue-click-outside";
export default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/DashboardFilters/SearchFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import _ from "underscore";
import Typeahead from "../../shared/TypeAhead.vue";
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/DashboardTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import { env } from "@/helpers/env";
import WorkflowResultService from "../../service/workflow-result-service";
import SortableHeader from "../shared/SortableHeader";
Expand Down
2 changes: 1 addition & 1 deletion src/components/deliverables/Deliverables.vue
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
</div>
</template>
<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import { env } from "@/helpers/env";
import Modal from "@/components/shared/Modal.vue";
import SharedService from "@/service/shared-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/entity/EntityList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import config from "../../assets/constants/common-contant.js";
import Sidebar from "@/components/navigation/Sidebar.vue";
import Logout from "@/components/shared/Logout.vue";
Expand Down
2 changes: 1 addition & 1 deletion src/components/entity/ItemFiles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import { env } from "../../helpers/env";
import Sidebar from "@/components/navigation/Sidebar.vue";
import Logout from "@/components/shared/Logout.vue";
Expand Down
2 changes: 1 addition & 1 deletion src/components/entity/OutputFile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</div>
</template>
<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Loader from "@/components/shared/Loader.vue";
import WorkflowResultService from "../../service/workflow-result-service";
import config from "../../assets/constants/common-contant.js";
Expand Down
2 changes: 1 addition & 1 deletion src/components/evaluation/GroundTruthModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Loader from "@/components/shared/Loader.vue";
import SharedService from "@/service/shared-service";
import config from "@/assets/constants/common-contant.js";
Expand Down
2 changes: 1 addition & 1 deletion src/components/evaluation/MGMevaluation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import config from "../../assets/constants/common-contant.js";
import Loader from "@/components/shared/Loader.vue";
import SharedService from "../../service/shared-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/evaluation/NewTest.vue
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import config from "@/assets/constants/common-contant.js";
import Loader from "@/components/shared/Loader.vue";
import SharedService from "@/service/shared-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/evaluation/TestResults.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Loader from "@/components/shared/Loader.vue";
import SharedService from "../../service/shared-service";
import EvaluationService from "../../service/evaluation-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/evaluation/TestResultsVisualiz.vue
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Loader from "@/components/shared/Loader.vue";
import SharedService from "@/service/shared-service";
import EvaluationService from "@/service/evaluation-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import { env } from "@/helpers/env";
import config from "@/assets/constants/common-contant.js";
import SharedService from "@/service/shared-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
import config from "../../assets/constants/common-contant.js";
import Logout from "@/components/shared/Logout.vue";
import BreadCrumbs from "@/components/shared/BreadCrumbs.vue";
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import SharedService from "../../service/shared-service.js";
import EvaluationService from "@/service/evaluation-service";
import { env } from "@/helpers/env";
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/Logout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<script>
import config from "../../assets/constants/common-contant.js"
import { accountService } from "@/service/account-service";
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import defaultState from "../../store/state";
import SharedService from "@/service/shared-service";
export default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/Search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import SharedService from "@/service/shared-service";
import Typeahead from "../shared/TypeAhead.vue";
import ItemService from "@/service/item-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/TypeAhead.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
export default {
name: "Typeahead",
props: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/supplement/SupplementFile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import { env } from "@/helpers/env";
import UnitService from "@/service/unit-service";
import ItemService from "@/service/item-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/supplement/SupplementList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Loader from "@/components/shared/Loader.vue";
import SharedService from "@/service/shared-service";
import SupplementService from "@/service/supplement-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/CollectionDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Sidebar from "@/components/navigation/Sidebar.vue";
import Logout from "@/components/shared/Logout.vue";
import CollectionDetailsService from "../../service/collection-detail-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/CollectionDetailsItemCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import CollectionDetailsService from "../../service/collection-detail-service";
export default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/CollectionFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import _ from "underscore";
import Typeahead from "../../shared/TypeAhead.vue";
import ClickOutside from "vue-click-outside";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/Collections.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Sidebar from "@/components/navigation/Sidebar.vue";
import Logout from "@/components/shared/Logout.vue";
import CollectionService from "../../service/collection-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/FileFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import _ from "underscore";
import Typeahead from "../../shared/TypeAhead.vue";
import ClickOutside from "vue-click-outside";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/ItemFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import _ from "underscore";
import Typeahead from "../../shared/TypeAhead.vue";
import ClickOutside from "vue-click-outside";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/Jobs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<script>
//import AmpHeader from '@/components/shared/AmpHeader.vue'
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
export default {
name: "Jobs",
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/StatusFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import _ from "underscore";
import { BFormCheckboxGroup } from "bootstrap-vue";
import ClickOutside from "vue-click-outside";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/StepFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import _ from "underscore";
import Typeahead from "../../shared/TypeAhead.vue";
import ClickOutside from "vue-click-outside";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/SubmitterFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Typeahead from "../../shared/TypeAhead.vue";
import ClickOutside from "vue-click-outside";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/TextFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import _ from "underscore";
import Typeahead from "../shared/TypeAhead.vue";
import ClickOutside from "vue-click-outside";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/WorkflowFiles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
export default {
name: "FileSelection",
components: {},
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/WorkflowFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import _ from "underscore";
import Typeahead from "../../shared/TypeAhead.vue";
import ClickOutside from "vue-click-outside";
Expand Down
2 changes: 1 addition & 1 deletion src/components/unused/WorkflowSelection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import { requestOptions } from "@/helpers/request-options";
import WorkflowService from "../../service/workflow-service";
export default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/workflow/SaveBundle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Modal from "@/components/shared/Modal.vue";
import WorkflowService from "../../service/workflow-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/workflow/SelectBundle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Modal from "@/components/shared/Modal.vue";
import WorkflowService from "../../service/workflow-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/workflow/SelectFiles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import { env } from "@/helpers/env";
import SharedService from "@/service/shared-service";
import WorkflowService from "../../service/workflow-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/workflow/SelectWorkflow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import { env } from "@/helpers/env.js";
import { requestOptions } from "@/helpers/request-options";
import Modal from "@/components/shared/Modal.vue";
Expand Down
2 changes: 1 addition & 1 deletion src/components/workflow/WorkflowList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
</template>

<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import WorkflowService from "../../service/workflow-service";
import config from "../../assets/constants/common-contant.js";
import SharedService from "../../service/shared-service";
Expand Down
2 changes: 1 addition & 1 deletion src/components/workflow/WorkflowSubmission.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</div>
</template>
<script>
import { sync } from "vuex-pathify";
import sync from "@/helpers/sync";
import Sidebar from "@/components/navigation/Sidebar.vue";
import SelectFiles from "@/components/workflow/SelectFiles.vue";
import SelectWorkflow from "@/components/workflow/SelectWorkflow.vue";
Expand Down
5 changes: 5 additions & 0 deletions src/helpers/sync.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { sync as pathify_sync } from "vuex-pathify";

export default function sync(property) {
return pathify_sync(property, false);
}
4 changes: 1 addition & 3 deletions src/router.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import Vue from "vue";
import Router from "vue-router";
import { createRouter, createWebHistory } from 'vue-router'

import Login from "./components/account/Login.vue";
Expand All @@ -24,7 +22,7 @@ import TestResultsVisualiz from "./components/evaluation/TestResultsVisualiz.vue
import SupplementList from "./components/supplement/SupplementList.vue";
import AccessDenied from "./components/shared/AccessDenied.vue";
import HomePage from "@/components/home";
import store from "./store/amp-store.js";
import { store } from "./store/amp-store.js";


var router = createRouter({
Expand Down
1 change: 1 addition & 0 deletions src/service/access-control-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ export default class AccessControlService extends BaseService {
async initPermissions(instance) {
const self = instance;
await this.isAdmin(self);
console.log("acIsAdmin = " + self.acIsAdmin);
if(!self.acIsAdmin) {
this.getPermittedActions()
.then((res) => {
Expand Down
Loading

0 comments on commit cd94f62

Please sign in to comment.