TagSpaces is an offline, open source, document manager with tagging support
awsjson model (#1331)
Stanimir3b87bd75249d
diff --git a/app/reducers/index.ts b/app/reducers/index.tsindex 9853dd4d7..221137197 100644--- a/app/reducers/index.ts+++ b/app/reducers/index.ts@@ -24,6 +24,7 @@ import app from './app';import locations from './locations';import taglibrary from './taglibrary';import locationIndex from './location-index';+import AppConfig from '-/config';const externalLocations = window.ExtLocations || false;const externalTagLibrary = window.ExtTagLibrary || false;@@ -31,7 +32,7 @@ const externalTagLibrary = window.ExtTagLibrary || false;const blacklist = ['app','locationIndex',- externalLocations ? 'locations' : '',+ externalLocations || AppConfig.isWeb ? 'locations' : '',externalTagLibrary ? 'taglibrary' : ''];diff --git a/app/reducers/taglibrary.ts b/app/reducers/taglibrary.tsindex c3f6efc7c..4d06d23a0 100644--- a/app/reducers/taglibrary.ts+++ b/app/reducers/taglibrary.ts@@ -508,21 +508,21 @@ export const actions = {replace}),/**- * GraphQL API return TagGroup Tags array with tags.items: []- * This migrate tagGroups model tag.items to children+ * GraphQL API return TagGroup Tags array like String+ * This migrate tagGroups model to children []* @param entries*/- addTagGroups: (entries: Array<any>) => (+ /* addTagGroups: (entries: Array<any>) => (dispatch: (actions: Object) => void) => {if (entries && entries.length > 0) {const tagGroups: Array<TagGroup> = entries.map(tagGroup => {- const { tags, ...tagGroupProps } = tagGroup;- return { children: tags.items, ...tagGroupProps };+ const { children, ...tagGroupProps } = tagGroup;+ return { children: JSON.parse(children), ...tagGroupProps };});dispatch(actions.importTagGroups(tagGroups, true));}- },+ }, */exportTagGroups: (entry: Array<Object>) => (dispatch: (actions: Object) => void,getState: () => anydiff --git a/app/utils/HandleAuth.ts b/app/utils/HandleAuth.tsindex 4737db091..8b0d76725 100644--- a/app/utils/HandleAuth.ts+++ b/app/utils/HandleAuth.ts@@ -15,7 +15,7 @@ interface Props {loggedIn: (user: CognitoUserInterface) => void;initApp: () => void;addLocations: (locations: Array<Location>, override: boolean) => void;- addTagGroups: (tagGroups: Array<TagGroup>) => void;+ importTagGroups: (tagGroups: Array<TagGroup>, replace: boolean) => void;}const HandleAuth = React.memo((props: Props) => {const username = useRef(undefined);@@ -42,7 +42,7 @@ const HandleAuth = React.memo((props: Props) => {fetchTenant().then(async tenant => {await addLocations(tenant, queries.getExtconfig);- await addTagGroups(tenant, queries.listTagGroups);+ await addTagGroups(tenant, queries.tagGroupsByTenant);return true;})@@ -70,23 +70,29 @@ const HandleAuth = React.memo((props: Props) => {});if (data) {// console.log(data.getExtconfig.Locations.items);- props.addLocations(data.getExtconfig.Locations.items, false);+ props.addLocations(JSON.parse(data.getExtconfig.Locations), false);}};const addTagGroups = async (tenant: string, query: any) => {- const filter = {+ /* const filter = {tenant: {eq: tenant}- };+ }; */+ // const variables: TagGroupsByTenantQueryVariables = { tenant };+// @ts-ignoreconst { data } = await API.graphql({query,- variables: { filter }+ variables: { tenant }});- if (data) {- props.addTagGroups(data.listTagGroups.items);+ if (data && data.TagGroupsByTenant.items.length > 0) {+ const tagGroupsByTenant = data.TagGroupsByTenant.items[0];+ props.importTagGroups(+ JSON.parse(tagGroupsByTenant.tagGroups),+ tagGroupsByTenant.replace+ );}};@@ -111,7 +117,7 @@ function mapDispatchToProps(dispatch) {loggedIn: AppActions.loggedIn,initApp: AppActions.initApp,addLocations: LocationActions.addLocations,- addTagGroups: TagGroupActions.addTagGroups+ importTagGroups: TagGroupActions.importTagGroups},dispatch);