-
{{ title }}
-
+
-
+
+
-
+
diff --git a/src/widgets/chart/ui/ChartHeader.vue b/src/widgets/chart/ui/ChartHeader.vue
new file mode 100644
index 00000000..b88129ef
--- /dev/null
+++ b/src/widgets/chart/ui/ChartHeader.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
diff --git a/src/widgets/conceptSearchForm/index.ts b/src/widgets/conceptSearchForm/index.ts
new file mode 100644
index 00000000..0de4d02c
--- /dev/null
+++ b/src/widgets/conceptSearchForm/index.ts
@@ -0,0 +1,3 @@
+import ConceptSearchForm from "@/widgets/conceptSearchForm/ui/ConceptSearchForm.vue";
+
+export { ConceptSearchForm };
diff --git a/src/widgets/conceptSearchForm/ui/ConceptSearchForm.vue b/src/widgets/conceptSearchForm/ui/ConceptSearchForm.vue
new file mode 100644
index 00000000..7425433c
--- /dev/null
+++ b/src/widgets/conceptSearchForm/ui/ConceptSearchForm.vue
@@ -0,0 +1,428 @@
+
+
+
+
+
+
+
+
+ Search
+
+
+
+
+ No data available
+
+
+
+
+
+ Status
+
+
+
+
+
+
+
+
+
+
+ CLOSE
+
+
+
+
+
+
+
+
+
+
+
+ CANCEL
+ LOAD
+
+
+
+
+
+
+
+
+
diff --git a/src/widgets/error/index.js b/src/widgets/error/index.ts
similarity index 77%
rename from src/widgets/error/index.js
rename to src/widgets/error/index.ts
index 89ae2066..747f1a34 100644
--- a/src/widgets/error/index.js
+++ b/src/widgets/error/index.ts
@@ -1,5 +1,5 @@
import errorStore from "@/widgets/error/model/store/errors.module";
import * as errorActions from "./model/store/actions.type";
-import Error from "@/widgets/error/ui/Error";
+import Error from "@/widgets/error/ui/Error.vue";
export { Error, errorStore, errorActions };
diff --git a/src/widgets/error/model/config/errorMessages.ts b/src/widgets/error/model/config/errorMessages.ts
new file mode 100644
index 00000000..96103486
--- /dev/null
+++ b/src/widgets/error/model/config/errorMessages.ts
@@ -0,0 +1,45 @@
+export default {
+ reportsMissingFiles: {
+ temporalCharacterization:
+ "Temporal characterization file is not found. Please make sure it exists within the current release folder then try again",
+ feasibility: "Requested files not found",
+ networkPerformance:
+ "Network performance file is not found. Please make sure it exists within the data directory then try again",
+ networkDiversityReport: "Requested files not found",
+ networkUnmappedSourceCodes: "Requested files not found",
+ networkConcept: "Requested files not found",
+ networkDataQuality: "Requested files not found",
+ cohorts: "Requested files not found",
+ cohortReport: "Requested files not found",
+ dataStrandReport: "Requested files not found",
+ population: "No files found across all data sources",
+ concept: "Seems like the data file for that particular concept is missing.",
+ dataQuality: "Requested files not found",
+ death: "Requested files not found",
+ dataDensity: "Requested files not found",
+ domainTable: "Requested files not found",
+ metadata: "Requested files not found",
+ observationPeriod: "Requested files not found",
+ performance: "Requested files not found",
+ person: "Requested files not found",
+ unmappedSourceCodes: "Requested files not found",
+ dataQualityHistory: "Requested files not found",
+ domainContinuity: "Requested files not found",
+ sourceConceptOverlay: "Requested files not found",
+ index: "Index file is missing. Please run AresIndexer then try again",
+ location:
+ "Location data is not available. Please run the latest version of achilles then try again",
+ },
+ technicalError: {
+ codeError:
+ "Something went wrong. Please submit an issue on Github and describe the steps to reproduce it",
+ networkError:
+ "It seems that the server is not available at this time. Please make sure you have internet connection" +
+ " and the server is running then reload the page",
+ },
+ webApiErrors: {
+ 404: "Resource is not found",
+ 500: "Internal server error",
+ 403: "You don't have permission for this action",
+ },
+};
diff --git a/src/widgets/error/model/interfaces/Error.ts b/src/widgets/error/model/interfaces/Error.ts
new file mode 100644
index 00000000..540a27e2
--- /dev/null
+++ b/src/widgets/error/model/interfaces/Error.ts
@@ -0,0 +1,4 @@
+export interface Error {
+ message: string;
+ details: string;
+}
diff --git a/src/widgets/error/model/store/actions.type.js b/src/widgets/error/model/store/actions.type.ts
similarity index 100%
rename from src/widgets/error/model/store/actions.type.js
rename to src/widgets/error/model/store/actions.type.ts
diff --git a/src/widgets/error/model/store/errors.module.js b/src/widgets/error/model/store/errors.module.ts
similarity index 87%
rename from src/widgets/error/model/store/errors.module.js
rename to src/widgets/error/model/store/errors.module.ts
index 6f32c199..a55b600e 100644
--- a/src/widgets/error/model/store/errors.module.js
+++ b/src/widgets/error/model/store/errors.module.ts
@@ -6,13 +6,14 @@ import {
ADD_ERROR,
CLEAR_ERRORS,
} from "@/widgets/error/model/store/mutations.type";
+import { Error } from "@/widgets/error/model/interfaces/Error";
const state = {
errors: [],
};
const getters = {
- getErrors: (state) => {
+ getErrors: (state): Error[] | null => {
return state.errors.length > 0 ? state.errors : null;
},
};
diff --git a/src/widgets/error/model/store/mutations.type.js b/src/widgets/error/model/store/mutations.type.ts
similarity index 100%
rename from src/widgets/error/model/store/mutations.type.js
rename to src/widgets/error/model/store/mutations.type.ts
diff --git a/src/widgets/error/ui/Error.vue b/src/widgets/error/ui/Error.vue
index aae4a6de..1a29a0a8 100644
--- a/src/widgets/error/ui/Error.vue
+++ b/src/widgets/error/ui/Error.vue
@@ -1,25 +1,138 @@
-
-
- An error has occurred
-
-
- {{ error.message }} --
- { {{ error.details }} }
-
-
-
-
+
+
+
+
+
+
Something went wrong
+
+
+ {{ errors[0].userMessage }}
+
+
+
+
+
+
+ Submit the issue on
+
+
+
+
+
+
+
+
+
+
+
+
+
Something went wrong
+
+
+ {{ error.userMessage }}
+
+
+
+
+
+
+
+
+ Path: {{ detail.url }} , Error code: {{ detail.errorCode }}
+
+
+ Message:
+ {{ errorDetails.technicalMessage.message }}
+
+
+
+
+
-
diff --git a/src/widgets/explorer/config/folders.js b/src/widgets/explorer/config/folders.ts
similarity index 50%
rename from src/widgets/explorer/config/folders.js
rename to src/widgets/explorer/config/folders.ts
index e4485896..26dd4c16 100644
--- a/src/widgets/explorer/config/folders.js
+++ b/src/widgets/explorer/config/folders.ts
@@ -1,16 +1,22 @@
+import {
+ mdiDatabaseClockOutline,
+ mdiDatabaseOutline,
+ mdiNetworkOutline,
+} from "@mdi/js";
+
export const folders = [
{
- icon: "mdi-network",
+ icon: mdiNetworkOutline,
name: "Data Network",
key: "network",
},
{
- icon: "mdi-database",
+ icon: mdiDatabaseOutline,
name: "Data Source",
key: "datasource",
},
{
- icon: "mdi-database-clock",
+ icon: mdiDatabaseClockOutline,
name: "Data Source Release",
key: "cdm",
},
diff --git a/src/widgets/explorer/config/index.js b/src/widgets/explorer/config/index.ts
similarity index 100%
rename from src/widgets/explorer/config/index.js
rename to src/widgets/explorer/config/index.ts
diff --git a/src/widgets/explorer/config/reports.js b/src/widgets/explorer/config/reports.js
deleted file mode 100644
index 133e5d3c..00000000
--- a/src/widgets/explorer/config/reports.js
+++ /dev/null
@@ -1,183 +0,0 @@
-export const reports = [
- {
- folder: "Data Source Release",
- icon: "mdi-sigma-lower",
- name: "Data Quality",
- routeName: "dataQuality",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-chart-line",
- name: "Person",
- routeName: "person",
- },
- {
- folder: "Data Network",
- icon: "mdi-database-search",
- name: "Data Source Feasibility",
- routeName: "feasibility",
- },
- {
- folder: "Data Network",
- icon: "mdi-speedometer",
- name: "Network Performance",
- routeName: "networkPerformance",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-chart-line",
- name: "Data Density",
- routeName: "dataDensity",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-chart-line",
- name: "Observation Period",
- routeName: "observationPeriod",
- },
- {
- folder: "Data Source",
- name: "Data Quality History",
- routeName: "dataQualityHistory",
- },
- {
- folder: "Data Source",
- name: "Data Source Overview",
- routeName: "dataSourceOverview",
- },
- {
- folder: "Data Source",
- name: "Domain Continuity",
- routeName: "domainContinuity",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Conditions",
- routeName: "domainTable",
- domain: "condition_occurrence",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Condition Eras",
- routeName: "domainTable",
- domain: "condition_era",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Drugs",
- routeName: "domainTable",
- domain: "drug_exposure",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Drug Eras",
- routeName: "domainTable",
- domain: "drug_era",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Visit Occurrence",
- routeName: "domainTable",
- domain: "visit_occurrence",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Visit Detail",
- routeName: "domainTable",
- domain: "visit_detail",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Measurements",
- routeName: "domainTable",
- domain: "measurement",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Observations",
- routeName: "domainTable",
- domain: "observation",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Procedures",
- routeName: "domainTable",
- domain: "procedure_occurrence",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Device Exposures",
- routeName: "domainTable",
- domain: "device_exposure",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Death",
- routeName: "death",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Unmapped Source Codes",
- routeName: "unmappedSourceCodes",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-table",
- name: "Temporal Characterization",
- routeName: "temporalCharacterization",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-speedometer",
- name: "Performance",
- routeName: "performance",
- },
- {
- folder: "Data Source Release",
- icon: "mdi-alpha-m-circle-outline",
- name: "Metadata",
- routeName: "metadata",
- },
- {
- folder: "Data Network",
- icon: "mdi-table",
- name: "Overview",
- routeName: "overview",
- },
- {
- folder: "Data Network",
- icon: "mdi-sigma-lower",
- name: "Quality Assessment",
- routeName: "networkDataQuality",
- },
- {
- folder: "Data Network",
- icon: "mdi-chart-line",
- name: "Population Overview",
- routeName: "population",
- },
- {
- folder: "Data Network",
- icon: "mdi-dna",
- name: "Data Strand Report",
- routeName: "dataStrandReport",
- },
- {
- folder: "Data Network",
- icon: "mdi-table",
- name: "Unmapped Source Codes",
- routeName: "networkUnmappedSourceCodes",
- },
-];
diff --git a/src/widgets/explorer/config/reports.ts b/src/widgets/explorer/config/reports.ts
new file mode 100644
index 00000000..fc77db2b
--- /dev/null
+++ b/src/widgets/explorer/config/reports.ts
@@ -0,0 +1,278 @@
+import {
+ mdiAlphaMCircleOutline,
+ mdiChartLine,
+ mdiChartTimeline,
+ mdiCheckNetwork,
+ mdiDatabaseSearch,
+ mdiDna,
+ mdiShape,
+ mdiHistory,
+ mdiSigmaLower,
+ mdiSpeedometer,
+ mdiTable,
+ mdiAccountGroupOutline,
+ mdiTextBoxMultipleOutline,
+ mdiAccountOutline,
+ mdiTestTube,
+ mdiTransitConnectionVariant,
+ mdiHeartOffOutline,
+ mdiPill,
+ mdiVirusOutline,
+ mdiEyeCircleOutline,
+ mdiHospitalBuilding,
+ mdiNeedle,
+ mdiHeartFlash,
+ mdiMapMarkerOutline,
+ mdiCompareHorizontal,
+} from "@mdi/js";
+
+export const reports = [
+ {
+ folder: "Data Source Release",
+ icon: mdiSigmaLower,
+ name: "Data Quality",
+ routeName: "dataQuality",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiAccountOutline,
+ name: "Person",
+ routeName: "person",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiTable,
+ name: "Domains",
+ routeName: "domainTable",
+ domain: true,
+ reports: [
+ {
+ folder: "Data Source Release",
+ icon: mdiVirusOutline,
+ name: "Conditions",
+ routeName: "domainTable",
+ domain: "condition_occurrence",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiVirusOutline,
+ name: "Condition Eras",
+ routeName: "domainTable",
+ domain: "condition_era",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiPill,
+ name: "Drugs",
+ routeName: "domainTable",
+ domain: "drug_exposure",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiPill,
+ name: "Drug Eras",
+ routeName: "domainTable",
+ domain: "drug_era",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiHospitalBuilding,
+ name: "Visit Occurrence",
+ routeName: "domainTable",
+ domain: "visit_occurrence",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiHospitalBuilding,
+ name: "Visit Detail",
+ routeName: "domainTable",
+ domain: "visit_detail",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiTestTube,
+ name: "Measurements",
+ routeName: "domainTable",
+ domain: "measurement",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiEyeCircleOutline,
+ name: "Observations",
+ routeName: "domainTable",
+ domain: "observation",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiNeedle,
+ name: "Procedures",
+ routeName: "domainTable",
+ domain: "procedure_occurrence",
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiHeartFlash,
+ name: "Device Exposures",
+ routeName: "domainTable",
+ domain: "device_exposure",
+ },
+ ],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiAccountGroupOutline,
+ name: "Cohorts",
+ routeName: "cohorts",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiChartLine,
+ name: "Data Density",
+ routeName: "dataDensity",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiEyeCircleOutline,
+ name: "Observation Period",
+ routeName: "observationPeriod",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiMapMarkerOutline,
+ name: "Location",
+ routeName: "location",
+ reports: [],
+ },
+ {
+ folder: "Data Network",
+ icon: mdiCompareHorizontal,
+ name: "Network Comparison Tool",
+ routeName: "networkComparisonTool",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiDatabaseSearch,
+ name: "Data Source Feasibility",
+ routeName: "feasibility",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiCheckNetwork,
+ name: "Network Concept Report",
+ routeName: "networkConcept",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiDatabaseSearch,
+ name: "Network Concept Dashboard",
+ routeName: "networkConceptDashboard",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiDatabaseSearch,
+ name: "Web API",
+ routeName: "webApi",
+ webApiRequired: true,
+ },
+ {
+ folder: "Data Network",
+ icon: mdiSpeedometer,
+ name: "Network Performance",
+ routeName: "networkPerformance",
+ },
+ {
+ folder: "Data Source",
+ icon: mdiHistory,
+ name: "Data Quality History",
+ routeName: "dataQualityHistory",
+ },
+ {
+ folder: "Data Source",
+ icon: mdiTable,
+ name: "Data Source Overview",
+ routeName: "dataSourceOverview",
+ },
+ {
+ folder: "Data Source",
+ icon: mdiChartTimeline,
+ name: "Domain Continuity",
+ routeName: "domainContinuity",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiHeartOffOutline,
+ name: "Death",
+ routeName: "death",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiTransitConnectionVariant,
+ name: "Unmapped Source Codes",
+ routeName: "unmappedSourceCodes",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiAlphaMCircleOutline,
+ name: "Metadata",
+ routeName: "metadata",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiTextBoxMultipleOutline,
+ name: "Temporal Characterization",
+ routeName: "temporalCharacterization",
+ reports: [],
+ },
+ {
+ folder: "Data Source Release",
+ icon: mdiSpeedometer,
+ name: "Performance",
+ routeName: "performance",
+ reports: [],
+ },
+ {
+ folder: "Data Network",
+ icon: mdiTable,
+ name: "Overview",
+ routeName: "overview",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiSigmaLower,
+ name: "Quality Assessment",
+ routeName: "networkDataQuality",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiChartLine,
+ name: "Population Overview",
+ routeName: "population",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiShape,
+ name: "Network Diversity Report",
+ routeName: "networkDiversityReport",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiDna,
+ name: "Data Strand Report",
+ routeName: "dataStrandReport",
+ },
+ {
+ folder: "Data Network",
+ icon: mdiTable,
+ name: "Unmapped Source Codes",
+ routeName: "networkUnmappedSourceCodes",
+ },
+];
diff --git a/src/widgets/explorer/index.js b/src/widgets/explorer/index.ts
similarity index 76%
rename from src/widgets/explorer/index.js
rename to src/widgets/explorer/index.ts
index a0159c54..2ce8b774 100644
--- a/src/widgets/explorer/index.js
+++ b/src/widgets/explorer/index.ts
@@ -1,5 +1,5 @@
import explorerStore from "@/widgets/explorer/model/store/explorer.module";
-import Explorer from "@/widgets/explorer/ui/Explorer";
+import Explorer from "@/widgets/explorer/ui/Explorer.vue";
import * as explorerActions from "./model/store/actions.type";
export { explorerStore, Explorer, explorerActions };
diff --git a/src/widgets/explorer/model/store/actions.type.js b/src/widgets/explorer/model/store/actions.type.ts
similarity index 100%
rename from src/widgets/explorer/model/store/actions.type.js
rename to src/widgets/explorer/model/store/actions.type.ts
diff --git a/src/widgets/explorer/model/store/explorer.module.js b/src/widgets/explorer/model/store/explorer.module.js
deleted file mode 100644
index bf365ef0..00000000
--- a/src/widgets/explorer/model/store/explorer.module.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import {
- SOURCES,
- EXPLORER_LOADED,
- LOAD_QUERY_INDEX,
-} from "@/widgets/explorer/model/store/mutations.type";
-
-import {
- FETCH_INDEX,
- FETCH_QUERY_INDEX,
-} from "@/widgets/explorer/model/store/actions.type";
-import { EXPORT_QUERY_INDEX, INDEX } from "@/shared/config/files";
-import loadFile from "@/shared/api/loadFile";
-import getFilePath from "@/shared/api/getFilePath";
-import config from "@/widgets/explorer/config";
-import { errorActions } from "@/widgets/error";
-
-const state = {
- folders: config.folders,
- sources: null,
- reports: config.reports,
- queryIndex: null,
- dataLoaded: false,
-};
-
-const getters = {
- getQueryIndex: function (state) {
- return state.queryIndex;
- },
- getSources: function (state) {
- return state.sources;
- },
- explorerLoaded: function (state) {
- return state.dataLoaded;
- },
- getSelectedFolder: function (state, getters, rootState) {
- return state.folders.find((folder) =>
- rootState.route.matched.some((route) => route.name === folder.key)
- );
- },
- getFilteredReports: function (state, getters) {
- return state.reports.filter(
- (report) => report.folder === getters.getSelectedFolder.name
- );
- },
- getSelectedSource: function (state, getters, rootState) {
- return getters.getSources.find(
- (source) => rootState.route.params.cdm === source.cdm_source_key
- );
- },
- getReleases: function (state, getters) {
- return getters.getSelectedSource.releases;
- },
- getSelectedRelease: function (state, getters, rootState) {
- return rootState.route.params.release
- ? getters.getReleases.find(
- (release) => rootState.route.params.release === release.release_id
- )
- : getters.getReleases[0];
- },
- getSelectedReport: function (state, getters, rootState) {
- return getters.getFilteredReports.find((report) =>
- report.domain
- ? rootState.route.params.domain === report.domain
- : rootState.route.matched.some(
- (route) => route.name === report.routeName
- )
- );
- },
-};
-
-const actions = {
- [FETCH_INDEX]({ commit, dispatch }, params) {
- loadFile(getFilePath(params)[INDEX], { required: true }).then(
- (response) => {
- if (
- response.payload?.required &&
- response.response?.name === "AxiosError"
- ) {
- dispatch(errorActions.NEW_ERROR, {
- message: response.response.message,
- details: response.response.request.responseURL,
- });
- return;
- }
- commit(SOURCES, response.response.data.sources);
- commit(EXPLORER_LOADED);
- }
- );
- },
- [FETCH_QUERY_INDEX]({ commit, dispatch }, params) {
- loadFile(getFilePath(params)[EXPORT_QUERY_INDEX], { required: false }).then(
- (response) => {
- if (
- response.payload?.required &&
- response.response?.name === "AxiosError"
- ) {
- dispatch(errorActions.NEW_ERROR, {
- message: response.response.message,
- details: response.response.request.responseURL,
- });
- return;
- }
- commit(LOAD_QUERY_INDEX, response.response.data);
- }
- );
- },
-};
-
-const mutations = {
- [SOURCES](state, payload) {
- state.sources = payload;
- },
- [EXPLORER_LOADED](state) {
- state.dataLoaded = true;
- },
- [LOAD_QUERY_INDEX](state, payload) {
- state.queryIndex = payload;
- },
-};
-
-export default {
- state,
- getters,
- actions,
- mutations,
-};
diff --git a/src/widgets/explorer/model/store/explorer.module.ts b/src/widgets/explorer/model/store/explorer.module.ts
new file mode 100644
index 00000000..6909af11
--- /dev/null
+++ b/src/widgets/explorer/model/store/explorer.module.ts
@@ -0,0 +1,145 @@
+import {
+ SOURCES,
+ EXPLORER_LOADED,
+ LOAD_QUERY_INDEX,
+} from "@/widgets/explorer/model/store/mutations.type";
+
+import {
+ FETCH_INDEX,
+ FETCH_QUERY_INDEX,
+} from "@/widgets/explorer/model/store/actions.type";
+import { EXPORT_QUERY_INDEX, INDEX } from "@/shared/config/files";
+import apiService from "@/shared/api/axios/apiService";
+import getFilePath from "@/shared/api/axios/files";
+import config from "@/widgets/explorer/config";
+import { errorActions } from "@/widgets/error";
+import { QueryIndexType } from "@/processes/exploreReports/model/interfaces/files/QueryIndex";
+import {
+ Source,
+ SourceRelease,
+} from "@/processes/exploreReports/model/interfaces/files/SourceIndex";
+import errorMessages from "@/widgets/error/model/config/errorMessages";
+import environment from "@/shared/api/environment";
+
+const state = {
+ folders: config.folders,
+ sources: null,
+ reports: config.reports,
+ queryIndex: null,
+ dataLoaded: false,
+};
+
+const getters = {
+ getQueryIndex: function (state): QueryIndexType {
+ return state.queryIndex;
+ },
+ getSources: function (state): Source[] {
+ return state.sources;
+ },
+ explorerLoaded: function (state): boolean {
+ return state.dataLoaded;
+ },
+ getSelectedFolder: function (state, getters, rootState) {
+ return state.folders.find((folder) =>
+ rootState.route.matched.some((route) => route.name === folder.key)
+ );
+ },
+ getFilteredReports: function (state, getters, rootState) {
+ const webApiEnabled = environment.WEB_API_ENABLED;
+ return state.reports.filter((report) => {
+ const folderMatch = report.folder === getters.getSelectedFolder.name;
+ const webApiCondition = webApiEnabled || !report.webApiRequired;
+ return folderMatch && webApiCondition;
+ });
+ },
+ getSelectedSource: function (state, getters, rootState): Source {
+ return getters.getSources.find(
+ (source) => rootState.route.params.cdm === source.cdm_source_key
+ );
+ },
+ getReleases: function (state, getters): SourceRelease[] {
+ return getters.getSelectedSource.releases;
+ },
+ getSelectedRelease: function (state, getters, rootState): SourceRelease {
+ return rootState.route.params.release
+ ? getters.getReleases.find(
+ (release) => rootState.route.params.release === release.release_id
+ )
+ : getters.getReleases[0];
+ },
+ getSelectedReport: function (state, getters, rootState) {
+ const isDomain = rootState.route.params.domain;
+ const isRelease = rootState.route.params.release;
+ const isCohort = rootState.route.params.cohort_id;
+ if (
+ isDomain &&
+ isRelease &&
+ rootState.route.name !== "networkComparisonTool"
+ ) {
+ const domainTable = getters.getFilteredReports.find(
+ (report) => report.domain
+ );
+ return domainTable.reports.find((report) => {
+ return isDomain === report.domain;
+ });
+ }
+ if (isCohort) {
+ return getters.getFilteredReports.find((report) => {
+ return report.routeName === "cohorts";
+ });
+ } else {
+ return getters.getFilteredReports.find((report) => {
+ return rootState.route.matched.some(
+ (route) => route.name === report.routeName
+ );
+ });
+ }
+ },
+};
+
+const actions = {
+ [FETCH_INDEX]({ commit, dispatch }, params) {
+ return apiService(getFilePath(params)[INDEX], { required: true })
+ .then((response) => {
+ commit(SOURCES, response.data.sources);
+ commit(EXPLORER_LOADED);
+ })
+ .catch((error) => {
+ const errorMessage = errorMessages.reportsMissingFiles.index;
+ const url = error.config.url;
+ const errorCode = error.response.status;
+
+ dispatch(errorActions.NEW_ERROR, {
+ userMessage: errorMessage,
+ technicalMessage: { errorCode, url },
+ details: url,
+ });
+ });
+ },
+ [FETCH_QUERY_INDEX]({ commit, dispatch }, params) {
+ return apiService(getFilePath(params)[EXPORT_QUERY_INDEX], {
+ required: false,
+ }).then((response) => {
+ commit(LOAD_QUERY_INDEX, response.data);
+ });
+ },
+};
+
+const mutations = {
+ [SOURCES](state, payload) {
+ state.sources = payload;
+ },
+ [EXPLORER_LOADED](state) {
+ state.dataLoaded = true;
+ },
+ [LOAD_QUERY_INDEX](state, payload) {
+ state.queryIndex = payload;
+ },
+};
+
+export default {
+ state,
+ getters,
+ actions,
+ mutations,
+};
diff --git a/src/widgets/explorer/model/store/mutations.type.js b/src/widgets/explorer/model/store/mutations.type.ts
similarity index 100%
rename from src/widgets/explorer/model/store/mutations.type.js
rename to src/widgets/explorer/model/store/mutations.type.ts
diff --git a/src/widgets/explorer/ui/Explorer.vue b/src/widgets/explorer/ui/Explorer.vue
index 5789d2cd..1aa22f03 100644
--- a/src/widgets/explorer/ui/Explorer.vue
+++ b/src/widgets/explorer/ui/Explorer.vue
@@ -1,185 +1,221 @@
-
-
-
-
-
-
-
+
+
+
+
+
-
- {{ item.icon }} {{ item.name }}
+
+
+
+
{{ slotProps.option.name }}
+
-
-
-
-
-
-
-
-
+ Report category
-
- {{ item.icon }} {{ item.name }}
+
+
+
+
+
+ Source
+
+
+
+
+
+ Release
+
+
+
+
+
+
+
{{ slotProps.option.name }}
+
-
-
-
-
-
+
+ Report
+
+
+ Concept ID
+
+
+ Cohort ID
+
+
-
-
diff --git a/src/widgets/infoPanel/index.js b/src/widgets/infoPanel/index.js
deleted file mode 100644
index 2aac77e2..00000000
--- a/src/widgets/infoPanel/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import InfoPanel from "@/widgets/infoPanel/ui/InfoPanel";
-
-export default InfoPanel;
diff --git a/src/widgets/infoPanel/index.ts b/src/widgets/infoPanel/index.ts
new file mode 100644
index 00000000..c28bf107
--- /dev/null
+++ b/src/widgets/infoPanel/index.ts
@@ -0,0 +1,2 @@
+import InfoPanel from "./infoPanel.vue";
+export default InfoPanel;
diff --git a/src/widgets/infoPanel/infoPanel.vue b/src/widgets/infoPanel/infoPanel.vue
new file mode 100644
index 00000000..3a67988e
--- /dev/null
+++ b/src/widgets/infoPanel/infoPanel.vue
@@ -0,0 +1,212 @@
+
+
+
+
+
+
Concept Identifier
+
+
+
+
+
+
Number of People
+
+
+
+
+
+
Records per Person
+
+
+
+
+
% with Values
+
+
+
+
+
Records Per Person
+
+
+
+
+
+ Non-Stationary Time Series
+
+
+
+
+
+
+
+ Number of People in Network
+
+
+
+
+
+
+
diff --git a/src/widgets/infoPanel/ui/InfoPanel.vue b/src/widgets/infoPanel/ui/InfoPanel.vue
deleted file mode 100644
index dc2619e7..00000000
--- a/src/widgets/infoPanel/ui/InfoPanel.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
- {{ icon }}
- {{ details }}
-
- Click here to learn more
- mdi-open-in-new
- {{ details }}
- mdi-open-in-new
-
-
- Click here to learn more
- mdi-open-in-new
- {{ details }}
- mdi-open-in-new
-
-
-
-
-
-
-
-
diff --git a/src/widgets/notesPanel/index.ts b/src/widgets/notesPanel/index.ts
new file mode 100755
index 00000000..e69de29b
diff --git a/src/widgets/notesPanel/model/lib/helpers.ts b/src/widgets/notesPanel/model/lib/helpers.ts
new file mode 100644
index 00000000..53561b5d
--- /dev/null
+++ b/src/widgets/notesPanel/model/lib/helpers.ts
@@ -0,0 +1,117 @@
+export function mergeAndCompareByDate(obj1, obj2) {
+ const mergedObject = {};
+
+ // Merge obj1 into mergedObject
+ Object.keys(obj1).forEach((key) => {
+ if (obj2.hasOwnProperty(key)) {
+ const arr1 = obj1[key];
+ const arr2 = obj2[key];
+ mergedObject[key] = mergeArraysByDate(arr1, arr2);
+ } else {
+ mergedObject[key] = obj1[key];
+ }
+ });
+
+ // Merge obj2 into mergedObject
+ Object.keys(obj2).forEach((key) => {
+ if (!mergedObject.hasOwnProperty(key)) {
+ mergedObject[key] = obj2[key];
+ }
+ });
+
+ return mergedObject;
+}
+
+function mergeArraysByDate(arr1, arr2) {
+ const mergedArray = [...arr1];
+
+ arr2.forEach((obj2) => {
+ const existingObjIndex = arr1.findIndex((obj1) => obj1.id === obj2.id);
+
+ if (existingObjIndex === -1) {
+ mergedArray.push(obj2);
+ } else {
+ const date1 = new Date(mergedArray[existingObjIndex].metadata.updatedAt);
+ const date2 = new Date(obj2.metadata.updatedAt);
+
+ if (date2 > date1) {
+ mergedArray[existingObjIndex] = obj2;
+ }
+ }
+ });
+
+ return mergedArray;
+}
+
+export function mergeObjects(obj1, obj2, identifier = "id") {
+ if (typeof obj1 !== "object" || typeof obj2 !== "object") {
+ throw new Error("Both arguments must be objects");
+ }
+
+ const mergedObject = { ...obj1 };
+
+ for (const key in obj2) {
+ if (obj2.hasOwnProperty(key)) {
+ if (!mergedObject.hasOwnProperty(key)) {
+ mergedObject[key] = obj2[key];
+ } else if (Array.isArray(obj1[key]) && Array.isArray(obj2[key])) {
+ const mergedArray = mergeArraysOfObjects(
+ obj1[key],
+ obj2[key],
+ identifier
+ );
+ mergedObject[key] = mergedArray;
+ }
+ }
+ }
+
+ return mergedObject;
+}
+
+function mergeArraysOfObjects(arr1, arr2, identifier) {
+ const mergedArray = [];
+
+ const uniqueIds = new Set();
+
+ arr1.forEach((item1) => {
+ const matchingItem = arr2.find(
+ (item2) => item1[identifier] === item2[identifier]
+ );
+
+ if (matchingItem) {
+ const mergedItem = mergeObjects(item1, matchingItem, identifier);
+ mergedArray.push(mergedItem);
+ uniqueIds.add(item1[identifier]);
+ uniqueIds.add(matchingItem[identifier]);
+ } else if (!uniqueIds.has(item1[identifier])) {
+ mergedArray.push(item1);
+ uniqueIds.add(item1[identifier]);
+ }
+ });
+
+ arr2.forEach((item2) => {
+ if (!uniqueIds.has(item2[identifier])) {
+ mergedArray.push(item2);
+ uniqueIds.add(item2[identifier]);
+ }
+ });
+
+ return mergedArray;
+}
+
+export const createNestedProperty = (obj, path) => {
+ const newObj = { ...obj };
+ let currentObj = newObj;
+
+ for (let i = 0; i < path.length; i++) {
+ if (i + 1 !== path.length) {
+ currentObj[path[i]] = currentObj[path[i]] || {};
+ currentObj = currentObj[path[i]];
+ } else {
+ currentObj[path[i]] = currentObj[path[i]] || [];
+ currentObj = currentObj[path[i]];
+ }
+ }
+
+ return newObj;
+};
diff --git a/src/widgets/notesPanel/model/store/actions.type.ts b/src/widgets/notesPanel/model/store/actions.type.ts
new file mode 100755
index 00000000..3eb19c24
--- /dev/null
+++ b/src/widgets/notesPanel/model/store/actions.type.ts
@@ -0,0 +1,12 @@
+export const SHOW_DIALOG = "showDialog";
+export const LOAD_NOTES = "loadNotes";
+
+export const SHOW_DATUM_NOTES = "showDatumNotes";
+
+export const DELETE_SELECTION = "deleteSelection";
+
+export const EDIT_SELECTION = "editSelection";
+
+export const CREATE_SELECTION = "createSelection";
+
+export const EXPORT_NOTES = "exportNotes";
diff --git a/src/widgets/notesPanel/model/store/mutations.type.ts b/src/widgets/notesPanel/model/store/mutations.type.ts
new file mode 100755
index 00000000..ec126cd7
--- /dev/null
+++ b/src/widgets/notesPanel/model/store/mutations.type.ts
@@ -0,0 +1,4 @@
+export const SET_NOTES = "setNewNotes";
+
+export const SET_DIALOG = "setShowDialog";
+export const SET_SELECTED_RECTANGLE = "setSelectedRectangle";
diff --git a/src/widgets/notesPanel/model/store/notes.module.ts b/src/widgets/notesPanel/model/store/notes.module.ts
new file mode 100755
index 00000000..e29ce712
--- /dev/null
+++ b/src/widgets/notesPanel/model/store/notes.module.ts
@@ -0,0 +1,213 @@
+import localStorageService from "@/shared/api/localStorageService";
+import {
+ CREATE_SELECTION,
+ DELETE_SELECTION,
+ EDIT_SELECTION,
+ EXPORT_NOTES,
+ LOAD_NOTES,
+ SHOW_DATUM_NOTES,
+ SHOW_DIALOG,
+} from "@/widgets/notesPanel/model/store/actions.type";
+import _ from "lodash";
+import {
+ createNestedProperty,
+ mergeAndCompareByDate,
+ mergeObjects,
+} from "@/widgets/notesPanel/model/lib/helpers";
+
+import {
+ SET_NOTES,
+ SET_SELECTED_RECTANGLE,
+ SET_DIALOG,
+} from "@/widgets/notesPanel/model/store/mutations.type";
+import apiService from "@/shared/api/axios/apiService";
+import getFilePath from "@/shared/api/axios/files";
+import { NOTES } from "@/shared/config/files";
+import JSZip from "jszip";
+import { saveAs } from "file-saver";
+
+const state = {
+ notes: {},
+ dialog: { show: false, data: {}, action: null, coordinates: null },
+ selectedRectangle: null,
+};
+
+const getters = {
+ getNotes: function (state) {
+ return state.notes;
+ },
+ getDialogData: function (state) {
+ return state.dialog;
+ },
+ getSelectedRectangle: function (state) {
+ return state.selectedRectangle;
+ },
+};
+
+const actions = {
+ async [LOAD_NOTES]({ commit, rootGetters }) {
+ const sources = [...rootGetters.getSources, { cdm_source_key: undefined }];
+ await Promise.allSettled(
+ sources.map((source) =>
+ apiService(
+ {
+ url: getFilePath({
+ cdm: source.cdm_source_key,
+ })[NOTES],
+ method: "get",
+ },
+ { source }
+ )
+ )
+ ).then((responses) => {
+ const loadedData = responses.reduce((object, response) => {
+ if (response.status === "fulfilled") {
+ return mergeObjects(object, response.value.data, "id");
+ }
+ return object;
+ }, {});
+ const notes = localStorageService.get("notes")
+ ? mergeAndCompareByDate(localStorageService.get("notes"), loadedData)
+ : loadedData;
+
+ commit(SET_NOTES, { data: notes });
+ localStorageService.set("notes", notes);
+ });
+ },
+
+ [EXPORT_NOTES]({ getters }) {
+ const allNotes = getters.getNotes;
+ const zip = new JSZip();
+ const sources = {};
+ const network = {};
+ for (const report in allNotes) {
+ allNotes[report].forEach((annotation) => {
+ const annotationSource = annotation.metadata.scope.value.source;
+ if (annotationSource) {
+ annotationSource.forEach((source) => {
+ sources[source] = sources[source]
+ ? {
+ ...sources[source],
+ [report]: sources[source][report]
+ ? [...sources[source][report], annotation]
+ : [annotation],
+ }
+ : { [report]: [annotation] };
+ });
+ } else {
+ network[report] = network[report]
+ ? [...network[report], annotation]
+ : [annotation];
+ }
+ });
+ }
+ for (const source in sources) {
+ const sourceContainer = new Blob([JSON.stringify(sources[source])], {
+ type: "application/json",
+ });
+ zip.folder(source).file("notes.json", sourceContainer);
+ }
+ const networkContainer = new Blob([JSON.stringify(network)], {
+ type: "application/json",
+ });
+ zip.folder("network").file("notes.json", networkContainer);
+
+ zip
+ .generateAsync({
+ type: "blob",
+ compression: "DEFLATE",
+ compressionOptions: {
+ level: 6,
+ },
+ })
+ .then(function (content) {
+ // see FileSaver.js
+ saveAs(content, "notes.zip");
+ });
+ },
+
+ [CREATE_SELECTION]({ commit, getters, rootState }, params) {
+ const chartName = params.reportName;
+
+ let data = { ...getters.getNotes };
+ const path = [chartName].filter(Boolean);
+ data = createNestedProperty(data, path);
+ _.get(data, path.join(".")).push(params.selection);
+ commit(SET_NOTES, { data });
+ commit(SET_SELECTED_RECTANGLE, null);
+ localStorageService.set("notes", getters.getNotes);
+ },
+
+ [EDIT_SELECTION]({ commit, state, getters, rootState }, params) {
+ const chartName = getters.getSelectedRectangle?.report || params.report;
+ const selectionId =
+ getters.getSelectedRectangle?.item?.id || params.data.id;
+
+ const data = _.cloneDeep(state.notes);
+ const path = [chartName].filter(Boolean);
+ const selections = [..._.get(data, path.join("."))];
+ let newSelections = [];
+ const selectionIndex = selections.findIndex(
+ (selection) => selection.id === selectionId
+ );
+ if (selectionIndex !== -1) {
+ newSelections = selections.map((selection, index) => {
+ if (index === selectionIndex) {
+ return params.data;
+ } else {
+ return selection;
+ }
+ });
+ }
+ _.set(data, path.join("."), newSelections);
+ commit(SET_SELECTED_RECTANGLE, null);
+ commit(SET_NOTES, { data });
+ localStorageService.set("notes", state.notes);
+ },
+
+ [DELETE_SELECTION]({ commit, getters, rootState }) {
+ const chartName = getters.getSelectedRectangle.report;
+ const selectionId = getters.getSelectedRectangle.item.id;
+
+ const data = { ...getters.getNotes };
+ const path = [chartName].filter(Boolean);
+ const selections = _.get(data, path.join(".")).filter(
+ (selection) => selection.id !== selectionId
+ );
+
+ _.set(data, path.join("."), selections);
+ commit(SET_SELECTED_RECTANGLE, null);
+ commit(SET_NOTES, { data });
+ localStorageService.set("notes", getters.getNotes);
+ },
+ [SHOW_DIALOG]({ commit }, params) {
+ commit(SET_DIALOG, {
+ show: params.show,
+ data: params.data,
+ coordinates: params.coordinates,
+ action: params.action,
+ });
+ },
+ [SHOW_DATUM_NOTES]({ commit }) {
+ commit(SET_SELECTED_RECTANGLE, null);
+ },
+};
+
+const mutations = {
+ [SET_NOTES](state, payload) {
+ state.notes = payload.data;
+ },
+ [SET_DIALOG](state, payload) {
+ state.dialog = payload;
+ },
+ [SET_SELECTED_RECTANGLE](state, payload) {
+ state.selectedRectangle = payload;
+ },
+};
+
+export default {
+ state,
+ getters,
+ actions,
+ mutations,
+};
diff --git a/src/widgets/notesPanel/ui/NotesPanel.vue b/src/widgets/notesPanel/ui/NotesPanel.vue
new file mode 100755
index 00000000..aff59010
--- /dev/null
+++ b/src/widgets/notesPanel/ui/NotesPanel.vue
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/widgets/pivot/index.js b/src/widgets/pivot/index.js
deleted file mode 100644
index 9c88f547..00000000
--- a/src/widgets/pivot/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Pivot from "@/widgets/pivot/ui/Pivot";
-
-export default Pivot;
diff --git a/src/widgets/pivot/index.ts b/src/widgets/pivot/index.ts
new file mode 100644
index 00000000..689a4c46
--- /dev/null
+++ b/src/widgets/pivot/index.ts
@@ -0,0 +1,3 @@
+import Pivot from "@/widgets/pivot/ui/Pivot.vue";
+
+export default Pivot;
diff --git a/src/widgets/pivot/ui/Pivot.vue b/src/widgets/pivot/ui/Pivot.vue
index 383c5f40..74ebd487 100644
--- a/src/widgets/pivot/ui/Pivot.vue
+++ b/src/widgets/pivot/ui/Pivot.vue
@@ -1,332 +1,391 @@
-
-
-
-
- mdi-table
- Table
-
-
- mdi-database-cog
- Result manipulation
-
+
+
+
+
+
+
+ Table
+
+
+
+
+
+ Row Attributes
+
+
+
-
-
-
-
-
- mdi-plus-box filter
-
-
-
-
-
- {{ item }}
-
-
- mdi-close
-
-
-
- Select attributes to display
-
-
-
-
-
-
-
- mdi-plus-box
-
-
-
-
-
-
- {{ item }}
-
-
- mdi-close
-
+
+
+
+
{{ element }}
+
+
+
+
+
+
+
+ Select attributes to display
+
+
-
- Select attributes to display
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- {{ item }} ({{
- selectedFilterValues[item]
- ? Object.keys(selectedFilterValues[item]).length
- : 0
- }})
-
-
+ Column Attributes
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
{{ element }}
+
+
+
+
+
+
+
+ Select attributes to display
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Settings
+
+
+
+
+
+
+ {{ aggregateValue[0] }}
+
+
+
+
+
+
Choose at least one attribute to display the results
+
+
+
-
-
-
+
+
+
+
+ Choose at least one attribute to display the results
+
+
+
+
+
+
+
+
+
Selection
+
+
+
Scope
+
+
+
+
+
Notes
+
+
+
+ Add new note
+
+
+
+
+
+
+
+
+
+ CANCEL
+ SAVE
+
+
+
+
+
+
+
diff --git a/src/widgets/settings/index.js b/src/widgets/settings/index.ts
similarity index 76%
rename from src/widgets/settings/index.js
rename to src/widgets/settings/index.ts
index c5ebae93..c86fae0d 100644
--- a/src/widgets/settings/index.js
+++ b/src/widgets/settings/index.ts
@@ -1,4 +1,4 @@
-import Settings from "@/widgets/settings/ui/Settings";
+import Settings from "@/widgets/settings/ui/Settings.vue";
import settingsStore from "@/widgets/settings/model/store/settings.module";
import * as settingsActions from "./model/store/actions.type";
diff --git a/src/widgets/settings/model/store/actions.type.js b/src/widgets/settings/model/store/actions.type.js
deleted file mode 100644
index 4c438a9a..00000000
--- a/src/widgets/settings/model/store/actions.type.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const LOAD_SETTINGS_FROM_STORAGE = "loadSettingsFromStorage";
-export const CHANGE_THEME_SETTING = "setDarkMode";
-export const CHANGE_BASELINE_SETTING = "setBaseline";
-export const CHANGE_MINMAX_SETTING = "setMinMax";
-export const CHANGE_UI_VISIBILITY = "setVisibility";
diff --git a/src/widgets/settings/model/store/actions.type.ts b/src/widgets/settings/model/store/actions.type.ts
new file mode 100644
index 00000000..80618cae
--- /dev/null
+++ b/src/widgets/settings/model/store/actions.type.ts
@@ -0,0 +1,11 @@
+export const LOAD_SETTINGS_FROM_STORAGE = "loadSettingsFromStorage";
+export const TOGGLE_THEME_SETTING = "setTheme";
+export const TOGGLE_DARK_MODE = "toggleDarkMode";
+export const TOGGLE_BASELINE_SETTING = "setBaseline";
+export const TOGGLE_MINMAX_SETTING = "setMinMax";
+export const TOGGLE_UI_VISIBILITY = "setVisibility";
+export const TOGGLE_DEFAULT_ANNOTATIONS_MODE = "changeDefaultAnnotationsMode";
+export const TOGGLE_DEFAULT_ALL_NOTES_MODE = "toggleDefaultNotesMode";
+export const EDIT_USER = "editUser";
+export const UPDATE_COLUMN_SELECTION = "updateColumnSelection";
+export const TOGGLE_STICKY_NAV_BAR = "toggleStickyNavBar";
diff --git a/src/widgets/settings/model/store/mutations.type.js b/src/widgets/settings/model/store/mutations.type.js
deleted file mode 100644
index 14ef15b9..00000000
--- a/src/widgets/settings/model/store/mutations.type.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const SET_DARK_MODE = "setDarkMode";
-export const SET_BASELINE = "setBaseline";
-export const SET_SETTINGS = "setSettings";
-export const SET_MINMAX = "setMinMax";
-export const SET_VISIBILITY = "setVisibility";
diff --git a/src/widgets/settings/model/store/mutations.type.ts b/src/widgets/settings/model/store/mutations.type.ts
new file mode 100644
index 00000000..0e0ef49b
--- /dev/null
+++ b/src/widgets/settings/model/store/mutations.type.ts
@@ -0,0 +1,2 @@
+export const SET_SETTINGS = "setSettings";
+export const SET_VISIBILITY = "setVisibility";
diff --git a/src/widgets/settings/model/store/settings.module.js b/src/widgets/settings/model/store/settings.module.js
deleted file mode 100644
index 1b1f6b05..00000000
--- a/src/widgets/settings/model/store/settings.module.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import localStorageService from "@/shared/api/localStorageService";
-import {
- LOAD_SETTINGS_FROM_STORAGE,
- CHANGE_BASELINE_SETTING,
- CHANGE_MINMAX_SETTING,
- CHANGE_THEME_SETTING,
- CHANGE_UI_VISIBILITY,
-} from "@/widgets/settings/model/store/actions.type";
-import {
- SET_BASELINE,
- SET_DARK_MODE,
- SET_MINMAX,
- SET_SETTINGS,
- SET_VISIBILITY,
-} from "@/widgets/settings/model/store/mutations.type";
-
-const state = {
- settings: {
- darkMode: false,
- zeroBaseline: true,
- minMax: false,
- },
- visible: false,
-};
-
-const getters = {
- getSettings: function (state) {
- return state.settings;
- },
- getVisibility: function (state) {
- return state.visible;
- },
-};
-
-const actions = {
- [LOAD_SETTINGS_FROM_STORAGE]({ commit }) {
- if (localStorageService.get("settings")) {
- commit(SET_SETTINGS, localStorageService.get("settings"));
- }
- },
- [CHANGE_BASELINE_SETTING]({ commit }, payload) {
- commit(SET_BASELINE, payload);
- },
- [CHANGE_THEME_SETTING]({ commit }, payload) {
- commit(SET_DARK_MODE, payload);
- },
- [CHANGE_MINMAX_SETTING]({ commit }, payload) {
- commit(SET_MINMAX, payload);
- },
- [CHANGE_UI_VISIBILITY]({ commit }, payload) {
- commit(SET_VISIBILITY, payload);
- },
-};
-
-const mutations = {
- [SET_DARK_MODE](state, payload) {
- state.settings.darkMode = payload;
- localStorageService.set("settings", state.settings);
- },
- [SET_BASELINE](state, payload) {
- state.settings.zeroBaseline = payload;
- localStorageService.set("settings", state.settings);
- },
- [SET_MINMAX](state, payload) {
- state.settings.minMax = payload;
- localStorageService.set("settings", state.settings);
- },
- [SET_SETTINGS](state, payload) {
- state.settings = payload;
- },
- [SET_VISIBILITY](state, payload) {
- state.visible = payload;
- },
-};
-
-export default {
- state,
- getters,
- actions,
- mutations,
-};
diff --git a/src/widgets/settings/model/store/settings.module.ts b/src/widgets/settings/model/store/settings.module.ts
new file mode 100644
index 00000000..9b6e69fe
--- /dev/null
+++ b/src/widgets/settings/model/store/settings.module.ts
@@ -0,0 +1,104 @@
+import localStorageService from "@/shared/api/localStorageService";
+import {
+ LOAD_SETTINGS_FROM_STORAGE,
+ TOGGLE_DARK_MODE,
+ TOGGLE_THEME_SETTING,
+ TOGGLE_MINMAX_SETTING,
+ TOGGLE_UI_VISIBILITY,
+ TOGGLE_DEFAULT_ANNOTATIONS_MODE,
+ TOGGLE_BASELINE_SETTING,
+ EDIT_USER,
+ TOGGLE_DEFAULT_ALL_NOTES_MODE,
+ UPDATE_COLUMN_SELECTION,
+ TOGGLE_STICKY_NAV_BAR,
+} from "@/widgets/settings/model/store/actions.type";
+import {
+ SET_SETTINGS,
+ SET_VISIBILITY,
+} from "@/widgets/settings/model/store/mutations.type";
+
+const state = {
+ settings: {
+ darkMode: false,
+ zeroBaseline: true,
+ minMax: false,
+ theme: "blue",
+ annotationsMode: false,
+ notesMode: false,
+ user: null,
+ columnSelection: {},
+ stickyNavBar: true,
+ },
+ visible: false,
+};
+
+const getters = {
+ getSettings: function (state) {
+ return state.settings;
+ },
+ getVisibility: function (state): boolean {
+ return state.visible;
+ },
+};
+
+const actions = {
+ [LOAD_SETTINGS_FROM_STORAGE]({ commit }) {
+ if (localStorageService.get("settings")) {
+ commit(SET_SETTINGS, { data: localStorageService.get("settings") });
+ }
+ },
+ [TOGGLE_BASELINE_SETTING]({ commit }, payload) {
+ commit(SET_SETTINGS, { data: payload, field: "zeroBaseline" });
+ },
+ [TOGGLE_DARK_MODE]({ commit }, payload) {
+ commit(SET_SETTINGS, { data: payload, field: "darkMode" });
+ },
+ [TOGGLE_THEME_SETTING]({ commit }, payload) {
+ commit(SET_SETTINGS, { data: payload, field: "theme" });
+ },
+ [TOGGLE_MINMAX_SETTING]({ commit }, payload) {
+ commit(SET_SETTINGS, { data: payload, field: "minMax" });
+ },
+ [TOGGLE_UI_VISIBILITY]({ commit }, payload) {
+ commit(SET_VISIBILITY, payload);
+ },
+ [TOGGLE_DEFAULT_ANNOTATIONS_MODE]({ commit }, payload) {
+ commit(SET_SETTINGS, { data: payload, field: "annotationsMode" });
+ },
+ [TOGGLE_DEFAULT_ALL_NOTES_MODE]({ commit }, payload) {
+ commit(SET_SETTINGS, { data: payload, field: "notesMode" });
+ },
+ [TOGGLE_STICKY_NAV_BAR]({ commit }, payload) {
+ commit(SET_SETTINGS, { data: payload, field: "stickyNavBar" });
+ },
+ [UPDATE_COLUMN_SELECTION]({ commit, rootGetters }, payload) {
+ commit(SET_SETTINGS, {
+ data: { ...rootGetters.getSettings.columnSelection, ...payload },
+ field: "columnSelection",
+ });
+ },
+ [EDIT_USER]({ commit }, payload) {
+ commit(SET_SETTINGS, { data: payload, field: "user" });
+ },
+};
+
+const mutations = {
+ [SET_SETTINGS](state, payload) {
+ if (payload.field) {
+ state.settings = { ...state.settings, [payload.field]: payload.data };
+ } else {
+ state.settings = payload.data;
+ }
+ localStorageService.set("settings", state.settings);
+ },
+ [SET_VISIBILITY](state, payload) {
+ state.visible = payload;
+ },
+};
+
+export default {
+ state,
+ getters,
+ actions,
+ mutations,
+};
diff --git a/src/widgets/settings/ui/Settings.vue b/src/widgets/settings/ui/Settings.vue
old mode 100644
new mode 100755
index b6ed05cc..1ade2f4a
--- a/src/widgets/settings/ui/Settings.vue
+++ b/src/widgets/settings/ui/Settings.vue
@@ -1,53 +1,78 @@
-
-
-
-
-
- mdi-close
-
- Settings
-
-
- Charts
-
+
+
+
+
Settings
+
+
+
+
+
+
+
Charts
- General
-
+
+
+
+
+
Appearance
+
-
+
+
diff --git a/src/widgets/settings/ui/components/exportNotes/ExportNotes.vue b/src/widgets/settings/ui/components/exportNotes/ExportNotes.vue
new file mode 100755
index 00000000..bf8e089e
--- /dev/null
+++ b/src/widgets/settings/ui/components/exportNotes/ExportNotes.vue
@@ -0,0 +1,19 @@
+
+
+ Export Notes
+
+
+
+
+
+
diff --git a/src/widgets/settings/ui/components/stickyNavBar/StickyNavBar.vue b/src/widgets/settings/ui/components/stickyNavBar/StickyNavBar.vue
new file mode 100644
index 00000000..15ba3ea1
--- /dev/null
+++ b/src/widgets/settings/ui/components/stickyNavBar/StickyNavBar.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
Sticky navigation bar
+
+ Keep the navigation bar fixed at the top while scrolling
+
+
+
+
+
+
+
+
+
diff --git a/src/widgets/settings/ui/components/stickyNavBar/index.ts b/src/widgets/settings/ui/components/stickyNavBar/index.ts
new file mode 100644
index 00000000..d40fd4d2
--- /dev/null
+++ b/src/widgets/settings/ui/components/stickyNavBar/index.ts
@@ -0,0 +1,2 @@
+import StickyNavBar from "@/widgets/settings/ui/components/stickyNavBar/StickyNavBar.vue";
+export default StickyNavBar;
diff --git a/src/widgets/settings/ui/components/toggleBaseLine/ToggleBaseLine.vue b/src/widgets/settings/ui/components/toggleBaseLine/ToggleBaseLine.vue
new file mode 100644
index 00000000..ff73269e
--- /dev/null
+++ b/src/widgets/settings/ui/components/toggleBaseLine/ToggleBaseLine.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+ {{ zeroBaseLine ? "Zero Baseline" : "Non-zero baseline" }}
+
+
+ Determines whether the axis starts from the 0 or the lowest value in the
+ set
+
+
+
+
+
+
+
+
+
diff --git a/src/widgets/settings/ui/components/toggleBaseLine/index.ts b/src/widgets/settings/ui/components/toggleBaseLine/index.ts
new file mode 100644
index 00000000..86932225
--- /dev/null
+++ b/src/widgets/settings/ui/components/toggleBaseLine/index.ts
@@ -0,0 +1,3 @@
+import ToggleBaseLine from "./ToggleBaseLine.vue";
+
+export default ToggleBaseLine;
diff --git a/src/widgets/settings/ui/components/toggleDarkMode/ToggleDarkMode.vue b/src/widgets/settings/ui/components/toggleDarkMode/ToggleDarkMode.vue
new file mode 100644
index 00000000..50e92a9b
--- /dev/null
+++ b/src/widgets/settings/ui/components/toggleDarkMode/ToggleDarkMode.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+ {{ darkMode ? "Dark Mode" : "Light mode" }}
+
+
Select the Color mode
+
+
+
+
+
+
+
+
diff --git a/src/widgets/settings/ui/components/toggleDarkMode/index.ts b/src/widgets/settings/ui/components/toggleDarkMode/index.ts
new file mode 100644
index 00000000..2c4834aa
--- /dev/null
+++ b/src/widgets/settings/ui/components/toggleDarkMode/index.ts
@@ -0,0 +1,3 @@
+import ToggleDarkMode from "./ToggleDarkMode.vue";
+
+export default ToggleDarkMode;
diff --git a/src/widgets/settings/ui/components/toggleDefaultAnnotationsMode/ToggleDefaultAnnotatonsMode.vue b/src/widgets/settings/ui/components/toggleDefaultAnnotationsMode/ToggleDefaultAnnotatonsMode.vue
new file mode 100644
index 00000000..fc43eccd
--- /dev/null
+++ b/src/widgets/settings/ui/components/toggleDefaultAnnotationsMode/ToggleDefaultAnnotatonsMode.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
{{ annotationsMode ? "On" : "Off" }}
+
Switch default annotations mode
+
+
+
+
+
+
diff --git a/src/widgets/settings/ui/components/toggleDefaultNotesMode/ToggleDefaultNotesMode.vue b/src/widgets/settings/ui/components/toggleDefaultNotesMode/ToggleDefaultNotesMode.vue
new file mode 100644
index 00000000..aeffef00
--- /dev/null
+++ b/src/widgets/settings/ui/components/toggleDefaultNotesMode/ToggleDefaultNotesMode.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
{{ notesMode ? "On" : "Off" }}
+
Switch default notes mode
+
+
+
+
+
+
diff --git a/src/widgets/settings/ui/components/toggleMinMax/ToggleMinMax.vue b/src/widgets/settings/ui/components/toggleMinMax/ToggleMinMax.vue
new file mode 100644
index 00000000..18388988
--- /dev/null
+++ b/src/widgets/settings/ui/components/toggleMinMax/ToggleMinMax.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
{{ minMax ? "MIN/MAX" : "P10/P90" }}
+
+ Applicable to some reports. Determines whether to use Min/Max or P10/P90
+
+
+
+
+
+
+
+
+
diff --git a/src/widgets/settings/ui/components/toggleMinMax/index.ts b/src/widgets/settings/ui/components/toggleMinMax/index.ts
new file mode 100644
index 00000000..18d98ad8
--- /dev/null
+++ b/src/widgets/settings/ui/components/toggleMinMax/index.ts
@@ -0,0 +1,3 @@
+import ToggleMinMax from "./ToggleMinMax.vue";
+
+export default ToggleMinMax;
diff --git a/src/widgets/settings/ui/components/userAccount/UserAccount.vue b/src/widgets/settings/ui/components/userAccount/UserAccount.vue
new file mode 100644
index 00000000..1a35ba72
--- /dev/null
+++ b/src/widgets/settings/ui/components/userAccount/UserAccount.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+ Log in to WebAPI
+
+
+
+
+
+
+
{{ user?.name }}
+
+ Expires: {{ user?.exp }}
+
+
+
+
Log out
+
+
+
+
+
diff --git a/src/widgets/snackbar/index.ts b/src/widgets/snackbar/index.ts
new file mode 100644
index 00000000..07afe192
--- /dev/null
+++ b/src/widgets/snackbar/index.ts
@@ -0,0 +1,4 @@
+import snackbarStore from "@/widgets/snackbar/model/store/snackbar.module";
+import Snackbar from "@/widgets/snackbar/ui/Snackbar.vue";
+
+export { Snackbar, snackbarStore };
diff --git a/src/widgets/snackbar/model/store/actions.type.ts b/src/widgets/snackbar/model/store/actions.type.ts
new file mode 100644
index 00000000..473dcbca
--- /dev/null
+++ b/src/widgets/snackbar/model/store/actions.type.ts
@@ -0,0 +1,2 @@
+export const ADD_ALERT = "addAlert";
+export const RESET_ALERTS = "resetAlerts";
diff --git a/src/widgets/snackbar/model/store/mutations.type.ts b/src/widgets/snackbar/model/store/mutations.type.ts
new file mode 100644
index 00000000..fb3a0229
--- /dev/null
+++ b/src/widgets/snackbar/model/store/mutations.type.ts
@@ -0,0 +1,3 @@
+export const SET_ALERT = "setAlert";
+export const SET_ALERT_VISIBILITY = "setAlertVisibility";
+export const CLEAR_ALERTS = "clearAlerts";
diff --git a/src/widgets/snackbar/model/store/snackbar.module.ts b/src/widgets/snackbar/model/store/snackbar.module.ts
new file mode 100644
index 00000000..d8445591
--- /dev/null
+++ b/src/widgets/snackbar/model/store/snackbar.module.ts
@@ -0,0 +1,53 @@
+import {
+ ADD_ALERT,
+ RESET_ALERTS,
+} from "@/widgets/snackbar/model/store/actions.type";
+import {
+ CLEAR_ALERTS,
+ SET_ALERT,
+ SET_ALERT_VISIBILITY,
+} from "@/widgets/snackbar/model/store/mutations.type";
+
+const state = {
+ alert: {},
+ showAlert: false,
+};
+
+const getters = {
+ getAlert: function (state) {
+ return state.alert;
+ },
+ getAlertVisibility: function (state) {
+ return state.showAlert;
+ },
+};
+
+const actions = {
+ [ADD_ALERT]({ commit }, payload) {
+ commit(SET_ALERT, payload);
+ commit(SET_ALERT_VISIBILITY);
+ },
+ [RESET_ALERTS]({ commit }) {
+ commit(CLEAR_ALERTS);
+ },
+};
+
+const mutations = {
+ [SET_ALERT](state, payload) {
+ state.alert = payload;
+ },
+ [SET_ALERT_VISIBILITY](state) {
+ state.showAlert = true;
+ },
+ [CLEAR_ALERTS](state) {
+ state.alert = {};
+ state.showAlert = false;
+ },
+};
+
+export default {
+ state,
+ getters,
+ actions,
+ mutations,
+};
diff --git a/src/widgets/snackbar/ui/Snackbar.vue b/src/widgets/snackbar/ui/Snackbar.vue
new file mode 100644
index 00000000..6956c0b7
--- /dev/null
+++ b/src/widgets/snackbar/ui/Snackbar.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
diff --git a/tailwind.config.js b/tailwind.config.js
new file mode 100644
index 00000000..859a6afa
--- /dev/null
+++ b/tailwind.config.js
@@ -0,0 +1,42 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+ darkMode: "class",
+ content: [
+ "./index.html",
+ "./src/**/*.{vue,js,ts,jsx,tsx}",
+ "./node_modules/primevue/**/*.{vue,js,ts,jsx,tsx}",
+ ],
+ theme: {
+ fontFamily: {
+ sans: ["Roboto", "Arial"],
+ },
+ extend: {
+ colors: {
+ "primary-50": "rgb(var(--primary-50))",
+ "primary-100": "rgb(var(--primary-100))",
+ "primary-200": "rgb(var(--primary-200))",
+ "primary-300": "rgb(var(--primary-300))",
+ "primary-400": "rgb(var(--primary-400))",
+ "primary-500": "rgb(var(--primary-500))",
+ "primary-600": "rgb(var(--primary-600))",
+ "primary-700": "rgb(var(--primary-700))",
+ "primary-800": "rgb(var(--primary-800))",
+ "primary-900": "rgb(var(--primary-900))",
+ "primary-950": "rgb(var(--primary-950))",
+ "surface-0": "rgb(var(--surface-0))",
+ "surface-50": "rgb(var(--surface-50))",
+ "surface-100": "rgb(var(--surface-100))",
+ "surface-200": "rgb(var(--surface-200))",
+ "surface-300": "rgb(var(--surface-300))",
+ "surface-400": "rgb(var(--surface-400))",
+ "surface-500": "rgb(var(--surface-500))",
+ "surface-600": "rgb(var(--surface-600))",
+ "surface-700": "rgb(var(--surface-700))",
+ "surface-800": "rgb(var(--surface-800))",
+ "surface-900": "rgb(var(--surface-900))",
+ "surface-950": "rgb(var(--surface-950))",
+ },
+ },
+ },
+ plugins: [],
+};
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..2e3149ba
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,38 @@
+{
+ "compilerOptions": {
+ "allowJs": true,
+ "target": "esnext",
+ "module": "esnext",
+ "strict": false,
+ "jsx": "preserve",
+ "moduleResolution": "node",
+ "skipLibCheck": true,
+ "esModuleInterop": true,
+ "allowSyntheticDefaultImports": true,
+ "forceConsistentCasingInFileNames": true,
+ "useDefineForClassFields": true,
+ "sourceMap": true,
+ "baseUrl": ".",
+ "paths": {
+ "@/*": [
+ "src/*"
+ ]
+ },
+ "lib": [
+ "esnext",
+ "dom",
+ "dom.iterable",
+ "scripthost"
+ ]
+ },
+ "include": [
+ "src/**/*.ts",
+ "src/**/*.tsx",
+ "src/**/*.vue",
+ "tests/**/*.ts",
+ "tests/**/*.tsx"
+ ],
+ "exclude": [
+ "node_modules",
+ ]
+}
diff --git a/vite.config.js b/vite.config.js
new file mode 100644
index 00000000..34de12a1
--- /dev/null
+++ b/vite.config.js
@@ -0,0 +1,28 @@
+import { defineConfig } from "vite";
+import "./logger";
+
+import path from "path";
+import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
+
+export default defineConfig({
+ base: "/ares/",
+ plugins: [vue(), vueJsx({})],
+ server: {
+ port: 8080,
+ },
+ resolve: {
+ alias: [
+ {
+ find: "@",
+ replacement: path.resolve(__dirname, "src"),
+ },
+ ],
+ },
+ build: {
+ chunkSizeWarningLimit: 600,
+ cssCodeSplit: false,
+ target: "esnext",
+ sourcemap: true,
+ },
+});
diff --git a/vue.config.js b/vue.config.js
deleted file mode 100644
index 7d334b55..00000000
--- a/vue.config.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
- publicPath: "/ares/",
- lintOnSave: false,
-};
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index ae9222eb..00000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
- rules: [
- {
- test: /\.s(c|a)ss$/,
- use: [
- "vue-style-loader",
- "css-loader",
- {
- loader: "sass-loader",
- options: {
- implementation: require("sass"),
- sassOptions: {
- fiber: require("fibers"),
- indentedSyntax: true, // optional
- },
- },
- },
- ],
- },
- ],
-};