update with new design (#359)

Author: Kai-Qiao

annotation-app/src/app/components/admin/admin.component.ts

@@ -244,7 +244,7 @@ export class AdminComponent implements OnInit {
  role: this.optionsSet,
  name: str.replace(str[0], str[0].toUpperCase()),
  };
- this.avaService.saveUser(this.userRoleInfo).subscribe(
+ this.avaService.saveUser([this.userRoleInfo]).subscribe(
  (res) => {
  this.loading = false;
  this.createUserDialog = false;

annotation-app/src/app/components/open-source/basic-login/basic-login.component.ts

@@ -140,7 +140,7 @@ export class BasicLoginComponent implements OnInit {
  password: this.dsForm.get('password').value,
  uname: fullName.join(' '),
  };
- this.avaService.register(param).subscribe(
+ this.avaService.register([param]).subscribe(
  (res) => {
  this.registerSuccess = 'Sign Up Complete!';
  this.loading = false;

annotation-service/config/code_msg.js

@@ -1,8 +1,7 @@
 module.exports={
  //OPERATION
  SUCCESS: { CODE: 200, MSG: "SUCCESS" },
- ANNOTATE_DONE: { CODE: 200, "MSG": "ANNOTATION DONE" },
- ANNOTATE_DONE: { CODE: 200, "MSG": "REVIEW DONE" },
+ ANNOTATE_DONE: { CODE: 200, "MSG": "THE TASK HAS BEEN DONE" },
  ERROR: { CODE: 500, MSG: "SERVER ERROR" },
 
  //401 auth related
@@ -18,6 +17,7 @@ module.exports={
  //2000 user related
  VALIDATION_USER_EXIST: {CODE: 2000, MSG: "USER ALREADY EXIST"},
  VALIDATION_USER_EMAIL: {CODE: 2001, MSG: "USER EMAIL MUST NOT BE EMPTY"},
+ VALIDATION_USER_NO_EXIST: {CODE: 2002, MSG: "USER NOT EXIST"},
 
  //3000 tickets related
  ERROR_TK_SETDATA: { CODE: 3000, MSG: "HANDLE DATA ERROR" },

annotation-service/db/db-connect.js

@@ -148,6 +148,11 @@ const userSchema = new mongoose.Schema({
  updateDate: { type: String },
  regularNotification: { type: Boolean, default: true },
  manul: { type: Boolean, default: false },
+ dashboard:{
+ createdDate: { type: String },
+ updateDate: { type: String },
+ data:[],
+ },
 }, { _id: false });
 userSchema.set("toJSON", { virtuals: true });
 userSchema.set("toObject", { virtuals: true });
@@ -238,7 +243,7 @@ const projectSchema = new mongoose.Schema({
  source: { type: String, default: "" },
  externalId: { type: Array, default: [] },
  },
- assignSlackChannels: { type: Array }
+ assignSlackChannels: { type: Array },
 }, { _id: true });
 projectSchema.index({ projectName: 1 });
 projectSchema.set("toJSON", { virtuals: true });
@@ -272,10 +277,12 @@ const dataSetSchema = new mongoose.Schema({
  fileSize: { type: Number },
  }],
  totalRows: { type: Number },
+ totalColumns: { type: Number },
  dataSynchronize:[{
  system: { type: String },
  _id: { type: String },
- }]
+ }],
+ projects:{ type: Array },
 });
 dataSetSchema.set("toJSON", { virtuals: true });
 dataSetSchema.index({ dataSetName: 1 });

annotation-service/resources/APIs.js

@@ -16,6 +16,7 @@ module.exports = {
  USER_DELETE: "/users", //swagger
  USER_ROLE_EDIT: "/users", //swagger
  USER_ROLE: "/users/roles", //swagger
+ USER_DASHBOARD: "/users/dashboard", //swagger
  FILE_DATASET_QUERY: "/users/datasets",//swagger
  PROJECT_LIST_ANNOTATOR: "/users/projects/names", // no
 

annotation-service/routers/user-controller.js

@@ -69,6 +69,18 @@ router.get(APIs.USER_ROLE, (req, res) => {
  });
 });
 
+/* PUTCH USER update dashboard */
+router.patch(APIs.USER_DASHBOARD, (req, res) => {
+ console.log(`[ USER ] [ ACCESS ] Router ${req.originalUrl} ${req.auth.email}`);
+ userService.saveUserDashboard(req).then(response => {
+ console.log(`[ USER ] [ SUCCESS ] Router ${req.originalUrl} ${req.auth.email}`);
+ res.status(200).json(response);
+ }).catch(error => {
+ console.log(`[ USER ] [ ERROR ] Router ${req.originalUrl} ${req.auth.email}`, error);
+ res.status(500).send(error);
+ });
+});
+
 /* Get user Rank */
 router.get(APIs.USER_RANK, (req, res) => {
  console.log(`[ USER ] [ ACCESS ] Router ${req.originalUrl} ${req.auth.email}`);

annotation-service/services/dataSet-service.js

@@ -18,6 +18,7 @@ const fs = require('fs');
 const mongoDb = require('../db/mongo.db');
 const { ProjectModel, DataSetModel } = require('../db/db-connect');
 const MESSAGE = require('../config/code_msg');
+const {updateProjectDatasetInfo} = require('./project.service');
 
 async function saveDataSetInfo(req) {
 
@@ -38,7 +39,9 @@ async function saveDataSetInfo(req) {
  format: req.body.format,
  createTime: Date.now(),
  updateTime: Date.now(),
- dataSynchronize: dataSynchronize
+ dataSynchronize: dataSynchronize,
+ totalRows: req.body.totalRows,
+ totalColumns: req.body.totalColumns? req.body.totalColumns: 0,
  };
 
  if (config.useLocalFileSys) {
@@ -86,7 +89,6 @@ async function saveDataSetInfo(req) {
 
  }else if (req.body.format == DATASETTYPE.LOG) {
  dataSet.topReview = req.body.topReview;
- dataSet.totalRows = req.body.totalRows;
  }
 
  let conditions = { dataSetName: req.body.dsname };
@@ -219,7 +221,9 @@ async function deleteDataSet(req) {
  }
 
  }
-
+ for (const projectName of ds[0].projects) {
+ await updateProjectDatasetInfo(projectName, ds[0].dataSetName, OPERATION.DELETE);
+ }
  console.log(`[ DATASET ] Service deleteDataSet.removeDataSet`);
  await mongoDb.removeByConditions(DataSetModel, { dataSetName: ds[0].dataSetName });
 
@@ -271,6 +275,25 @@ async function updateDataset(req) {
 
 }
 
+async function updateDatasetProjectInfo(datasetName, projectName, operation) {
+
+ const condistion = {datasetName: datasetName};
+ const options = { new: true, upsert: true };
+ let update = {};
+
+ if (OPERATION.ADD == operation) {
+ update["$push.projects"] = projectName;
+ }else if (OPERATION.DELETE == operation) {
+ update["$pull.projects"] = projectName;
+ }else{
+ throw MESSAGE.VALIDATATION_OPERATION;
+ }
+ 
+ console.log(`[ DATASET ] Service updateDatasetProjectInfo`);
+ return mongoDb.findOneAndUpdate(DataSetModel, condistion, update, options);
+ 
+}
+
 module.exports = {
  saveDataSetInfo,
  queryDataSetByUser,
@@ -279,4 +302,5 @@ module.exports = {
  signS3Url,
  imageTopPreview,
  updateDataset,
+ updateDatasetProjectInfo,
 }

annotation-service/services/file-service.js

@@ -9,7 +9,7 @@
 const srsImporter = require("../utils/srsImporter");
 const createCsvWriter = require("csv-writer").createObjectCsvWriter;
 const CSVArrayWriter = require("csv-writer").createArrayCsvWriter;
-const { GENERATESTATUS, PAGINATETEXTLIMIT, PAGINATELIMIT, FILEFORMAT, LABELTYPE, PROJECTTYPE, S3OPERATIONS, FILETYPE, DATASETTYPE, FILEPATH, QUERYORDER, ANNOTATION_QUESTION, TICKET_DESCRIPTION, SOURCE, QUERY_STRATEGY, ESTIMATOR } = require("../config/constant");
+const { GENERATESTATUS, PAGINATETEXTLIMIT, PAGINATELIMIT, FILEFORMAT, LABELTYPE, PROJECTTYPE, S3OPERATIONS, FILETYPE, DATASETTYPE, FILEPATH, QUERYORDER, ANNOTATION_QUESTION, TICKET_DESCRIPTION, SOURCE, QUERY_STRATEGY, ESTIMATOR, OPERATION } = require("../config/constant");
 const fs = require('fs');
 const ObjectId = require("mongodb").ObjectID;
 const moment = require('moment');
@@ -127,7 +127,7 @@ async function saveProjectInfo(req, userCompleteCase, annotators) {
  assignmentLogic: req.body.assignmentLogic ? req.body.assignmentLogic : QUERYORDER.RANDOM,
  annotator: annotators,
  dataSource: req.body.fileName ? req.body.fileName : "",
- selectedDataset: [req.body.selectedDataset ? req.body.selectedDataset : ""],
+ selectedDataset: req.body.selectedDataset ? [req.body.selectedDataset] : [],
  selectedColumn: selectedColumn,
  annotationQuestion: req.body.annotationQuestion ? req.body.annotationQuestion : ANNOTATION_QUESTION,
  fileSize: req.body.fileSize ? req.body.fileSize : 1,
@@ -157,7 +157,6 @@ async function saveProjectInfo(req, userCompleteCase, annotators) {
  const update = { $set: project };
  const options = { new: true, upsert: true };
 
-
  return mongoDb.findOneAndUpdate(ProjectModel, conditions, update, options)
 }
 

annotation-service/services/project.service.js

@@ -18,6 +18,7 @@ const { formatDate } = require('../utils/common.utils');
 const slackChat = require("./slack/slackChat.service");
 const { default: axios } = require("axios");
 const MESSAGE = require('../config/code_msg');
+const dataSetService = require('./dataSet-service')
 
 async function getProjects(req) {
  console.log(`[ PROJECT ] Service getProjects query user role`);
@@ -129,9 +130,12 @@ async function deleteProject(req) {
  };
  await axios.delete(url, reqConfig);
  }
-
+ 
+ for (const dsName of mp.project.selectedDataset) {
+ await dataSetService.updateDatasetProjectInfo(dsName, mp.project.projectName, OPERATION.DELETE);
+ }
  console.log(`[ PROJECT ] Service delete project`, conditions);
- await mongoDb.deleteOneByConditions(ProjectModel, conditions);
+ return mongoDb.deleteOneByConditions(ProjectModel, conditions);
 
 }
 async function updateProject(req) {
@@ -1049,7 +1053,22 @@ async function getProjectsTextTabular(email) {
  return mongoDb.findByConditions(ProjectModel, condition, project, options);
 }
 
+async function updateProjectDatasetInfo(projectName, datasetName, operation) {
+ const condistion = {projectName: projectName};
+ const options = { new: true, upsert: true };
+ let update = {};
 
+ if (OPERATION.ADD == operation) {
+ update["$push.selectedDataset"] = datasetName;
+ }else if (OPERATION.DELETE == operation) {
+ update["$pull.selectedDataset"] = datasetName;
+ }else{
+ throw MESSAGE.VALIDATATION_OPERATION;
+ }
+ 
+ console.log(`[ DATASET ] Service updateDatasetProjectInfo`);
+ return mongoDb.findOneAndUpdate(ProjectModel, condistion, update, options);
+}
 
 
 module.exports = {
@@ -1077,4 +1096,5 @@ module.exports = {
  initHierarchicalLabelsCase,
  reduceHierarchicalUnselectedLabel,
  prepareUserInputs,
+ updateProjectDatasetInfo,
 }

annotation-service/services/srs-service.js

@@ -9,7 +9,7 @@
 const ObjectId = require("mongodb").ObjectID;
 const projectService = require('./project.service');
 const validator = require('../utils/validator');
-const { PAGINATELIMIT, APPENDSR, LABELTYPE, PROJECTTYPE, S3OPERATIONS, QUERYORDER } = require("../config/constant");
+const { PAGINATELIMIT, APPENDSR, LABELTYPE, PROJECTTYPE, S3OPERATIONS, QUERYORDER, OPERATION } = require("../config/constant");
 const csv = require('csvtojson');
 const alService = require('./activelearning.service');
 const _ = require("lodash");
@@ -23,6 +23,7 @@ const fileSystemUtils = require('../utils/fileSystem.utils');
 const config = require('../config/config');
 const { reduceHierarchicalUnselectedLabel, initHierarchicalLabelsCase } = require('./project.service');
 const MESSAGE = require('../config/code_msg');
+const dataSetService = require('./dataSet-service')
 
 async function updateSrsUserInput(req, from) {
 
@@ -656,7 +657,7 @@ async function appendSrsDataByCSVFile(req, originalHeaders, project) {
  $push: { selectedDataset: req.body.selectedDataset }
  };
  await mongoDb.findOneAndUpdate(ProjectModel, conditions, update);
-
+ await dataSetService.updateDatasetProjectInfo(req.body.selectedDataset, req.body.pname, OPERATION.ADD);
  await projectService.updateAssinedCase(conditions, caseNum, true);
  console.log(`[ SRS ] Service insert sr end: `, Date.now());
  } catch (error) {
@@ -710,7 +711,7 @@ async function appendSrsData(req) {
  //validate pname and headers
  const originalHeaders = mp.project.selectedColumn;
  if (req.body.isFile) {
- //file append 
+ //file append
  await appendSrsDataByCSVFile(req, originalHeaders, project);
  console.log(`[ SRS ] Service append tickets by CSV file done`);
  } else {