removed calendar button. added metadata value input via tagsview

2 files changed, 9 insertions, 24 deletions

diff --git a/src/client/views/DocumentButtonBar.tsx b/src/client/views/DocumentButtonBar.tsx
index 58b7f207c..437ef045f 100644
--- a/src/client/views/DocumentButtonBar.tsx
+++ b/src/client/views/DocumentButtonBar.tsx
@@ -264,23 +264,6 @@ export class DocumentButtonBar extends ObservableReactComponent<{ views: () => (
     }
 
     @computed
-    get calendarButton() {
-        const targetDoc = this.view0?.Document;
-        return !targetDoc ? null : (
-            <Tooltip title={<div className="dash-calendar-button">Open calendar menu</div>}>
-                <div
-                    className="documentButtonBar-icon"
-                    style={{ color: 'white' }}
-                    onClick={() => {
-                        CalendarManager.Instance.open(this.view0, targetDoc);
-                    }}>
-                    <FontAwesomeIcon className="documentdecorations-icon" icon={faCalendarDays as IconLookup} />
-                </div>
-            </Tooltip>
-        );
-    }
-
-    @computed
     get keywordButton() {
         return !DocumentView.Selected().length ? null : (
             <Tooltip title={<div className="dash-keyword-button">Open keyword menu</div>}>
@@ -460,7 +443,6 @@ export class DocumentButtonBar extends ObservableReactComponent<{ views: () => (
                 {!DocumentView.Selected().some(v => v.allLinks.length) ? null : <div className="documentButtonBar-button">{this.followLinkButton}</div>}
                 <div className="documentButtonBar-button">{this.pinButton}</div>
                 <div className="documentButtonBar-button">{this.recordButton}</div>
-                <div className="documentButtonBar-button">{this.calendarButton}</div>
                 <div className="documentButtonBar-button">{this.keywordButton}</div>
                 {!Doc.UserDoc().documentLinksButton_fullMenu ? null : <div className="documentButtonBar-button">{this.shareButton}</div>}
                 <div className="documentButtonBar-button">{this.menuButton}</div>
diff --git a/src/client/views/TagsView.tsx b/src/client/views/TagsView.tsx
index 7723da900..2d583d392 100644
--- a/src/client/views/TagsView.tsx
+++ b/src/client/views/TagsView.tsx
@@ -283,15 +283,18 @@ export class TagsView extends ObservableReactComponent<TagViewProps> {
     };
 
     /**
-     * Adds the specified tag to the Doc.  If the tag is not prefixed with '#', then a '#' prefix is added.
-     * Whne the tag (after the '#') begins with '@', then a metadata key/value pair is displayed instead of
-     * just the tag.
-     * @param tag tag string to add
+     * Adds the specified tag or metadata to the Doc.  If the tag is not prefixed with '#', then a '#' prefix is added.
+     * When the tag (after the '#') begins with '@', then a metadata key/value pair is displayed instead of
+     * just the tag.  In addition, a suffix of :<value> can be added to set a metadata value
+     * @param tag tag string to add (format: #<tag> | #@field(:(=)?value)? )
      */
     submitTag = undoable(
         action((tag: string) => {
-            const submittedLabel = tag.trim();
-            submittedLabel && TagItem.addTagToDoc(this._props.View.Document, '#' + submittedLabel.replace(/^#/, ''));
+            const submittedLabel = tag.trim().replace(/^#/, '').split(':');
+            if (submittedLabel[0]) {
+                TagItem.addTagToDoc(this._props.View.Document, '#' + submittedLabel[0]);
+                if (submittedLabel.length > 1) Doc.SetField(this._props.View.Document, submittedLabel[0].replace(/^@/, ''), ':' + submittedLabel[1]);
+            }
             this._currentInput = ''; // Clear the input box
         }),
         'added doc label'