Skip to content

Commit ad3f576

Browse files
SandraMonnierSandraMonnier
authored
Merge pull request #545 from Heigvd/sam-hodgepodge
Hodgepodge
2 parents f415099 + 6694096 commit ad3f576

File tree

5 files changed

+31
-70
lines changed

5 files changed

+31
-70
lines changed

‎colab-api/src/main/java/ch/colabproject/colab/api/controller/DuplicationManager.java‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,8 @@
1414
import ch.colabproject.colab.api.exceptions.ColabMergeException;
1515
import ch.colabproject.colab.api.model.ColabEntity;
1616
import ch.colabproject.colab.api.model.DuplicationParam;
17-
import ch.colabproject.colab.api.model.card.AbstractCardType;
18-
import ch.colabproject.colab.api.model.card.Card;
19-
import ch.colabproject.colab.api.model.card.CardContent;
20-
import ch.colabproject.colab.api.model.card.CardType;
21-
import ch.colabproject.colab.api.model.card.CardTypeRef;
22-
import ch.colabproject.colab.api.model.document.AbstractResource;
23-
import ch.colabproject.colab.api.model.document.Document;
24-
import ch.colabproject.colab.api.model.document.DocumentFile;
25-
import ch.colabproject.colab.api.model.document.ExternalLink;
26-
import ch.colabproject.colab.api.model.document.LexicalDataOwnershipKind;
27-
import ch.colabproject.colab.api.model.document.Resource;
28-
import ch.colabproject.colab.api.model.document.ResourceRef;
29-
import ch.colabproject.colab.api.model.document.TextDataBlock;
17+
import ch.colabproject.colab.api.model.card.*;
18+
import ch.colabproject.colab.api.model.document.*;
3019
import ch.colabproject.colab.api.model.link.ActivityFlowLink;
3120
import ch.colabproject.colab.api.model.link.StickyNoteLink;
3221
import ch.colabproject.colab.api.model.project.Project;
@@ -36,17 +25,14 @@
3625
import ch.colabproject.colab.api.model.user.User;
3726
import ch.colabproject.colab.generator.model.exceptions.HttpErrorMessage;
3827
import ch.colabproject.colab.generator.model.exceptions.MessageI18nKey;
28+
import org.slf4j.Logger;
29+
import org.slf4j.LoggerFactory;
30+
31+
import javax.jcr.RepositoryException;
3932
import java.io.IOException;
4033
import java.io.InputStream;
41-
import java.util.ArrayList;
42-
import java.util.Comparator;
43-
import java.util.HashMap;
44-
import java.util.List;
45-
import java.util.Map;
34+
import java.util.*;
4635
import java.util.Map.Entry;
47-
import javax.jcr.RepositoryException;
48-
import org.slf4j.Logger;
49-
import org.slf4j.LoggerFactory;
5036

5137
/**
5238
* Duplication of colab entities.
@@ -179,6 +165,10 @@ public Project duplicateProject(Project originalProject) {
179165
logger.info("param do not duplicate project's team members");
180166
}
181167

168+
////////////////////////////////////////////////////////////////////////////////////////
169+
// instance makers
170+
/* are never duplicated */
171+
182172
////////////////////////////////////////////////////////////////////////////////////////
183173
// Card types
184174
if (params.isWithCardTypes()) {

‎colab-api/src/main/java/ch/colabproject/colab/api/rest/user/UserRestEndpoint.java‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,20 @@
99
import ch.colabproject.colab.api.controller.RequestManager;
1010
import ch.colabproject.colab.api.controller.user.UserManager;
1111
import ch.colabproject.colab.api.exceptions.ColabMergeException;
12-
import ch.colabproject.colab.api.model.user.Account;
13-
import ch.colabproject.colab.api.model.user.AuthInfo;
14-
import ch.colabproject.colab.api.model.user.AuthMethod;
15-
import ch.colabproject.colab.api.model.user.HttpSession;
16-
import ch.colabproject.colab.api.model.user.LocalAccount;
17-
import ch.colabproject.colab.api.model.user.SignUpInfo;
18-
import ch.colabproject.colab.api.model.user.User;
12+
import ch.colabproject.colab.api.model.user.*;
1913
import ch.colabproject.colab.api.persistence.jpa.user.UserDao;
2014
import ch.colabproject.colab.generator.model.annotations.AdminResource;
2115
import ch.colabproject.colab.generator.model.annotations.AuthenticationRequired;
2216
import ch.colabproject.colab.generator.model.annotations.ConsentNotRequired;
2317
import ch.colabproject.colab.generator.model.exceptions.HttpErrorMessage;
24-
import java.util.List;
25-
import javax.inject.Inject;
26-
import javax.ws.rs.Consumes;
27-
import javax.ws.rs.DELETE;
28-
import javax.ws.rs.GET;
29-
import javax.ws.rs.POST;
30-
import javax.ws.rs.PUT;
31-
import javax.ws.rs.Path;
32-
import javax.ws.rs.PathParam;
33-
import javax.ws.rs.Produces;
34-
import javax.ws.rs.core.MediaType;
3518
import org.slf4j.Logger;
3619
import org.slf4j.LoggerFactory;
3720

21+
import javax.inject.Inject;
22+
import javax.ws.rs.*;
23+
import javax.ws.rs.core.MediaType;
24+
import java.util.List;
25+
3826
/**
3927
* User controller
4028
*
@@ -270,8 +258,8 @@ public void grantAdminRight(@PathParam("id") Long id) {
270258
*
271259
* @param id id of the user
272260
*/
273-
@DELETE
274-
@Path("{id : [1-9][0-9]*}/GrantAdminRight")
261+
@PUT
262+
@Path("{id : [1-9][0-9]*}/RevokeAdminRight")
275263
@AdminResource
276264
public void revokeAdminRight(@PathParam("id") Long id) {
277265
logger.debug("Grant admin right to user #{}", id);

‎colab-webapp/src/main/node/app/src/components/resources/ResourceCreator.tsx‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@ const defaultData: ResourceCreationType = {
2929
atCardContentLevel: false,
3030
};
3131

32-
interface ResourceCreatorProps {
33-
collapsedClassName?: string;
34-
customButton?: React.ReactNode;
35-
}
36-
37-
export default function ResourceCreator({ customButton }: ResourceCreatorProps): JSX.Element {
32+
export default function ResourceCreator(): JSX.Element {
3833
const dispatch = useAppDispatch();
3934
const i18n = useTranslations();
4035

@@ -122,15 +117,11 @@ export default function ResourceCreator({ customButton }: ResourceCreatorProps):
122117
<OpenModalOnClick
123118
title={i18n.modules.document.createADocument}
124119
collapsedChildren={
125-
customButton ? (
126-
customButton
127-
) : (
128-
<IconButton
129-
icon={'add'}
130-
title={i18n.modules.document.createDocument}
131-
className={lightIconButtonStyle}
132-
/>
133-
)
120+
<IconButton
121+
icon={'add'}
122+
title={i18n.modules.document.createDocument}
123+
className={lightIconButtonStyle}
124+
/>
134125
}
135126
className={css({ display: 'block', textAlign: 'center', alignSelf: 'center' })}
136127
>

‎colab-webapp/src/main/node/app/src/components/resources/ResourcesMainView.tsx‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { useAndLoadResources } from '../../store/selectors/resourceSelector';
1212
import { binAccessDefaultIcon } from '../../styling/IconDefault';
1313
import { lightIconButtonStyle, space_lg, space_xl } from '../../styling/style';
1414
import AvailabilityStatusIndicator from '../common/element/AvailabilityStatusIndicator';
15-
import Button from '../common/element/Button';
1615
import IconButton from '../common/element/IconButton';
1716
import Flex from '../common/layout/Flex';
1817
import ResourceCreator from './ResourceCreator';
@@ -101,7 +100,7 @@ export function ResourcesMainViewHeader({ title }: ResourcesMainViewHeaderProps)
101100

102101
{displayMode === 'LIST' && (
103102
<>
104-
<ResourceCreator collapsedClassName={lightIconButtonStyle} />
103+
<ResourceCreator />
105104
{/* Note : we can imagine that a read access level allows to see the ghost resources */}
106105
<IconButton
107106
icon={binAccessDefaultIcon}
@@ -251,16 +250,7 @@ export function ResourcesMainViewPanel({
251250
className={css({ padding: space_xl })}
252251
>
253252
<h3>{i18n.modules.resource.noDocumentationYet}</h3>
254-
{!isReadOnly(accessLevel) && (
255-
<ResourceCreator
256-
collapsedClassName={lightIconButtonStyle}
257-
customButton={
258-
<Button icon={'add'} kind="outline">
259-
{i18n.modules.document.createDocument}
260-
</Button>
261-
}
262-
/>
263-
)}
253+
{!isReadOnly(accessLevel) && <ResourceCreator />}
264254
</Flex>
265255
)}
266256

‎colab-webapp/src/main/node/app/src/components/team/MassMemberCreator.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ export default function MassMemberCreator({ mode }: MassMemberCreatorProps): JSX
117117
message: `${i18n.team.mailsInvited}`,
118118
}),
119119
);
120+
setInputValue('');
120121
setLoading(false);
121122
close();
122123
}
@@ -134,10 +135,11 @@ export default function MassMemberCreator({ mode }: MassMemberCreatorProps): JSX
134135
{i18n.team.mailInstructions}
135136
<BlockInput
136137
inputType={'textarea'}
137-
saveMode={'ON_BLUR'}
138138
value={inputValue}
139+
placeholder="maria.meier@mail.ch, peter.huber@mail.ch"
140+
autoFocus
141+
saveMode={'ON_BLUR'}
139142
onChange={e => setInputValue(e)}
140-
placeholder="maria.meier@mail.ch,peter.huber@mail.ch"
141143
/>
142144
</Flex>
143145
{error && (

0 commit comments

Comments
 (0)