mirror of
https://github.com/anyproto/anytype-ts.git
synced 2025-06-08 05:57:02 +09:00
middle fixes, type is now single string, removed objectTypesPerObject
This commit is contained in:
parent
6c90e4ceb1
commit
3d0532c5f8
8 changed files with 8 additions and 21 deletions
|
@ -59,7 +59,7 @@ class CellFile extends React.Component<Props, {}> {
|
|||
return (
|
||||
<React.Fragment>
|
||||
{value.map((item: any, i: number) => {
|
||||
const type = DataUtil.schemaField(item.type && item.type.length ? item.type[0] : '');
|
||||
const type = DataUtil.schemaField(item.type);
|
||||
switch (type) {
|
||||
case 'file':
|
||||
return <File key={i} {...item} type={type} />;
|
||||
|
|
|
@ -43,7 +43,7 @@ class CellText extends React.Component<Props, State> {
|
|||
return null;
|
||||
};
|
||||
|
||||
const type = DataUtil.schemaField(record.type && record.type.length ? record.type[0] : '');
|
||||
const type = DataUtil.schemaField(record.type);
|
||||
|
||||
let Name = null;
|
||||
let EditorComponent = null;
|
||||
|
|
|
@ -52,7 +52,7 @@ class MenuDataviewMedia extends React.Component<Props, {}> {
|
|||
);
|
||||
|
||||
const Item = SortableElement((item: any) => {
|
||||
const type = DataUtil.schemaField(item.type && item.type.length ? item.type[0] : '');
|
||||
const type = DataUtil.schemaField(item.type);
|
||||
|
||||
let content = null;
|
||||
switch (type) {
|
||||
|
|
|
@ -54,7 +54,7 @@ class MenuDataviewObjectList extends React.Component<Props, State> {
|
|||
return null;
|
||||
};
|
||||
|
||||
const type = DataUtil.schemaField(item.type && item.type.length ? item.type[0] : '');
|
||||
const type = DataUtil.schemaField(item.type);
|
||||
|
||||
let cn = [];
|
||||
if (item.isSection) {
|
||||
|
@ -172,13 +172,12 @@ class MenuDataviewObjectList extends React.Component<Props, State> {
|
|||
|
||||
let obj: any = {};
|
||||
for (let item of items) {
|
||||
let url = item.type && item.type.length ? item.type[0] : '';
|
||||
let ot = dbStore.getObjectType(url);
|
||||
let ot = dbStore.getObjectType(item.type);
|
||||
if (!ot) {
|
||||
continue;
|
||||
};
|
||||
|
||||
let type = DataUtil.schemaField(url) || 'page';
|
||||
let type = DataUtil.schemaField(item.type) || 'page';
|
||||
let section = obj[type];
|
||||
|
||||
if (!section) {
|
||||
|
@ -231,12 +230,12 @@ class MenuDataviewObjectList extends React.Component<Props, State> {
|
|||
load (callBack?: (message: any) => void) {
|
||||
const { param } = this.props;
|
||||
const { data } = param;
|
||||
const { types, filter } = data;
|
||||
const { types } = data;
|
||||
|
||||
this.setState({ loading: true });
|
||||
|
||||
const filters = [
|
||||
//{ relationKey: 'type', operator: I.FilterOperator.And, condition: I.FilterCondition.In, value: types },
|
||||
{ relationKey: 'type', operator: I.FilterOperator.And, condition: I.FilterCondition.In, value: types },
|
||||
];
|
||||
|
||||
const sorts = [
|
||||
|
|
|
@ -180,7 +180,6 @@ class Dispatcher {
|
|||
case 'blockShow':
|
||||
dbStore.relationsSet(rootId, (data.getRelationsList() || []).map(Mapper.From.Relation));
|
||||
dbStore.objectTypesSet((data.getObjecttypesList() || []).map(Mapper.From.ObjectType));
|
||||
dbStore.objectTypesPerObjectSet((data.getObjecttypesperobjectList() || []).map(Mapper.From.ObjectTypePerObject));
|
||||
|
||||
let res = Response.BlockShow(data);
|
||||
this.onBlockShow(rootId, res.type, res.blocks, res.details);
|
||||
|
|
|
@ -117,7 +117,6 @@ const BlockShow = (response: any) => {
|
|||
blocks: (response.getBlocksList() || []).map(Mapper.From.Block),
|
||||
details: (response.getDetailsList() || []).map(Mapper.From.Details),
|
||||
objectTypes: (response.getObjecttypesList() || []).map(Mapper.From.ObjectType),
|
||||
objectTypesPerObject: (response.getObjecttypesperobjectList() || []).map(Mapper.From.ObjectTypePerObject),
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@ import { I, DataUtil } from 'ts/lib';
|
|||
|
||||
class DbStore {
|
||||
public objectTypeMap: Map<string, I.ObjectType> = observable.map(new Map());
|
||||
public objectTypePerObjectMap: Map<string, I.ObjectTypePerObject> = observable.map(new Map());
|
||||
public relationMap: Map<string, any> = observable.map(new Map());
|
||||
public dataMap: Map<string, any> = observable.map(new Map());
|
||||
public metaMap: Map<string, any> = new Map();
|
||||
|
@ -15,13 +14,6 @@ class DbStore {
|
|||
};
|
||||
};
|
||||
|
||||
@action
|
||||
objectTypesPerObjectSet (types: I.ObjectTypePerObject[]) {
|
||||
for (let type of types) {
|
||||
this.objectTypePerObjectMap.set(type.objectId, type);
|
||||
};
|
||||
};
|
||||
|
||||
@action
|
||||
objectTypeRelationsAdd (url: string, relations: I.Relation[]) {
|
||||
const type = this.getObjectType(url);
|
||||
|
|
|
@ -66,7 +66,5 @@ rm -rf dist/lib/vendor
|
|||
rm -rf dist/lib/protos
|
||||
mv -fv protobuf/* dist/lib/
|
||||
rm -rf protobuf
|
||||
mv -fv schemas/* src/json/schema
|
||||
rm -rf schemas
|
||||
rm -rf $FILE
|
||||
printf "Done\n"
|
Loading…
Add table
Add a link
Reference in a new issue