Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
5dd83c3
User File Access Setup
Jiyang-Wu Jul 14, 2021
9ca9129
Merge branch 'master' of https://github.com/Texera/texera into jiyang…
Jiyang-Wu Jul 16, 2021
9d02893
User File Access Almost Done, TestCases for ngbdmodalfileshareaccess-…
Jiyang-Wu Jul 20, 2021
dc6547e
Test Cases Finished
Jiyang-Wu Jul 20, 2021
bfb392d
Minor changes and enhancement
Jiyang-Wu Jul 21, 2021
fa79fd5
formatting issues
Jiyang-Wu Jul 21, 2021
cc160fe
formatting issues
Jiyang-Wu Jul 21, 2021
928cbaf
Comments
Jiyang-Wu Jul 21, 2021
b5e7647
Merge branch 'master' into jiyang-user-file-access
Yicong-Huang Jul 25, 2021
4fbc426
some fix
Yicong-Huang Jul 26, 2021
f718fc8
refresh files upon log out
Yicong-Huang Jul 26, 2021
de261b3
some style fix
Yicong-Huang Jul 26, 2021
2ec63bb
User File List & Compilation testing
Jiyang-Wu Jul 26, 2021
0c3c5e3
Modifying UserFile Object
Jiyang-Wu Jul 26, 2021
d1a027e
Bug fix
Jiyang-Wu Jul 26, 2021
ff7cacc
make file executable
Yicong-Huang Jul 26, 2021
007f44b
Front End Enhancement
Jiyang-Wu Jul 27, 2021
bd00596
Merge branch 'master' into jiyang-user-file-access
Jiyang-Wu Jul 27, 2021
75ca86e
merging bugfix
Jiyang-Wu Jul 27, 2021
c639be1
merging bugfix
Jiyang-Wu Jul 27, 2021
bd6c924
bugfix
Jiyang-Wu Jul 27, 2021
2f3433c
bugfix
Jiyang-Wu Jul 27, 2021
0685756
updating testcases
Jiyang-Wu Jul 28, 2021
1a076e4
basic cleanup
Yicong-Huang Jul 28, 2021
e4ba89c
adding file access identification in dashboard, changed DSLcontext se…
Jiyang-Wu Jul 28, 2021
6e482b6
testcase adjustment
Jiyang-Wu Jul 28, 2021
cd323b0
formatting issues
Jiyang-Wu Jul 28, 2021
73daac0
modifying comments
Jiyang-Wu Jul 28, 2021
c9bb1bb
UI behavior modified -- now non-writer and non-owners cannot re-share…
Jiyang-Wu Jul 29, 2021
f7dcde4
starting comments
Jiyang-Wu Jul 30, 2021
5c9aa50
Wrapping Up
Jiyang-Wu Aug 3, 2021
79a0327
Debug
Jiyang-Wu Aug 3, 2021
9dd54a4
Debug
Jiyang-Wu Aug 3, 2021
8108fae
Merge branch 'jiyang-user-file-access' of https://github.com/Texera/t…
Jiyang-Wu Aug 3, 2021
10eeb41
Front-End naming modified,
Jiyang-Wu Aug 4, 2021
31e69b9
update namings, style, format, comments
Yicong-Huang Aug 4, 2021
cd702dd
clean up UserFileService
Yicong-Huang Aug 4, 2021
32f7273
clean up interfaces
Yicong-Huang Aug 4, 2021
6a0c7a6
fix test
Yicong-Huang Aug 4, 2021
25b6d26
url change
Yicong-Huang Aug 4, 2021
10adebb
fix test
Yicong-Huang Aug 4, 2021
e7cad0c
Merge branch 'master' into jiyang-user-file-access
Yicong-Huang Aug 4, 2021
1b8935f
fix merge
Yicong-Huang Aug 4, 2021
f6b47fa
change icon
Yicong-Huang Aug 4, 2021
a257539
minor attempt to fix icon location
Yicong-Huang Aug 4, 2021
c2dce0d
remove comments.ts
Yicong-Huang Aug 4, 2021
81acf58
fix tests
Yicong-Huang Aug 4, 2021
9c2361f
fix test
Yicong-Huang Aug 4, 2021
7ef0622
Renaming Variables to make them more reasonable,
Jiyang-Wu Aug 4, 2021
49f0e54
FileName is now in the format of Owner/FileName
Jiyang-Wu Aug 4, 2021
c958755
Using disabled buttons instead of hiding buttons
Jiyang-Wu Aug 5, 2021
435de02
Merge branch 'master' into jiyang-user-file-access
Yicong-Huang Aug 5, 2021
f28c690
fix naming and api
Yicong-Huang Aug 5, 2021
8ec3db5
update api
Yicong-Huang Aug 5, 2021
a7346d6
fix test
Yicong-Huang Aug 5, 2021
cfa7bea
fix format
Yicong-Huang Aug 5, 2021
2778eb1
fix test
Yicong-Huang Aug 5, 2021
d0fbff5
some more renamings
Yicong-Huang Aug 5, 2021
55c62e1
fix test
Yicong-Huang Aug 5, 2021
8ea25ca
remove extra file
Yicong-Huang Aug 5, 2021
d36525d
some fix
Yicong-Huang Aug 5, 2021
297d0df
remove properties
Yicong-Huang Aug 5, 2021
b8b3837
badge related fix
Yicong-Huang Aug 5, 2021
d0c6499
fix owner response
Yicong-Huang Aug 5, 2021
0e54456
fix format
Yicong-Huang Aug 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import akka.actor.ActorSystem
import com.fasterxml.jackson.module.scala.DefaultScalaModule
import com.github.dirkraft.dropwizard.fileassets.FileAssetsBundle
import edu.uci.ics.amber.engine.common.AmberUtils
import edu.uci.ics.texera.Utils
import edu.uci.ics.texera.web.resource.{UserDictionaryResource, _}
import edu.uci.ics.texera.web.resource.auth.UserResource
import edu.uci.ics.texera.web.resource.dashboard.file.UserFileResource
import edu.uci.ics.texera.web.resource.dashboard.file.{UserFileAccessResource, UserFileResource}
import edu.uci.ics.texera.web.resource.dashboard.{WorkflowAccessResource, WorkflowResource}
import edu.uci.ics.texera.web.resource.{UserDictionaryResource, _}
import edu.uci.ics.texera.Utils
import io.dropwizard.setup.{Bootstrap, Environment}
import io.dropwizard.websockets.WebsocketBundle
import org.eclipse.jetty.server.session.SessionHandler
Expand Down Expand Up @@ -78,13 +78,15 @@ class TexeraWebApplication extends io.dropwizard.Application[TexeraWebConfigurat
environment.jersey.register(classOf[MultiPartFeature])

environment.jersey().register(classOf[SystemMetadataResource])
// environment.jersey().register(classOf[MockKillWorkerResource])
// environment.jersey().register(classOf[MockKillWorkerResource])
environment.jersey().register(classOf[SchemaPropagationResource])
environment.jersey().register(classOf[UserResource])
environment.jersey().register(classOf[UserDictionaryResource])
environment.jersey().register(classOf[WorkflowResource])
environment.jersey().register(classOf[UserFileAccessResource])
environment.jersey().register(classOf[UserFileResource])
environment.jersey().register(classOf[WorkflowAccessResource])
environment.jersey().register(classOf[WorkflowResource])

}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package edu.uci.ics.texera.web.model.common

case class AccessEntry(userName: String, accessLevel: String) {}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading