1.update readme 2.fix QA style 3.fix query project list (vmware-archive#395)

Author: Kai-Qiao

README.md

@@ -16,6 +16,7 @@ Core features include:
  - Tabular classification and regresion
  - Images recognition with bounding boxes and polygons
  - Log labeling
+ - Question answer
 - Active learning with uncertainly sampling to query unlabeled data
 - Project tracking with real time data aggregation and review process
 - User management panel with role-based access control
@@ -33,15 +34,8 @@ Core features include:
 - [DAML medium article](https://medium.com/vmware-data-ml-blog/introducing-data-annotator-for-machine-learning-e8af2f19497a)
 - [User guide](https://github.com/vmware/data-annotator-for-machine-learning/wiki/DAML-User-Guide)
 - [Tutorial](https://github.com/vmware/data-annotator-for-machine-learning/wiki/Tutorial:-Using-DAML-to-Label-the-Sentiment-of--VMware-Reddit-and-Twitter-Comments)
+- [DAML release note](https://github.com/vmware/data-annotator-for-machine-learning/releases)
 
-## DAML upgrade
-
-- DAML upgrade to v3.0.0 that mainly raise UI/UX to a higher standard
- - [DAML v3.0.0 release note](https://github.com/vmware/data-annotator-for-machine-learning/releases/tag/v3.0.0). The latest code saved in branch master.
- - [DAML versions older than v3.0.0 releases](https://github.com/vmware/data-annotator-for-machine-learning/releases). The last version v2.1.0 (which still keep our old UI style) before v3.0.0 is saved in branch DAML-v2.1.0.
-- As for DAML UI upgrade, our e2e code also updated
- - The latest e2e code saved in branch e2e-test.
- - The old UI e2e code saved in branch DAML-v2.1.0-e2e.
 
 ## What is included
 

annotation-app/src/app/component/projects/project-analyze/project-analyze.component.html

@@ -326,7 +326,7 @@ <h3 style="word-break: break-all">{{ projectInfo?.ticketDescription }}</h3>
  <!-- here is QA annotation content -->
  <div
  *ngIf="projectType === 'qa'"
- class="txtBox"
+ class="qaBox"
  [ngStyle]="{ height: textBoxResizedHeight }"
  (mousedown)="resizeBox()"
  (onmousedown)="resizeBox()"
@@ -713,15 +713,15 @@ <h4 style="margin-top: 2rem; margin-left: 0.5rem; margin-bottom: 1rem; font-weig
  <ng-container *ngFor="let spanText of mapCurrentAnswerList(item)">
  <ul
  class="list spanSelected"
- style="display: flex; margin-top: -0.2rem; margin-bottom: -0.5rem"
+ style="display: flex; margin-top: -0.2rem; margin-bottom: -0.3rem"
  *ngIf="spanText.label == item"
  (mouseenter)="mouseenterMark($event, spanText)"
  (mouseleave)="mouseleaveMark($event, spanText)"
  >
  <li (click)="clickShowMark($event, spanText)">
  {{ spanText.text }}
  </li>
- <span class="clear" style="position: static" (click)="clickClearMark($event, spanText)"
+ <span class="qaClear" style="position: static" (click)="clickClearMark($event, spanText)"
  >x
  </span>
  </ul>

annotation-app/src/app/component/projects/project-analyze/project-analyze.component.scss

@@ -441,6 +441,23 @@ label .label-leftBoard {
  z-index: 1000;
 }
 
+.qaClear {
+ position: absolute;
+ margin-top: 0.2rem;
+ margin-left: 0.2rem;
+ background-color: transparent;
+ color: transparent;
+ width: 18px;
+ height: 18px;
+ text-align: center;
+ line-height: 15px;
+ user-select: none;
+ border-radius: 50%;
+ font-size: 1.5em;
+ transition: opacity 0.1s ease;
+ z-index: 1000;
+}
+
 .invalidAlert {
  position: absolute;
  top: -0.9rem;
@@ -512,6 +529,13 @@ label .label-leftBoard {
  resize: vertical;
 }
 
+.qaBox {
+ overflow: auto;
+ padding-bottom: 3rem;
+ height: 10rem;
+ resize: vertical;
+}
+
 ::ng-deep .textBox {
  overflow: auto;
  max-height: 50vh;
@@ -1000,8 +1024,7 @@ label .label-leftBoard {
 
 .answerList {
  overflow: auto;
- min-height: 2em;
- max-height: 5em;
+ height: 5em;
  resize: vertical;
  font-size: 0.77em;
  padding: 1px;

annotation-service/services/project.service.js

@@ -30,11 +30,11 @@ async function getProjects(req) {
 
  if (src == SRCS.ANNOTATE) {
  console.log(`[ PROJECT ] Service query current annotator project list`);
- const annotateConditions = { annotator: { $regex: email } };
- const logReviewConditions = { creator: { $regex: email }, annotator: { $not: { $size: 0 } } };
+ const annotateConditions = { annotator: email };
+ const logReviewConditions = { creator: email, annotator: { $not: { $size: 0 } } };
  condition = { $or: [annotateConditions, logReviewConditions] };
  } else if (src == SRCS.PROJECTS && user.role != "Annotator") {
- condition = { creator: { $regex: email } };
+ condition = { creator: email };
  } else if (src == SRCS.ADMIN && user.role == "Admin") {
  condition = {};
  } else if (src == SRCS.COMMUNITY) {
@@ -56,7 +56,7 @@ async function getProjects(req) {
 
 async function getProjectByAnnotator(req) {
  console.log(`[ PROJECT ] Service query project name by annotator: ${req.auth.email}`);
- const condition = { annotator: { $regex: req.auth.email } };
+ const condition = { annotator: req.auth.email };
  const columns = "projectName";
  return mongoDb.findByConditions(ProjectModel, condition, columns);
 }
@@ -559,7 +559,7 @@ async function getReviewList(req) {
  const user = req.auth.email;
  await validator.checkAnnotator(user);
 
- const conditions = { creator: { $regex: user }, projectType: PROJECTTYPE.LOG };
+ const conditions = { creator: user, projectType: PROJECTTYPE.LOG };
  const options = { sort: { updatedDate: -1 } };
  return mongoDb.findByConditions(ProjectModel, conditions, null, options);
 }
@@ -1052,7 +1052,7 @@ async function getProjectsTextTabular(email) {
  { projectType: PROJECTTYPE.TABULAR }
  ];
  condition.$or = [
- { annotator: { $regex: email } },
+ { annotator: email },
  { assignSlackChannels: { $exists: true } }
  ];
  return mongoDb.findByConditions(ProjectModel, condition, project, options);