add test

apps/remix-ide/src/app/plugins/file-decorator.ts

@@ -8,7 +8,11 @@ import { fileDecoration } from '@remix-ui/file-decorators'
 const profile = {
     name: 'fileDecorator',
     desciption: 'Keeps decorators of the files',
+<<<<<<< HEAD
     methods: ['setFileDecorators', 'clearFileDecorators', 'clearAllFileDecorators'],
+=======
+    methods: ['setFileDecorators', 'clearFileDecorators'],
+>>>>>>> 43bc1038a (add test)
     events: ['fileDecoratorsChanged'],
     version: '0.0.1'
 }
@@ -18,6 +22,7 @@ export class FileDecorator extends Plugin {
     constructor() {
         super(profile)
     }
+<<<<<<< HEAD
 
     onActivation(): void {
         this.on('filePanel', 'setWorkspace', async () => {
@@ -25,33 +30,61 @@ export class FileDecorator extends Plugin {
         })
     }
 
+=======
+>>>>>>> 43bc1038a (add test)
     /**
      * 
      * @param fileStates Array of file states
      */
     async setFileDecorators(fileStates: fileDecoration[] | fileDecoration) {
+<<<<<<< HEAD
         const { from } = this.currentRequest
         const workspace = await this.call('filePanel', 'getCurrentWorkspace')
+=======
+        const workspace = await this.call('filePanel', 'getCurrentWorkspace')
+        function sortByPath( a: fileDecoration, b: fileDecoration ) {
+            if ( a.path < b.path ){
+              return -1;
+            }
+            if ( a.path > b.path ){
+              return 1;
+            }
+            return 0;
+          }
+
+>>>>>>> 43bc1038a (add test)
         const fileStatesPayload = Array.isArray(fileStates) ? fileStates : [fileStates]
         // clear all file states in the previous state of this owner on the files called
         fileStatesPayload.forEach((state) => {
             state.workspace = workspace
+<<<<<<< HEAD
             state.owner = from
         })
         const filteredState = this._fileStates.filter((state) => {
             const index = fileStatesPayload.findIndex((payloadFileState: fileDecoration) => {
                 return from == state.owner && payloadFileState.path == state.path
+=======
+        })
+        const filteredState = this._fileStates.filter((state) => {
+            const index = fileStatesPayload.findIndex((payloadFileState: fileDecoration) => {
+                return payloadFileState.owner == state.owner && payloadFileState.path == state.path
+>>>>>>> 43bc1038a (add test)
             })
             return index == -1
         })
         const newState = [...filteredState, ...fileStatesPayload].sort(sortByPath)
+<<<<<<< HEAD
 
+=======
+        
+>>>>>>> 43bc1038a (add test)
         if (!deepequal(newState, this._fileStates)) {
             this._fileStates = newState
             this.emit('fileDecoratorsChanged', this._fileStates)
         }
     }
 
+<<<<<<< HEAD
     async clearFileDecorators(path?: string) {
         const { from } = this.currentRequest
         if (!from) return
@@ -83,4 +116,10 @@ const sortByPath = (a: fileDecoration, b: fileDecoration) => {
         return 1;
     }
     return 0;
+=======
+    async clearFileDecorators() {
+        this._fileStates = []
+        this.emit('fileDecoratorsChanged', [])
+    }
+>>>>>>> 43bc1038a (add test)
 }

libs/remix-ui/file-decorators/src/lib/components/filedecorationicons/file-decoration-custom-icon.tsx

@@ -5,7 +5,11 @@ import { fileDecoration } from '../../types'
 const FileDecorationCustomIcon = (props: {
     fileDecoration: fileDecoration
 }) => {
+<<<<<<< HEAD
     return <><span data-id={`file-decoration-custom-${props.fileDecoration.path}`} className={`${props.fileDecoration.fileStateIconClass} pr-2`}>
+=======
+    return <><span className={`${props.fileDecoration.fileStateIconClass}pr-2`}>
+>>>>>>> 43bc1038a (add test)
         {props.fileDecoration.fileStateIcon}
     </span></>
 }

libs/remix-ui/file-decorators/src/lib/components/filedecorationicons/file-decoration-error-icon.tsx

@@ -7,7 +7,11 @@ const FileDecorationErrorIcon = (props: {
     fileDecoration: fileDecoration
 }) => {
     return <>
+<<<<<<< HEAD
         <span data-id={`file-decoration-error-${props.fileDecoration.path}`} className={`${props.fileDecoration.fileStateIconClass} text-danger pr-2`}>{props.fileDecoration.text}</span>
+=======
+        <span className={`${props.fileDecoration.fileStateIconClass} text-danger pr-2`}>{props.fileDecoration.text}</span>
+>>>>>>> 43bc1038a (add test)
     </>
 }
 

libs/remix-ui/file-decorators/src/lib/components/filedecorationicons/file-decoration-tooltip.tsx

@@ -9,9 +9,15 @@ const FileDecorationTooltip = (props: {
 },
 ) => {
     const getComments = function (fileDecoration: fileDecoration) {
+<<<<<<< HEAD
         if (fileDecoration.comment) {
             const comments = Array.isArray(fileDecoration.comment) ? fileDecoration.comment : [fileDecoration.comment]
             return comments.map((comment, index) => {
+=======
+        if (fileDecoration.commment) {
+            const commments = Array.isArray(fileDecoration.commment) ? fileDecoration.commment : [fileDecoration.commment]
+            return commments.map((comment, index) => {
+>>>>>>> 43bc1038a (add test)
                 return <div key={index}>{comment}<br></br></div>
             })
         }

libs/remix-ui/file-decorators/src/lib/components/filedecorationicons/file-decoration-warning-icon.tsx

@@ -5,7 +5,11 @@ import { fileDecoration } from '../../types'
 const FileDecorationWarningIcon = (props: {
     fileDecoration: fileDecoration
 }) => {
+<<<<<<< HEAD
     return <><span data-id={`file-decoration-warning-${props.fileDecoration.path}`} className={`${props.fileDecoration.fileStateIconClass} text-warning pr-2`}>{props.fileDecoration.text}</span></>
+=======
+    return <><span className={`${props.fileDecoration.fileStateIconClass} text-warning pr-2`}>{props.fileDecoration.text}</span></>
+>>>>>>> 43bc1038a (add test)
 }
 
 export default FileDecorationWarningIcon

libs/remix-ui/file-decorators/src/lib/helper/index.tsx

@@ -2,9 +2,15 @@ import React from "react"
 import { fileDecoration } from "../types"
 
 export const getComments = function (fileDecoration: fileDecoration) {
+<<<<<<< HEAD
     if(fileDecoration.comment){
         const comments = Array.isArray(fileDecoration.comment) ? fileDecoration.comment : [fileDecoration.comment]
         return comments.map((comment, index) => {
+=======
+    if(fileDecoration.commment){
+        const commments = Array.isArray(fileDecoration.commment) ? fileDecoration.commment : [fileDecoration.commment]
+        return commments.map((comment, index) => {
+>>>>>>> 43bc1038a (add test)
             return <div key={index}>{comment}<br></br></div>
         })
     }

libs/remix-ui/file-decorators/src/lib/types/index.ts

@@ -14,10 +14,17 @@ export enum fileDecorationType {
     fileStateIcon: string | HTMLDivElement | JSX.Element,
     bubble: boolean,
     text?: string,
+<<<<<<< HEAD
     owner?: string,
     workspace?: any
     tooltip?: string
     comment?: string[] | string
+=======
+    owner: string,
+    workspace?: any
+    tooltip?: string
+    commment?: string[] | string
+>>>>>>> 43bc1038a (add test)
   }
 
   export interface FileType {