aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorab <abdullah_ahmed@brown.edu>2019-10-19 16:51:45 -0400
committerab <abdullah_ahmed@brown.edu>2019-10-19 16:51:45 -0400
commit301784883375860a7c693db97fe8f279e5380caf (patch)
treeaf5e47a3caa47a9f0903a6afe467e3414c88f998 /src
parent1a8292f7588880718a657a5fca5c32f1a5975205 (diff)
image stuff
Diffstat (limited to 'src')
-rw-r--r--src/client/ClientRecommender.tsx3
-rw-r--r--src/client/documents/Documents.ts2
-rw-r--r--src/client/views/GlobalKeyHandler.ts2
-rw-r--r--src/client/views/MainView.tsx2
-rw-r--r--src/client/views/RecommendationsBox.scss (renamed from src/client/views/Recommendations.scss)0
-rw-r--r--src/client/views/RecommendationsBox.tsx (renamed from src/client/views/Recommendations.tsx)2
-rw-r--r--src/client/views/nodes/DocumentContentsView.tsx4
-rw-r--r--src/client/views/nodes/DocumentView.tsx2
8 files changed, 9 insertions, 8 deletions
diff --git a/src/client/ClientRecommender.tsx b/src/client/ClientRecommender.tsx
index 73b05cf1a..97efedd89 100644
--- a/src/client/ClientRecommender.tsx
+++ b/src/client/ClientRecommender.tsx
@@ -12,6 +12,7 @@ import "./ClientRecommender.scss";
import { JSXElement } from "babel-types";
import { RichTextField } from "../new_fields/RichTextField";
import { ToPlainText } from "../new_fields/FieldSymbols";
+import { listSpec } from "../new_fields/Schema";
export interface RecommenderProps {
title: string;
@@ -148,7 +149,7 @@ export class ClientRecommender extends React.Component<RecommenderProps> {
public async extractText(dataDoc: Doc, extDoc: Doc, internal: boolean = true, isMainDoc: boolean = false, image: boolean = false) {
let fielddata = Cast(dataDoc.data, RichTextField);
if (image && extDoc.generatedTags) {
- console.log(StrCast(extDoc.generatedTags));
+ console.log(Cast(extDoc.generatedTags, listSpec("string")));
}
let data: string;
fielddata ? data = fielddata[ToPlainText]() : data = "";
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 1179f0238..36f20199c 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -43,7 +43,7 @@ import { PresBox } from "../views/nodes/PresBox";
import { ComputedField, ScriptField } from "../../new_fields/ScriptField";
import { ProxyField } from "../../new_fields/Proxy";
import { DocumentType } from "./DocumentTypes";
-import { RecommendationsBox } from "../views/Recommendations";
+import { RecommendationsBox } from "../views/RecommendationsBox";
//import { PresBox } from "../views/nodes/PresBox";
//import { PresField } from "../../new_fields/PresField";
import { LinkFollowBox } from "../views/linking/LinkFollowBox";
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 189e2bbe0..b0d0a0d28 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -6,7 +6,7 @@ import { DragManager } from "../util/DragManager";
import { action, runInAction } from "mobx";
import { Doc } from "../../new_fields/Doc";
import { DictationManager } from "../util/DictationManager";
-import { RecommendationsBox } from "./Recommendations";
+import { RecommendationsBox } from "./RecommendationsBox";
import SharingManager from "../util/SharingManager";
import { CurrentUserUtils } from "../../server/authentication/models/current_user_utils";
import { Cast, PromiseValue } from "../../new_fields/Types";
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index bfd9c2163..2b47c2534 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -38,7 +38,7 @@ import { PreviewCursor } from './PreviewCursor';
import { FilterBox } from './search/FilterBox';
import { SchemaHeaderField, RandomPastel } from '../../new_fields/SchemaHeaderField';
//import { DocumentManager } from '../util/DocumentManager';
-import { RecommendationsBox } from './Recommendations';
+import { RecommendationsBox } from './RecommendationsBox';
import { PresBox } from './nodes/PresBox';
import { OverlayView } from './OverlayView';
diff --git a/src/client/views/Recommendations.scss b/src/client/views/RecommendationsBox.scss
index dd8a105f6..dd8a105f6 100644
--- a/src/client/views/Recommendations.scss
+++ b/src/client/views/RecommendationsBox.scss
diff --git a/src/client/views/Recommendations.tsx b/src/client/views/RecommendationsBox.tsx
index f965d655b..3938a8690 100644
--- a/src/client/views/Recommendations.tsx
+++ b/src/client/views/RecommendationsBox.tsx
@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
import React = require("react");
import { observable, action } from "mobx";
import Measure from "react-measure";
-import "./Recommendations.scss";
+import "./RecommendationsBox.scss";
import { Doc, DocListCast, WidthSym, HeightSym } from "../../new_fields/Doc";
import { DocumentIcon } from "./nodes/DocumentIcon";
import { StrCast, NumCast } from "../../new_fields/Types";
diff --git a/src/client/views/nodes/DocumentContentsView.tsx b/src/client/views/nodes/DocumentContentsView.tsx
index 32d74b193..01096e5e5 100644
--- a/src/client/views/nodes/DocumentContentsView.tsx
+++ b/src/client/views/nodes/DocumentContentsView.tsx
@@ -31,7 +31,7 @@ import { WebBox } from "./WebBox";
import React = require("react");
import { Without, OmitKeys } from "../../../Utils";
import { Cast } from "../../../new_fields/Types";
-import { RecommendationsBox } from "../../views/Recommendations";
+import { RecommendationsBox } from "../RecommendationsBox";
const JsxParser = require('react-jsx-parser').default; //TODO Why does this need to be imported like this?
type BindingProps = Without<FieldViewProps, 'fieldKey'>;
@@ -96,7 +96,7 @@ export class DocumentContentsView extends React.Component<DocumentViewProps & {
components={{
FormattedTextBox, ImageBox, IconBox, DirectoryImportBox, FontIconBox: FontIconBox, ButtonBox, FieldView,
CollectionFreeFormView, CollectionDockingView, CollectionSchemaView, CollectionView, WebBox, KeyValueBox,
- PDFBox, VideoBox, AudioBox, HistogramBox, PresBox, YoutubeBox, LinkFollowBox, PresElementBox, QueryBox, ColorBox, DocuLinkBox
+ PDFBox, VideoBox, AudioBox, HistogramBox, PresBox, YoutubeBox, LinkFollowBox, PresElementBox, QueryBox, ColorBox, DocuLinkBox, RecommendationsBox
}}
bindings={this.CreateBindings()}
jsx={this.layout}
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 56a399139..bc7cef650 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -34,7 +34,7 @@ import "./DocumentView.scss";
import { FormattedTextBox } from './FormattedTextBox';
import React = require("react");
import requestPromise = require('request-promise');
-import { RecommendationsBox } from '../Recommendations';
+import { RecommendationsBox } from '../RecommendationsBox';
import { SearchUtil } from '../../util/SearchUtil';
import { ClientRecommender } from '../../ClientRecommender';
import { DocumentType } from '../../documents/DocumentTypes';